From 4aa90aa2be1eab1d2a37c7a8f92347aa0ffdacbb Mon Sep 17 00:00:00 2001 From: Gondolindrim Date: Thu, 9 Mar 2023 22:57:23 -0300 Subject: [PATCH 01/18] First Iron 160 S and H support --- keyboards/smithrune/iron160_h/config.h | 45 +++++++++++ keyboards/smithrune/iron160_h/halconf.h | 26 ++++++ keyboards/smithrune/iron160_h/info.json | 78 ++++++++++++++++++ keyboards/smithrune/iron160_h/iron160_h.c | 29 +++++++ keyboards/smithrune/iron160_h/iron160_h.h | 36 +++++++++ .../iron160_h/keymaps/default/keymap.c | 49 +++++++++++ .../smithrune/iron160_h/keymaps/via/keymap.c | 49 +++++++++++ .../smithrune/iron160_h/keymaps/via/rules.mk | 1 + keyboards/smithrune/iron160_h/mcuconf.h | 23 ++++++ keyboards/smithrune/iron160_h/rules.mk | 26 ++++++ keyboards/smithrune/iron160_s/config.h | 48 +++++++++++ keyboards/smithrune/iron160_s/halconf.h | 26 ++++++ keyboards/smithrune/iron160_s/info.json | 81 +++++++++++++++++++ keyboards/smithrune/iron160_s/iron160_s.c | 25 ++++++ keyboards/smithrune/iron160_s/iron160_s.h | 36 +++++++++ .../iron160_s/keymaps/default/keymap.c | 49 +++++++++++ .../smithrune/iron160_s/keymaps/via/keymap.c | 49 +++++++++++ .../smithrune/iron160_s/keymaps/via/rules.mk | 1 + keyboards/smithrune/iron160_s/mcuconf.h | 6 ++ keyboards/smithrune/iron160_s/rules.mk | 26 ++++++ 20 files changed, 709 insertions(+) create mode 100644 keyboards/smithrune/iron160_h/config.h create mode 100644 keyboards/smithrune/iron160_h/halconf.h create mode 100644 keyboards/smithrune/iron160_h/info.json create mode 100644 keyboards/smithrune/iron160_h/iron160_h.c create mode 100644 keyboards/smithrune/iron160_h/iron160_h.h create mode 100755 keyboards/smithrune/iron160_h/keymaps/default/keymap.c create mode 100755 keyboards/smithrune/iron160_h/keymaps/via/keymap.c create mode 100644 keyboards/smithrune/iron160_h/keymaps/via/rules.mk create mode 100644 keyboards/smithrune/iron160_h/mcuconf.h create mode 100644 keyboards/smithrune/iron160_h/rules.mk create mode 100644 keyboards/smithrune/iron160_s/config.h create mode 100644 keyboards/smithrune/iron160_s/halconf.h create mode 100644 keyboards/smithrune/iron160_s/info.json create mode 100644 keyboards/smithrune/iron160_s/iron160_s.c create mode 100644 keyboards/smithrune/iron160_s/iron160_s.h create mode 100755 keyboards/smithrune/iron160_s/keymaps/default/keymap.c create mode 100755 keyboards/smithrune/iron160_s/keymaps/via/keymap.c create mode 100644 keyboards/smithrune/iron160_s/keymaps/via/rules.mk create mode 100644 keyboards/smithrune/iron160_s/mcuconf.h create mode 100644 keyboards/smithrune/iron160_s/rules.mk diff --git a/keyboards/smithrune/iron160_h/config.h b/keyboards/smithrune/iron160_h/config.h new file mode 100644 index 000000000000..69fc4e910715 --- /dev/null +++ b/keyboards/smithrune/iron160_h/config.h @@ -0,0 +1,45 @@ +/* +Copyright 2022 Gondolindrim + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#pragma once + +#include "config_common.h" + + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 14 + +// C0 , C1 , C2 , C3 , C4 , C5 , C6 , C7 , C8 , C9 , C10, C11, C12, C13 +#define MATRIX_COL_PINS { A3 , B9 , B8 , B5 , B4 , B3 , A6 , A5 , A4 , A2 , A1 , A0 , C15, C14} +// R0 , R1 , R2 , R3 , R4 +#define MATRIX_ROW_PINS { A10, A15, C13, A7 , B0 } +#define DIODE_DIRECTION COL2ROW + +#define RGB_DI_PIN B15 +#define RGBLED_NUM 1 + +/* Set 0 if debouncing isn't needed */ +#define DEBOUNCE 5 + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* Defining RGB default brightness to zero */ +#define RGBLIGHT_DEFAULT_VAL 0 diff --git a/keyboards/smithrune/iron160_h/halconf.h b/keyboards/smithrune/iron160_h/halconf.h new file mode 100644 index 000000000000..d4123d91eeb8 --- /dev/null +++ b/keyboards/smithrune/iron160_h/halconf.h @@ -0,0 +1,26 @@ +/* Copyright 2022 Gondolindrim + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/* + * This file was auto-generated by: + * `qmk chibios-confmigrate -i keyboards/iron180/halconf.h -r platforms/chibios/common/configs/halconf.h` + */ + +#pragma once + +#define HAL_USE_SPI TRUE + +#include_next diff --git a/keyboards/smithrune/iron160_h/info.json b/keyboards/smithrune/iron160_h/info.json new file mode 100644 index 000000000000..d178eb318934 --- /dev/null +++ b/keyboards/smithrune/iron160_h/info.json @@ -0,0 +1,78 @@ +{ + "keyboard_name": "I160-H", + "manufacturer": "SmithRune", + "url": "", + "maintainer": "Gondolindrim", + "usb": { + "vid": "0x8384", + "pid": "0x1648", + "device_version": "0.0.1" + }, + "layouts": { + "LAYOUT_all": { + "layout": [ + {"label":"~", "x":0, "y":0}, + {"label":"!", "x":1, "y":0}, + {"label":"@", "x":2, "y":0}, + {"label":"#", "x":3, "y":0}, + {"label":"$", "x":4, "y":0}, + {"label":"%", "x":5, "y":0}, + {"label":"^", "x":6, "y":0}, + {"label":"&", "x":7, "y":0}, + {"label":"*", "x":8, "y":0}, + {"label":"(", "x":9, "y":0}, + {"label":")", "x":10, "y":0}, + {"label":"_", "x":11, "y":0}, + {"label":"+", "x":12, "y":0}, + {"label":"Backspace", "x":13, "y":0, "w":2}, + {"label":"Tab", "x":0, "y":1, "w":1.5}, + {"label":"Q", "x":1.5, "y":1}, + {"label":"W", "x":2.5, "y":1}, + {"label":"E", "x":3.5, "y":1}, + {"label":"R", "x":4.5, "y":1}, + {"label":"T", "x":5.5, "y":1}, + {"label":"Y", "x":6.5, "y":1}, + {"label":"U", "x":7.5, "y":1}, + {"label":"I", "x":8.5, "y":1}, + {"label":"O", "x":9.5, "y":1}, + {"label":"P", "x":10.5, "y":1}, + {"label":"{", "x":11.5, "y":1}, + {"label":"}", "x":12.5, "y":1}, + {"label":"|", "x":13.5, "y":1, "w":1.5}, + {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, + {"label":"A", "x":1.75, "y":2}, + {"label":"S", "x":2.75, "y":2}, + {"label":"D", "x":3.75, "y":2}, + {"label":"F", "x":4.75, "y":2}, + {"label":"G", "x":5.75, "y":2}, + {"label":"H", "x":6.75, "y":2}, + {"label":"J", "x":7.75, "y":2}, + {"label":"K", "x":8.75, "y":2}, + {"label":"L", "x":9.75, "y":2}, + {"label":":", "x":10.75, "y":2}, + {"label":"\"", "x":11.75, "y":2}, + {"label":"Enter", "x":12.75, "y":2, "w":2.25}, + {"label":"Shift", "x":0, "y":3, "w":2.25}, + {"label":"Z", "x":2.25, "y":3}, + {"label":"X", "x":3.25, "y":3}, + {"label":"C", "x":4.25, "y":3}, + {"label":"V", "x":5.25, "y":3}, + {"label":"B", "x":6.25, "y":3}, + {"label":"N", "x":7.25, "y":3}, + {"label":"M", "x":8.25, "y":3}, + {"label":"<", "x":9.25, "y":3}, + {"label":">", "x":10.25, "y":3}, + {"label":"?", "x":11.25, "y":3}, + {"label":"Shift", "x":12.25, "y":3, "w":1.75}, + {"label":"MO(1)", "x":14, "y":3}, + {"label":"Ctrl", "x":0, "y":4, "w":1.5}, + {"label":"Win", "x":1.5, "y":4}, + {"label":"Alt", "x":2.5, "y":4, "w":1.5}, + {"x":4, "y":4, "w":7}, + {"label":"Alt", "x":11, "y":4, "w":1.5}, + {"label":"Win", "x":12.5, "y":4}, + {"label":"Ctrl", "x":13.5, "y":4, "w":1.5} + ] + } + } +} diff --git a/keyboards/smithrune/iron160_h/iron160_h.c b/keyboards/smithrune/iron160_h/iron160_h.c new file mode 100644 index 000000000000..611b40cc1a2a --- /dev/null +++ b/keyboards/smithrune/iron160_h/iron160_h.c @@ -0,0 +1,29 @@ +/* +Copyright 2022 Gondolindrim + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include "iron160_h.h" + +// Defining indicator colors +uint8_t caps_color[3] = {0x33,0x33,0x33}; + +bool led_update_kb(led_t led_state) { + bool res = led_update_user(led_state); + if(res) { + led_state.caps_lock ? rgblight_setrgb_at(caps_color[0], caps_color[1], caps_color[2], 0) : rgblight_setrgb_at(0x00,0x00,0x00,0); + } + return res; +} diff --git a/keyboards/smithrune/iron160_h/iron160_h.h b/keyboards/smithrune/iron160_h/iron160_h.h new file mode 100644 index 000000000000..47b2c157b6d1 --- /dev/null +++ b/keyboards/smithrune/iron160_h/iron160_h.h @@ -0,0 +1,36 @@ +/* +Copyright 2022 Gondolindrim + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#pragma once + +#define ___ KC_NO + +#include "quantum.h" + +#define LAYOUT_all( \ + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ + K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ + K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \ + K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ + K40, K41, K42, K46, K4A, K4B, K4C, K4D \ +) { \ + { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D}, \ + { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D}, \ + { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D}, \ + { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D}, \ + { K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, K4A, K4B, K4C, K4D} \ +} diff --git a/keyboards/smithrune/iron160_h/keymaps/default/keymap.c b/keyboards/smithrune/iron160_h/keymaps/default/keymap.c new file mode 100755 index 000000000000..bb9349fabf94 --- /dev/null +++ b/keyboards/smithrune/iron160_h/keymaps/default/keymap.c @@ -0,0 +1,49 @@ +/* +Copyright 2022 Gondolindrim + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_all( + KC_GESC, KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_MINS, KC_EQL , KC_BSPC, + KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_LBRC, KC_RBRC, KC_BSLS, + KC_CAPS, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_QUOT, KC_ENT , + KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1) , + KC_LCTL, KC_LWIN, KC_LALT, KC_SPC , KC_RALT, KC_RWIN, MO(1) , KC_RCTL + ), + [1] = LAYOUT_all( + RESET , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ), + [2] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ), + [3] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ), +}; diff --git a/keyboards/smithrune/iron160_h/keymaps/via/keymap.c b/keyboards/smithrune/iron160_h/keymaps/via/keymap.c new file mode 100755 index 000000000000..85e377d13fe2 --- /dev/null +++ b/keyboards/smithrune/iron160_h/keymaps/via/keymap.c @@ -0,0 +1,49 @@ +/* +Copyright 2022 Gondolindrim + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_all( + KC_GESC, KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_MINS, KC_EQL , KC_BSPC, + KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_LBRC, KC_RBRC, KC_BSLS, + KC_CAPS, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_QUOT, KC_ENT , + KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1) , + KC_LCTL, KC_LWIN, KC_LALT, KC_SPC , KC_RALT, KC_RWIN, KC_RCTL, KC_BSPC + ), + [1] = LAYOUT_all( + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ), + [2] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ), + [3] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ), +}; diff --git a/keyboards/smithrune/iron160_h/keymaps/via/rules.mk b/keyboards/smithrune/iron160_h/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/smithrune/iron160_h/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/smithrune/iron160_h/mcuconf.h b/keyboards/smithrune/iron160_h/mcuconf.h new file mode 100644 index 000000000000..66f106db1f86 --- /dev/null +++ b/keyboards/smithrune/iron160_h/mcuconf.h @@ -0,0 +1,23 @@ +/* Copyright 2022 Gondolindrim + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + + +#pragma once + +#include_next + +#undef STM32_SPI_USE_SPI2 +#define STM32_SPI_USE_SPI2 TRUE diff --git a/keyboards/smithrune/iron160_h/rules.mk b/keyboards/smithrune/iron160_h/rules.mk new file mode 100644 index 000000000000..06a00ed57f37 --- /dev/null +++ b/keyboards/smithrune/iron160_h/rules.mk @@ -0,0 +1,26 @@ +# MCU name +MCU = STM32F072 + +# Bootloader selection +BOOTLOADER = stm32-dfu + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = yes # Commands for debug and configuration +NKRO_ENABLE = yes # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output +ENCODER_ENABLE = no +LTO_ENABLE = no + +EEPROM_DRIVER = wear_leveling +WEAR_LEVELING_DRIVER = legacy + +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/smithrune/iron160_s/config.h b/keyboards/smithrune/iron160_s/config.h new file mode 100644 index 000000000000..302229f2a472 --- /dev/null +++ b/keyboards/smithrune/iron160_s/config.h @@ -0,0 +1,48 @@ +/* +Copyright 2022 Gondolindrim + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#pragma once + +#include "config_common.h" + + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 14 + +// C0 , C1 , C2 , C3 , C4 , C5 , C6 , C7 , C8 , C9 , C10, C11, C12, C13 +#define MATRIX_COL_PINS { A3 , B9 , B8 , B5 , B4 , B3 , A6 , A5 , A4 , A2 , A1 , A0 , C15, C14} +// R0 , R1 , R2 , R3 , R4 +#define MATRIX_ROW_PINS { A10, A15, C13, B1 , B10} +#define DIODE_DIRECTION COL2ROW + +#define BACKLIGHT_PIN A7 +#define BACKLIGHT_PWM_DRIVER PWMD3 +#define BACKLIGHT_PWM_CHANNEL 2 +#define BACKLIGHT_PAL_MODE 1 +#define BACKLIGHT_LEVELS 20 +#define BACKLIGHT_BREATHING +#define BREATHING_PERIOD 3 +#define BACKLIGHT_ON_STATE 1 +#define LED_CAPS_LOCK_PIN B0 +/* Set 0 if debouncing isn't needed */ +#define DEBOUNCE 5 + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/smithrune/iron160_s/halconf.h b/keyboards/smithrune/iron160_s/halconf.h new file mode 100644 index 000000000000..8fcc53fced12 --- /dev/null +++ b/keyboards/smithrune/iron160_s/halconf.h @@ -0,0 +1,26 @@ +/* Copyright 2022 Gondolindrim + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/* + * This file was auto-generated by: + * `qmk chibios-confmigrate -i keyboards/iron180/halconf.h -r platforms/chibios/common/configs/halconf.h` + */ + +#pragma once + +#define HAL_USE_PWM TRUE + +#include_next diff --git a/keyboards/smithrune/iron160_s/info.json b/keyboards/smithrune/iron160_s/info.json new file mode 100644 index 000000000000..8b0525970214 --- /dev/null +++ b/keyboards/smithrune/iron160_s/info.json @@ -0,0 +1,81 @@ +{ + "keyboard_name": "I160-S", + "manufacturer": "SmithRune", + "url": "", + "maintainer": "Gondolindrim", + "usb": { + "vid": "0x8384", + "pid": "0x1653", + "device_version": "0.0.1" + }, + "layouts": { + "LAYOUT_all": { + "layout": [{"label":"~", "x":0, "y":0}, + {"label":"!", "x":1, "y":0}, + {"label":"@", "x":2, "y":0}, + {"label":"#", "x":3, "y":0}, + {"label":"$", "x":4, "y":0}, + {"label":"%", "x":5, "y":0}, + {"label":"^", "x":6, "y":0}, + {"label":"&", "x":7, "y":0}, + {"label":"*", "x":8, "y":0}, + {"label":"(", "x":9, "y":0}, + {"label":")", "x":10, "y":0}, + {"label":"_", "x":11, "y":0}, + {"label":"+", "x":12, "y":0}, + {"label":"Bspc", "x":13, "y":0}, + {"label":"Tab", "x":0, "y":1, "w":1.5}, + {"label":"Q", "x":1.5, "y":1}, + {"label":"W", "x":2.5, "y":1}, + {"label":"E", "x":3.5, "y":1}, + {"label":"R", "x":4.5, "y":1}, + {"label":"T", "x":5.5, "y":1}, + {"label":"Y", "x":6.5, "y":1}, + {"label":"U", "x":7.5, "y":1}, + {"label":"I", "x":8.5, "y":1}, + {"label":"O", "x":9.5, "y":1}, + {"label":"P", "x":10.5, "y":1}, + {"label":"{", "x":11.5, "y":1}, + {"label":"}", "x":12.5, "y":1}, + {"label":"|", "x":13.5, "y":1, "w":1.5}, + {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, + {"label":"A", "x":1.75, "y":2}, + {"label":"S", "x":2.75, "y":2}, + {"label":"D", "x":3.75, "y":2}, + {"label":"F", "x":4.75, "y":2}, + {"label":"G", "x":5.75, "y":2}, + {"label":"H", "x":6.75, "y":2}, + {"label":"J", "x":7.75, "y":2}, + {"label":"K", "x":8.75, "y":2}, + {"label":"L", "x":9.75, "y":2}, + {"label":":", "x":10.75, "y":2}, + {"label":"\"", "x":11.75, "y":2}, + {"label":"~", "x":12.75, "y":2}, + {"label":"Enter", "x":13.75, "y":2, "w":1.25}, + {"label":"Shift", "x":0, "y":3, "w":1.25}, + {"label":"|", "x":1.25, "y":3}, + {"label":"Z", "x":2.25, "y":3}, + {"label":"X", "x":3.25, "y":3}, + {"label":"C", "x":4.25, "y":3}, + {"label":"V", "x":5.25, "y":3}, + {"label":"B", "x":6.25, "y":3}, + {"label":"N", "x":7.25, "y":3}, + {"label":"M", "x":8.25, "y":3}, + {"label":"<", "x":9.25, "y":3}, + {"label":">", "x":10.25, "y":3}, + {"label":"?", "x":11.25, "y":3}, + {"label":"Shift", "x":12.25, "y":3, "w":1.75}, + {"label":"MO(1)", "x":14, "y":3}, + {"label":"Ctrl", "x":0, "y":4, "w":1.25}, + {"label":"Win", "x":1.25, "y":4, "w":1.25}, + {"label":"Alt", "x":2.5, "y":4, "w":1.25}, + {"x":3.75, "y":4, "w":6.25}, + {"label":"Alt", "x":10, "y":4, "w":1.25}, + {"label":"Win", "x":11.25, "y":4, "w":1.25}, + {"label":"Menu", "x":12.5, "y":4, "w":1.25}, + {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}, + {"label":"Bspc", "x":14, "y":0} + ] + } + } +} diff --git a/keyboards/smithrune/iron160_s/iron160_s.c b/keyboards/smithrune/iron160_s/iron160_s.c new file mode 100644 index 000000000000..82aaa4f7bbe1 --- /dev/null +++ b/keyboards/smithrune/iron160_s/iron160_s.c @@ -0,0 +1,25 @@ +/* +Copyright 2022 Gondolindrim + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include "iron160_s.h" + +bool led_update_kb(led_t led_state) { + bool res = led_update_user(led_state); + if(res) writePin(LED_CAPS_LOCK_PIN, led_state.caps_lock); + return res; +} + diff --git a/keyboards/smithrune/iron160_s/iron160_s.h b/keyboards/smithrune/iron160_s/iron160_s.h new file mode 100644 index 000000000000..ad7843212d94 --- /dev/null +++ b/keyboards/smithrune/iron160_s/iron160_s.h @@ -0,0 +1,36 @@ +/* +Copyright 2022 Gondolindrim + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#pragma once + +#define ___ KC_NO + +#include "quantum.h" + +#define LAYOUT_all( \ + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ + K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ + K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \ + K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ + K40, K41, K42, K46, K49, K4A, K4B, K4C, K4D \ +) { \ + { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D}, \ + { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D}, \ + { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D}, \ + { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D}, \ + { K40, K41, K42, ___, ___, ___, K46, ___, ___, K49, K4A, K4B, K4C, K4D} \ +} diff --git a/keyboards/smithrune/iron160_s/keymaps/default/keymap.c b/keyboards/smithrune/iron160_s/keymaps/default/keymap.c new file mode 100755 index 000000000000..a80f03a03681 --- /dev/null +++ b/keyboards/smithrune/iron160_s/keymaps/default/keymap.c @@ -0,0 +1,49 @@ +/* +Copyright 2022 Gondolindrim + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_all( + KC_GESC, KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_MINS, KC_EQL , KC_BSPC, + KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_LBRC, KC_RBRC, KC_BSLS, + KC_CAPS, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT , + KC_LSFT, KC_BSLS, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1) , + KC_LCTL, KC_LWIN, KC_LALT, KC_SPC , KC_RALT, KC_RWIN, MO(1) , KC_RCTL, KC_BSPC + ), + [1] = LAYOUT_all( + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + [2] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + [3] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), +}; diff --git a/keyboards/smithrune/iron160_s/keymaps/via/keymap.c b/keyboards/smithrune/iron160_s/keymaps/via/keymap.c new file mode 100755 index 000000000000..a80f03a03681 --- /dev/null +++ b/keyboards/smithrune/iron160_s/keymaps/via/keymap.c @@ -0,0 +1,49 @@ +/* +Copyright 2022 Gondolindrim + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_all( + KC_GESC, KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_MINS, KC_EQL , KC_BSPC, + KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_LBRC, KC_RBRC, KC_BSLS, + KC_CAPS, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT , + KC_LSFT, KC_BSLS, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1) , + KC_LCTL, KC_LWIN, KC_LALT, KC_SPC , KC_RALT, KC_RWIN, MO(1) , KC_RCTL, KC_BSPC + ), + [1] = LAYOUT_all( + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + [2] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + [3] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), +}; diff --git a/keyboards/smithrune/iron160_s/keymaps/via/rules.mk b/keyboards/smithrune/iron160_s/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/smithrune/iron160_s/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/smithrune/iron160_s/mcuconf.h b/keyboards/smithrune/iron160_s/mcuconf.h new file mode 100644 index 000000000000..fbdfecf3bdc1 --- /dev/null +++ b/keyboards/smithrune/iron160_s/mcuconf.h @@ -0,0 +1,6 @@ +#pragma once + +#include_next + +#undef STM32_PWM_USE_TIM3 +#define STM32_PWM_USE_TIM3 TRUE diff --git a/keyboards/smithrune/iron160_s/rules.mk b/keyboards/smithrune/iron160_s/rules.mk new file mode 100644 index 000000000000..b8d0512ae209 --- /dev/null +++ b/keyboards/smithrune/iron160_s/rules.mk @@ -0,0 +1,26 @@ +# MCU name +MCU = STM32F072 + +# Bootloader selection +BOOTLOADER = stm32-dfu + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = yes # Commands for debug and configuration +NKRO_ENABLE = yes # USB Nkey Rollover +BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output +ENCODER_ENABLE = no +LTO_ENABLE = no + +EEPROM_DRIVER = wear_leveling +WEAR_LEVELING_DRIVER = legacy + +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE From 341710b44387eedb71a3bd36cd0d65d21fd3b5c2 Mon Sep 17 00:00:00 2001 From: Gondolindrim Date: Thu, 9 Mar 2023 23:45:22 -0300 Subject: [PATCH 02/18] Remove LAYOUT_all, remove common config, new info.jsons --- keyboards/smithrune/iron160_h/config.h | 3 - keyboards/smithrune/iron160_h/info.json | 128 +++++++++-------- keyboards/smithrune/iron160_h/iron160_h.h | 2 +- .../iron160_h/keymaps/default/keymap.c | 10 +- .../smithrune/iron160_h/keymaps/via/keymap.c | 10 +- keyboards/smithrune/iron160_s/config.h | 3 - keyboards/smithrune/iron160_s/info.json | 135 +++++++++--------- keyboards/smithrune/iron160_s/iron160_s.h | 2 +- .../iron160_s/keymaps/default/keymap.c | 10 +- .../smithrune/iron160_s/keymaps/via/keymap.c | 10 +- 10 files changed, 155 insertions(+), 158 deletions(-) diff --git a/keyboards/smithrune/iron160_h/config.h b/keyboards/smithrune/iron160_h/config.h index 69fc4e910715..0e25832acf3f 100644 --- a/keyboards/smithrune/iron160_h/config.h +++ b/keyboards/smithrune/iron160_h/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" - - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/smithrune/iron160_h/info.json b/keyboards/smithrune/iron160_h/info.json index d178eb318934..825f4bfb85f8 100644 --- a/keyboards/smithrune/iron160_h/info.json +++ b/keyboards/smithrune/iron160_h/info.json @@ -9,70 +9,72 @@ "device_version": "0.0.1" }, "layouts": { - "LAYOUT_all": { + "LAYOUT": { "layout": [ - {"label":"~", "x":0, "y":0}, - {"label":"!", "x":1, "y":0}, - {"label":"@", "x":2, "y":0}, - {"label":"#", "x":3, "y":0}, - {"label":"$", "x":4, "y":0}, - {"label":"%", "x":5, "y":0}, - {"label":"^", "x":6, "y":0}, - {"label":"&", "x":7, "y":0}, - {"label":"*", "x":8, "y":0}, - {"label":"(", "x":9, "y":0}, - {"label":")", "x":10, "y":0}, - {"label":"_", "x":11, "y":0}, - {"label":"+", "x":12, "y":0}, - {"label":"Backspace", "x":13, "y":0, "w":2}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":2.5, "y":1}, - {"label":"E", "x":3.5, "y":1}, - {"label":"R", "x":4.5, "y":1}, - {"label":"T", "x":5.5, "y":1}, - {"label":"Y", "x":6.5, "y":1}, - {"label":"U", "x":7.5, "y":1}, - {"label":"I", "x":8.5, "y":1}, - {"label":"O", "x":9.5, "y":1}, - {"label":"P", "x":10.5, "y":1}, - {"label":"{", "x":11.5, "y":1}, - {"label":"}", "x":12.5, "y":1}, - {"label":"|", "x":13.5, "y":1, "w":1.5}, - {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":6.75, "y":2}, - {"label":"J", "x":7.75, "y":2}, - {"label":"K", "x":8.75, "y":2}, - {"label":"L", "x":9.75, "y":2}, - {"label":":", "x":10.75, "y":2}, - {"label":"\"", "x":11.75, "y":2}, - {"label":"Enter", "x":12.75, "y":2, "w":2.25}, - {"label":"Shift", "x":0, "y":3, "w":2.25}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"N", "x":7.25, "y":3}, - {"label":"M", "x":8.25, "y":3}, - {"label":"<", "x":9.25, "y":3}, - {"label":">", "x":10.25, "y":3}, - {"label":"?", "x":11.25, "y":3}, - {"label":"Shift", "x":12.25, "y":3, "w":1.75}, - {"label":"MO(1)", "x":14, "y":3}, - {"label":"Ctrl", "x":0, "y":4, "w":1.5}, - {"label":"Win", "x":1.5, "y":4}, - {"label":"Alt", "x":2.5, "y":4, "w":1.5}, - {"x":4, "y":4, "w":7}, - {"label":"Alt", "x":11, "y":4, "w":1.5}, - {"label":"Win", "x":12.5, "y":4}, - {"label":"Ctrl", "x":13.5, "y":4, "w":1.5} - ] + {"label":"~", "x":0, "y":0}, + {"label":"!", "x":1, "y":0}, + {"label":"@", "x":2, "y":0}, + {"label":"#", "x":3, "y":0}, + {"label":"$", "x":4, "y":0}, + {"label":"%", "x":5, "y":0}, + {"label":"^", "x":6, "y":0}, + {"label":"&", "x":7, "y":0}, + {"label":"*", "x":8, "y":0}, + {"label":"(", "x":9, "y":0}, + {"label":")", "x":10, "y":0}, + {"label":"_", "x":11, "y":0}, + {"label":"+", "x":12, "y":0}, + {"label":"Bspc", "x":13, "y":0}, + {"label":"Bspc", "x":14, "y":0}, + {"label":"Tab", "x":0, "y":1, "w":1.5}, + {"label":"Q", "x":1.5, "y":1}, + {"label":"W", "x":2.5, "y":1}, + {"label":"E", "x":3.5, "y":1}, + {"label":"R", "x":4.5, "y":1}, + {"label":"T", "x":5.5, "y":1}, + {"label":"Y", "x":6.5, "y":1}, + {"label":"U", "x":7.5, "y":1}, + {"label":"I", "x":8.5, "y":1}, + {"label":"O", "x":9.5, "y":1}, + {"label":"P", "x":10.5, "y":1}, + {"label":"{", "x":11.5, "y":1}, + {"label":"}", "x":12.5, "y":1}, + {"label":"|", "x":13.5, "y":1, "w":1.5}, + {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, + {"label":"A", "x":1.75, "y":2}, + {"label":"S", "x":2.75, "y":2}, + {"label":"D", "x":3.75, "y":2}, + {"label":"F", "x":4.75, "y":2}, + {"label":"G", "x":5.75, "y":2}, + {"label":"H", "x":6.75, "y":2}, + {"label":"J", "x":7.75, "y":2}, + {"label":"K", "x":8.75, "y":2}, + {"label":"L", "x":9.75, "y":2}, + {"label":":", "x":10.75, "y":2}, + {"label":"\"", "x":11.75, "y":2}, + {"label":"Enter", "x":12.75, "y":2, "w":1.25}, + {"label":"Shift", "x":0, "y":3, "w":1.25}, + {"label":"Z", "x":2.25, "y":3}, + {"label":"X", "x":3.25, "y":3}, + {"label":"C", "x":4.25, "y":3}, + {"label":"V", "x":5.25, "y":3}, + {"label":"B", "x":6.25, "y":3}, + {"label":"N", "x":7.25, "y":3}, + {"label":"M", "x":8.25, "y":3}, + {"label":"<", "x":9.25, "y":3}, + {"label":">", "x":10.25, "y":3}, + {"label":"?", "x":11.25, "y":3}, + {"label":"Shift", "x":12.25, "y":3, "w":1.75}, + {"label":"MO(1)", "x":14, "y":3}, + {"label":"Ctrl", "x":0, "y":4, "w":1.25}, + {"label":"Win", "x":1.25, "y":4, "w":1.25}, + {"label":"Alt", "x":2.5, "y":4, "w":1.25}, + {"x":3.75, "y":4, "w":6.25}, + {"label":"Alt", "x":10, "y":4, "w":1.25}, + {"label":"Win", "x":11.25, "y":4, "w":1.25}, + {"label":"Menu", "x":12.5, "y":4, "w":1.25}, + {"label":"Ctrl", "x":13.75, "y":4, "w":1.25} + ] } } } diff --git a/keyboards/smithrune/iron160_h/iron160_h.h b/keyboards/smithrune/iron160_h/iron160_h.h index 47b2c157b6d1..2e877b7bf25b 100644 --- a/keyboards/smithrune/iron160_h/iron160_h.h +++ b/keyboards/smithrune/iron160_h/iron160_h.h @@ -21,7 +21,7 @@ along with this program. If not, see . #include "quantum.h" -#define LAYOUT_all( \ +#define LAYOUT( \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \ diff --git a/keyboards/smithrune/iron160_h/keymaps/default/keymap.c b/keyboards/smithrune/iron160_h/keymaps/default/keymap.c index bb9349fabf94..8b885147fcfc 100755 --- a/keyboards/smithrune/iron160_h/keymaps/default/keymap.c +++ b/keyboards/smithrune/iron160_h/keymaps/default/keymap.c @@ -18,28 +18,28 @@ along with this program. If not, see . #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_all( - KC_GESC, KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_MINS, KC_EQL , KC_BSPC, + [0] = LAYOUT( + QK_GESC, KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_MINS, KC_EQL , KC_BSPC, KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_LBRC, KC_RBRC, KC_BSLS, KC_CAPS, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_QUOT, KC_ENT , KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1) , KC_LCTL, KC_LWIN, KC_LALT, KC_SPC , KC_RALT, KC_RWIN, MO(1) , KC_RCTL ), - [1] = LAYOUT_all( + [1] = LAYOUT( RESET , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [2] = LAYOUT_all( + [2] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [3] = LAYOUT_all( + [3] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/smithrune/iron160_h/keymaps/via/keymap.c b/keyboards/smithrune/iron160_h/keymaps/via/keymap.c index 85e377d13fe2..5a700c2ee870 100755 --- a/keyboards/smithrune/iron160_h/keymaps/via/keymap.c +++ b/keyboards/smithrune/iron160_h/keymaps/via/keymap.c @@ -18,28 +18,28 @@ along with this program. If not, see . #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_all( - KC_GESC, KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_MINS, KC_EQL , KC_BSPC, + [0] = LAYOUT( + QK_GESC, KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_MINS, KC_EQL , KC_BSPC, KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_LBRC, KC_RBRC, KC_BSLS, KC_CAPS, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_QUOT, KC_ENT , KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1) , KC_LCTL, KC_LWIN, KC_LALT, KC_SPC , KC_RALT, KC_RWIN, KC_RCTL, KC_BSPC ), - [1] = LAYOUT_all( + [1] = LAYOUT( QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [2] = LAYOUT_all( + [2] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [3] = LAYOUT_all( + [3] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/smithrune/iron160_s/config.h b/keyboards/smithrune/iron160_s/config.h index 302229f2a472..967e2575c4c3 100644 --- a/keyboards/smithrune/iron160_s/config.h +++ b/keyboards/smithrune/iron160_s/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" - - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/smithrune/iron160_s/info.json b/keyboards/smithrune/iron160_s/info.json index 8b0525970214..74d73fb67798 100644 --- a/keyboards/smithrune/iron160_s/info.json +++ b/keyboards/smithrune/iron160_s/info.json @@ -9,73 +9,74 @@ "device_version": "0.0.1" }, "layouts": { - "LAYOUT_all": { - "layout": [{"label":"~", "x":0, "y":0}, - {"label":"!", "x":1, "y":0}, - {"label":"@", "x":2, "y":0}, - {"label":"#", "x":3, "y":0}, - {"label":"$", "x":4, "y":0}, - {"label":"%", "x":5, "y":0}, - {"label":"^", "x":6, "y":0}, - {"label":"&", "x":7, "y":0}, - {"label":"*", "x":8, "y":0}, - {"label":"(", "x":9, "y":0}, - {"label":")", "x":10, "y":0}, - {"label":"_", "x":11, "y":0}, - {"label":"+", "x":12, "y":0}, - {"label":"Bspc", "x":13, "y":0}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":2.5, "y":1}, - {"label":"E", "x":3.5, "y":1}, - {"label":"R", "x":4.5, "y":1}, - {"label":"T", "x":5.5, "y":1}, - {"label":"Y", "x":6.5, "y":1}, - {"label":"U", "x":7.5, "y":1}, - {"label":"I", "x":8.5, "y":1}, - {"label":"O", "x":9.5, "y":1}, - {"label":"P", "x":10.5, "y":1}, - {"label":"{", "x":11.5, "y":1}, - {"label":"}", "x":12.5, "y":1}, - {"label":"|", "x":13.5, "y":1, "w":1.5}, - {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":6.75, "y":2}, - {"label":"J", "x":7.75, "y":2}, - {"label":"K", "x":8.75, "y":2}, - {"label":"L", "x":9.75, "y":2}, - {"label":":", "x":10.75, "y":2}, - {"label":"\"", "x":11.75, "y":2}, - {"label":"~", "x":12.75, "y":2}, - {"label":"Enter", "x":13.75, "y":2, "w":1.25}, - {"label":"Shift", "x":0, "y":3, "w":1.25}, - {"label":"|", "x":1.25, "y":3}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"N", "x":7.25, "y":3}, - {"label":"M", "x":8.25, "y":3}, - {"label":"<", "x":9.25, "y":3}, - {"label":">", "x":10.25, "y":3}, - {"label":"?", "x":11.25, "y":3}, - {"label":"Shift", "x":12.25, "y":3, "w":1.75}, - {"label":"MO(1)", "x":14, "y":3}, - {"label":"Ctrl", "x":0, "y":4, "w":1.25}, - {"label":"Win", "x":1.25, "y":4, "w":1.25}, - {"label":"Alt", "x":2.5, "y":4, "w":1.25}, - {"x":3.75, "y":4, "w":6.25}, - {"label":"Alt", "x":10, "y":4, "w":1.25}, - {"label":"Win", "x":11.25, "y":4, "w":1.25}, - {"label":"Menu", "x":12.5, "y":4, "w":1.25}, - {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}, - {"label":"Bspc", "x":14, "y":0} - ] + "LAYOUT": { + "layout": [ + {"label":"~", "x":0, "y":0}, + {"label":"!", "x":1, "y":0}, + {"label":"@", "x":2, "y":0}, + {"label":"#", "x":3, "y":0}, + {"label":"$", "x":4, "y":0}, + {"label":"%", "x":5, "y":0}, + {"label":"^", "x":6, "y":0}, + {"label":"&", "x":7, "y":0}, + {"label":"*", "x":8, "y":0}, + {"label":"(", "x":9, "y":0}, + {"label":")", "x":10, "y":0}, + {"label":"_", "x":11, "y":0}, + {"label":"+", "x":12, "y":0}, + {"label":"Bspc", "x":13, "y":0}, + {"label":"Bspc", "x":14, "y":0}, + {"label":"Tab", "x":0, "y":1, "w":1.5}, + {"label":"Q", "x":1.5, "y":1}, + {"label":"W", "x":2.5, "y":1}, + {"label":"E", "x":3.5, "y":1}, + {"label":"R", "x":4.5, "y":1}, + {"label":"T", "x":5.5, "y":1}, + {"label":"Y", "x":6.5, "y":1}, + {"label":"U", "x":7.5, "y":1}, + {"label":"I", "x":8.5, "y":1}, + {"label":"O", "x":9.5, "y":1}, + {"label":"P", "x":10.5, "y":1}, + {"label":"{", "x":11.5, "y":1}, + {"label":"}", "x":12.5, "y":1}, + {"label":"|", "x":13.5, "y":1, "w":1.5}, + {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, + {"label":"A", "x":1.75, "y":2}, + {"label":"S", "x":2.75, "y":2}, + {"label":"D", "x":3.75, "y":2}, + {"label":"F", "x":4.75, "y":2}, + {"label":"G", "x":5.75, "y":2}, + {"label":"H", "x":6.75, "y":2}, + {"label":"J", "x":7.75, "y":2}, + {"label":"K", "x":8.75, "y":2}, + {"label":"L", "x":9.75, "y":2}, + {"label":":", "x":10.75, "y":2}, + {"label":"\"", "x":11.75, "y":2}, + {"label":"~", "x":12.75, "y":2}, + {"label":"Enter", "x":13.75, "y":2, "w":1.25}, + {"label":"Shift", "x":0, "y":3, "w":1.25}, + {"label":"|", "x":1.25, "y":3}, + {"label":"Z", "x":2.25, "y":3}, + {"label":"X", "x":3.25, "y":3}, + {"label":"C", "x":4.25, "y":3}, + {"label":"V", "x":5.25, "y":3}, + {"label":"B", "x":6.25, "y":3}, + {"label":"N", "x":7.25, "y":3}, + {"label":"M", "x":8.25, "y":3}, + {"label":"<", "x":9.25, "y":3}, + {"label":">", "x":10.25, "y":3}, + {"label":"?", "x":11.25, "y":3}, + {"label":"Shift", "x":12.25, "y":3, "w":1.75}, + {"label":"MO(1)", "x":14, "y":3}, + {"label":"Ctrl", "x":0, "y":4, "w":1.25}, + {"label":"Win", "x":1.25, "y":4, "w":1.25}, + {"label":"Alt", "x":2.5, "y":4, "w":1.25}, + {"x":3.75, "y":4, "w":6.25}, + {"label":"Alt", "x":10, "y":4, "w":1.25}, + {"label":"Win", "x":11.25, "y":4, "w":1.25}, + {"label":"Menu", "x":12.5, "y":4, "w":1.25}, + {"label":"Ctrl", "x":13.75, "y":4, "w":1.25} + ] } } } diff --git a/keyboards/smithrune/iron160_s/iron160_s.h b/keyboards/smithrune/iron160_s/iron160_s.h index ad7843212d94..9320a26b37b3 100644 --- a/keyboards/smithrune/iron160_s/iron160_s.h +++ b/keyboards/smithrune/iron160_s/iron160_s.h @@ -21,7 +21,7 @@ along with this program. If not, see . #include "quantum.h" -#define LAYOUT_all( \ +#define LAYOUT( \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \ diff --git a/keyboards/smithrune/iron160_s/keymaps/default/keymap.c b/keyboards/smithrune/iron160_s/keymaps/default/keymap.c index a80f03a03681..f8790cc60076 100755 --- a/keyboards/smithrune/iron160_s/keymaps/default/keymap.c +++ b/keyboards/smithrune/iron160_s/keymaps/default/keymap.c @@ -18,28 +18,28 @@ along with this program. If not, see . #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_all( - KC_GESC, KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_MINS, KC_EQL , KC_BSPC, + [0] = LAYOUT( + QK_GESC, KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_MINS, KC_EQL , KC_BSPC, KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_LBRC, KC_RBRC, KC_BSLS, KC_CAPS, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT , KC_LSFT, KC_BSLS, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1) , KC_LCTL, KC_LWIN, KC_LALT, KC_SPC , KC_RALT, KC_RWIN, MO(1) , KC_RCTL, KC_BSPC ), - [1] = LAYOUT_all( + [1] = LAYOUT( QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [2] = LAYOUT_all( + [2] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [3] = LAYOUT_all( + [3] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/smithrune/iron160_s/keymaps/via/keymap.c b/keyboards/smithrune/iron160_s/keymaps/via/keymap.c index a80f03a03681..f8790cc60076 100755 --- a/keyboards/smithrune/iron160_s/keymaps/via/keymap.c +++ b/keyboards/smithrune/iron160_s/keymaps/via/keymap.c @@ -18,28 +18,28 @@ along with this program. If not, see . #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_all( - KC_GESC, KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_MINS, KC_EQL , KC_BSPC, + [0] = LAYOUT( + QK_GESC, KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_MINS, KC_EQL , KC_BSPC, KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_LBRC, KC_RBRC, KC_BSLS, KC_CAPS, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT , KC_LSFT, KC_BSLS, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1) , KC_LCTL, KC_LWIN, KC_LALT, KC_SPC , KC_RALT, KC_RWIN, MO(1) , KC_RCTL, KC_BSPC ), - [1] = LAYOUT_all( + [1] = LAYOUT( QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [2] = LAYOUT_all( + [2] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [3] = LAYOUT_all( + [3] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, From f898a1a9560aaf86d68d31c006416f10a0c0d247 Mon Sep 17 00:00:00 2001 From: Gondolindrim Date: Thu, 9 Mar 2023 23:54:14 -0300 Subject: [PATCH 03/18] Fix I160-H info.json --- keyboards/smithrune/iron160_h/info.json | 129 ++++++++++++------------ 1 file changed, 64 insertions(+), 65 deletions(-) diff --git a/keyboards/smithrune/iron160_h/info.json b/keyboards/smithrune/iron160_h/info.json index 825f4bfb85f8..f68589817fbd 100644 --- a/keyboards/smithrune/iron160_h/info.json +++ b/keyboards/smithrune/iron160_h/info.json @@ -10,71 +10,70 @@ }, "layouts": { "LAYOUT": { - "layout": [ - {"label":"~", "x":0, "y":0}, - {"label":"!", "x":1, "y":0}, - {"label":"@", "x":2, "y":0}, - {"label":"#", "x":3, "y":0}, - {"label":"$", "x":4, "y":0}, - {"label":"%", "x":5, "y":0}, - {"label":"^", "x":6, "y":0}, - {"label":"&", "x":7, "y":0}, - {"label":"*", "x":8, "y":0}, - {"label":"(", "x":9, "y":0}, - {"label":")", "x":10, "y":0}, - {"label":"_", "x":11, "y":0}, - {"label":"+", "x":12, "y":0}, - {"label":"Bspc", "x":13, "y":0}, - {"label":"Bspc", "x":14, "y":0}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":2.5, "y":1}, - {"label":"E", "x":3.5, "y":1}, - {"label":"R", "x":4.5, "y":1}, - {"label":"T", "x":5.5, "y":1}, - {"label":"Y", "x":6.5, "y":1}, - {"label":"U", "x":7.5, "y":1}, - {"label":"I", "x":8.5, "y":1}, - {"label":"O", "x":9.5, "y":1}, - {"label":"P", "x":10.5, "y":1}, - {"label":"{", "x":11.5, "y":1}, - {"label":"}", "x":12.5, "y":1}, - {"label":"|", "x":13.5, "y":1, "w":1.5}, - {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":6.75, "y":2}, - {"label":"J", "x":7.75, "y":2}, - {"label":"K", "x":8.75, "y":2}, - {"label":"L", "x":9.75, "y":2}, - {"label":":", "x":10.75, "y":2}, - {"label":"\"", "x":11.75, "y":2}, - {"label":"Enter", "x":12.75, "y":2, "w":1.25}, - {"label":"Shift", "x":0, "y":3, "w":1.25}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"N", "x":7.25, "y":3}, - {"label":"M", "x":8.25, "y":3}, - {"label":"<", "x":9.25, "y":3}, - {"label":">", "x":10.25, "y":3}, - {"label":"?", "x":11.25, "y":3}, - {"label":"Shift", "x":12.25, "y":3, "w":1.75}, - {"label":"MO(1)", "x":14, "y":3}, - {"label":"Ctrl", "x":0, "y":4, "w":1.25}, - {"label":"Win", "x":1.25, "y":4, "w":1.25}, - {"label":"Alt", "x":2.5, "y":4, "w":1.25}, - {"x":3.75, "y":4, "w":6.25}, - {"label":"Alt", "x":10, "y":4, "w":1.25}, - {"label":"Win", "x":11.25, "y":4, "w":1.25}, - {"label":"Menu", "x":12.5, "y":4, "w":1.25}, - {"label":"Ctrl", "x":13.75, "y":4, "w":1.25} - ] + "layout": [ + {"label":"~", "x":0, "y":0}, + {"label":"!", "x":1, "y":0}, + {"label":"@", "x":2, "y":0}, + {"label":"#", "x":3, "y":0}, + {"label":"$", "x":4, "y":0}, + {"label":"%", "x":5, "y":0}, + {"label":"^", "x":6, "y":0}, + {"label":"&", "x":7, "y":0}, + {"label":"*", "x":8, "y":0}, + {"label":"(", "x":9, "y":0}, + {"label":")", "x":10, "y":0}, + {"label":"_", "x":11, "y":0}, + {"label":"+", "x":12, "y":0}, + {"label":"Bspc", "x":13, "y":0}, + {"label":"Bspc", "x":14, "y":0}, + {"label":"Tab", "x":0, "y":1, "w":1.5}, + {"label":"Q", "x":1.5, "y":1}, + {"label":"W", "x":2.5, "y":1}, + {"label":"E", "x":3.5, "y":1}, + {"label":"R", "x":4.5, "y":1}, + {"label":"T", "x":5.5, "y":1}, + {"label":"Y", "x":6.5, "y":1}, + {"label":"U", "x":7.5, "y":1}, + {"label":"I", "x":8.5, "y":1}, + {"label":"O", "x":9.5, "y":1}, + {"label":"P", "x":10.5, "y":1}, + {"label":"{", "x":11.5, "y":1}, + {"label":"}", "x":12.5, "y":1}, + {"label":"|", "x":13.5, "y":1, "w":1.5}, + {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, + {"label":"A", "x":1.75, "y":2}, + {"label":"S", "x":2.75, "y":2}, + {"label":"D", "x":3.75, "y":2}, + {"label":"F", "x":4.75, "y":2}, + {"label":"G", "x":5.75, "y":2}, + {"label":"H", "x":6.75, "y":2}, + {"label":"J", "x":7.75, "y":2}, + {"label":"K", "x":8.75, "y":2}, + {"label":"L", "x":9.75, "y":2}, + {"label":":", "x":10.75, "y":2}, + {"label":"\"", "x":11.75, "y":2}, + {"label":"Enter", "x":12.75, "y":2, "w":1.25}, + {"label":"Shift", "x":0, "y":3, "w":1.25}, + {"label":"Z", "x":2.25, "y":3}, + {"label":"X", "x":3.25, "y":3}, + {"label":"C", "x":4.25, "y":3}, + {"label":"V", "x":5.25, "y":3}, + {"label":"B", "x":6.25, "y":3}, + {"label":"N", "x":7.25, "y":3}, + {"label":"M", "x":8.25, "y":3}, + {"label":"<", "x":9.25, "y":3}, + {"label":">", "x":10.25, "y":3}, + {"label":"?", "x":11.25, "y":3}, + {"label":"Shift", "x":12.25, "y":3, "w":1.75}, + {"label":"MO(1)", "x":14, "y":3}, + {"label":"Ctrl", "x":0, "y":4, "w":1.25}, + {"label":"Win", "x":1.5, "y":4}, + {"label":"Alt", "x":2.5, "y":4, "w":1.25}, + {"x":4, "y":4, "w":7}, + {"label":"Alt", "x":11, "y":4, "w":1.5}, + {"label":"Win", "x":12.5, "y":4}, + {"label":"Ctrl", "x":13.5, "y":4, "w":1.5} + ] } } } From b63a34ec843f187b7df7f0d0bd16398ea28c3dbf Mon Sep 17 00:00:00 2001 From: Gondolindrim Date: Fri, 10 Mar 2023 00:01:13 -0300 Subject: [PATCH 04/18] Move variants to same folder, add README --- .../{ => iron160}/iron160_h/config.h | 0 .../{ => iron160}/iron160_h/halconf.h | 0 .../{ => iron160}/iron160_h/info.json | 0 .../{ => iron160}/iron160_h/iron160_h.c | 0 .../{ => iron160}/iron160_h/iron160_h.h | 0 .../iron160_h/keymaps/default/keymap.c | 0 .../iron160_h/keymaps/via/keymap.c | 0 .../iron160_h/keymaps/via/rules.mk | 0 .../{ => iron160}/iron160_h/mcuconf.h | 0 .../{ => iron160}/iron160_h/rules.mk | 0 .../{ => iron160}/iron160_s/config.h | 0 .../{ => iron160}/iron160_s/halconf.h | 0 .../{ => iron160}/iron160_s/info.json | 0 .../{ => iron160}/iron160_s/iron160_s.c | 0 .../{ => iron160}/iron160_s/iron160_s.h | 0 .../iron160_s/keymaps/default/keymap.c | 0 .../iron160_s/keymaps/via/keymap.c | 0 .../iron160_s/keymaps/via/rules.mk | 0 .../{ => iron160}/iron160_s/mcuconf.h | 0 .../{ => iron160}/iron160_s/rules.mk | 0 keyboards/smithrune/iron160/readme.md | 34 +++++++++++++++++++ 21 files changed, 34 insertions(+) rename keyboards/smithrune/{ => iron160}/iron160_h/config.h (100%) rename keyboards/smithrune/{ => iron160}/iron160_h/halconf.h (100%) rename keyboards/smithrune/{ => iron160}/iron160_h/info.json (100%) rename keyboards/smithrune/{ => iron160}/iron160_h/iron160_h.c (100%) rename keyboards/smithrune/{ => iron160}/iron160_h/iron160_h.h (100%) rename keyboards/smithrune/{ => iron160}/iron160_h/keymaps/default/keymap.c (100%) rename keyboards/smithrune/{ => iron160}/iron160_h/keymaps/via/keymap.c (100%) rename keyboards/smithrune/{ => iron160}/iron160_h/keymaps/via/rules.mk (100%) rename keyboards/smithrune/{ => iron160}/iron160_h/mcuconf.h (100%) rename keyboards/smithrune/{ => iron160}/iron160_h/rules.mk (100%) rename keyboards/smithrune/{ => iron160}/iron160_s/config.h (100%) rename keyboards/smithrune/{ => iron160}/iron160_s/halconf.h (100%) rename keyboards/smithrune/{ => iron160}/iron160_s/info.json (100%) rename keyboards/smithrune/{ => iron160}/iron160_s/iron160_s.c (100%) rename keyboards/smithrune/{ => iron160}/iron160_s/iron160_s.h (100%) rename keyboards/smithrune/{ => iron160}/iron160_s/keymaps/default/keymap.c (100%) rename keyboards/smithrune/{ => iron160}/iron160_s/keymaps/via/keymap.c (100%) rename keyboards/smithrune/{ => iron160}/iron160_s/keymaps/via/rules.mk (100%) rename keyboards/smithrune/{ => iron160}/iron160_s/mcuconf.h (100%) rename keyboards/smithrune/{ => iron160}/iron160_s/rules.mk (100%) create mode 100644 keyboards/smithrune/iron160/readme.md diff --git a/keyboards/smithrune/iron160_h/config.h b/keyboards/smithrune/iron160/iron160_h/config.h similarity index 100% rename from keyboards/smithrune/iron160_h/config.h rename to keyboards/smithrune/iron160/iron160_h/config.h diff --git a/keyboards/smithrune/iron160_h/halconf.h b/keyboards/smithrune/iron160/iron160_h/halconf.h similarity index 100% rename from keyboards/smithrune/iron160_h/halconf.h rename to keyboards/smithrune/iron160/iron160_h/halconf.h diff --git a/keyboards/smithrune/iron160_h/info.json b/keyboards/smithrune/iron160/iron160_h/info.json similarity index 100% rename from keyboards/smithrune/iron160_h/info.json rename to keyboards/smithrune/iron160/iron160_h/info.json diff --git a/keyboards/smithrune/iron160_h/iron160_h.c b/keyboards/smithrune/iron160/iron160_h/iron160_h.c similarity index 100% rename from keyboards/smithrune/iron160_h/iron160_h.c rename to keyboards/smithrune/iron160/iron160_h/iron160_h.c diff --git a/keyboards/smithrune/iron160_h/iron160_h.h b/keyboards/smithrune/iron160/iron160_h/iron160_h.h similarity index 100% rename from keyboards/smithrune/iron160_h/iron160_h.h rename to keyboards/smithrune/iron160/iron160_h/iron160_h.h diff --git a/keyboards/smithrune/iron160_h/keymaps/default/keymap.c b/keyboards/smithrune/iron160/iron160_h/keymaps/default/keymap.c similarity index 100% rename from keyboards/smithrune/iron160_h/keymaps/default/keymap.c rename to keyboards/smithrune/iron160/iron160_h/keymaps/default/keymap.c diff --git a/keyboards/smithrune/iron160_h/keymaps/via/keymap.c b/keyboards/smithrune/iron160/iron160_h/keymaps/via/keymap.c similarity index 100% rename from keyboards/smithrune/iron160_h/keymaps/via/keymap.c rename to keyboards/smithrune/iron160/iron160_h/keymaps/via/keymap.c diff --git a/keyboards/smithrune/iron160_h/keymaps/via/rules.mk b/keyboards/smithrune/iron160/iron160_h/keymaps/via/rules.mk similarity index 100% rename from keyboards/smithrune/iron160_h/keymaps/via/rules.mk rename to keyboards/smithrune/iron160/iron160_h/keymaps/via/rules.mk diff --git a/keyboards/smithrune/iron160_h/mcuconf.h b/keyboards/smithrune/iron160/iron160_h/mcuconf.h similarity index 100% rename from keyboards/smithrune/iron160_h/mcuconf.h rename to keyboards/smithrune/iron160/iron160_h/mcuconf.h diff --git a/keyboards/smithrune/iron160_h/rules.mk b/keyboards/smithrune/iron160/iron160_h/rules.mk similarity index 100% rename from keyboards/smithrune/iron160_h/rules.mk rename to keyboards/smithrune/iron160/iron160_h/rules.mk diff --git a/keyboards/smithrune/iron160_s/config.h b/keyboards/smithrune/iron160/iron160_s/config.h similarity index 100% rename from keyboards/smithrune/iron160_s/config.h rename to keyboards/smithrune/iron160/iron160_s/config.h diff --git a/keyboards/smithrune/iron160_s/halconf.h b/keyboards/smithrune/iron160/iron160_s/halconf.h similarity index 100% rename from keyboards/smithrune/iron160_s/halconf.h rename to keyboards/smithrune/iron160/iron160_s/halconf.h diff --git a/keyboards/smithrune/iron160_s/info.json b/keyboards/smithrune/iron160/iron160_s/info.json similarity index 100% rename from keyboards/smithrune/iron160_s/info.json rename to keyboards/smithrune/iron160/iron160_s/info.json diff --git a/keyboards/smithrune/iron160_s/iron160_s.c b/keyboards/smithrune/iron160/iron160_s/iron160_s.c similarity index 100% rename from keyboards/smithrune/iron160_s/iron160_s.c rename to keyboards/smithrune/iron160/iron160_s/iron160_s.c diff --git a/keyboards/smithrune/iron160_s/iron160_s.h b/keyboards/smithrune/iron160/iron160_s/iron160_s.h similarity index 100% rename from keyboards/smithrune/iron160_s/iron160_s.h rename to keyboards/smithrune/iron160/iron160_s/iron160_s.h diff --git a/keyboards/smithrune/iron160_s/keymaps/default/keymap.c b/keyboards/smithrune/iron160/iron160_s/keymaps/default/keymap.c similarity index 100% rename from keyboards/smithrune/iron160_s/keymaps/default/keymap.c rename to keyboards/smithrune/iron160/iron160_s/keymaps/default/keymap.c diff --git a/keyboards/smithrune/iron160_s/keymaps/via/keymap.c b/keyboards/smithrune/iron160/iron160_s/keymaps/via/keymap.c similarity index 100% rename from keyboards/smithrune/iron160_s/keymaps/via/keymap.c rename to keyboards/smithrune/iron160/iron160_s/keymaps/via/keymap.c diff --git a/keyboards/smithrune/iron160_s/keymaps/via/rules.mk b/keyboards/smithrune/iron160/iron160_s/keymaps/via/rules.mk similarity index 100% rename from keyboards/smithrune/iron160_s/keymaps/via/rules.mk rename to keyboards/smithrune/iron160/iron160_s/keymaps/via/rules.mk diff --git a/keyboards/smithrune/iron160_s/mcuconf.h b/keyboards/smithrune/iron160/iron160_s/mcuconf.h similarity index 100% rename from keyboards/smithrune/iron160_s/mcuconf.h rename to keyboards/smithrune/iron160/iron160_s/mcuconf.h diff --git a/keyboards/smithrune/iron160_s/rules.mk b/keyboards/smithrune/iron160/iron160_s/rules.mk similarity index 100% rename from keyboards/smithrune/iron160_s/rules.mk rename to keyboards/smithrune/iron160/iron160_s/rules.mk diff --git a/keyboards/smithrune/iron160/readme.md b/keyboards/smithrune/iron160/readme.md new file mode 100644 index 000000000000..f81bc4f0f8b9 --- /dev/null +++ b/keyboards/smithrune/iron160/readme.md @@ -0,0 +1,34 @@ +# Iron 160 QMK folder + +![Iron160](https://i.imgur.com/8B2l2pn.jpg) + +## Introduction + +This is the QMK Firmware repository for the Iron160 PCB, a keyboard designed by [Smith and Rune](https://smithrune.com/) and PCB designed by [Gondolindrim](http://github.com/Gondolindrim), who is also the firwmare maintainer. + +There are two variants of the PCB: a solderable (I160-S) and a hotswap (I160-H) PCB. Both support a myriad of alternative layouts, as well as RGB LEDs for underglow light. + +## How to flash + +### Enter bootloader + +The DFU state in the bootloader can be accessed in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key, escape in the default keymap) and plug in the keyboard; +* **Physical reset button**: press the button on the front of the PCB, next to caps lock, for at least five seconds; +* **Keycode in layout**: Press the key mapped to `QK_BOOT`; in the default layout, that is top left key ('escape') in layer 1. + +### How to compile and flash + +After checking what PCB you own and setting up your build environment, you can compile the Iron 165R2 default keymap by using one of the options below. + + make smithrune/iron160/iron160_s:default + make smithrune/iron160/iron160_h:default + +And use dfu-util in the command line or through a GUI like QMK toolbox to upload the firmware to the PCB. To directly flash the PCB after it is put into a DFU state, use: + + + make smithrune/iron160/iron160_s:default:flash + make smithrune/iron160/iron160_h:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). From 8f1bf58e0bd42bcc88fa7a60dcf8a7ac1be59125 Mon Sep 17 00:00:00 2001 From: Gondolindrim Date: Fri, 10 Mar 2023 00:06:10 -0300 Subject: [PATCH 05/18] Add license header to mcuconf --- keyboards/smithrune/iron160/iron160_h/mcuconf.h | 2 +- keyboards/smithrune/iron160/iron160_s/mcuconf.h | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/keyboards/smithrune/iron160/iron160_h/mcuconf.h b/keyboards/smithrune/iron160/iron160_h/mcuconf.h index 66f106db1f86..357bfe1c6c7d 100644 --- a/keyboards/smithrune/iron160/iron160_h/mcuconf.h +++ b/keyboards/smithrune/iron160/iron160_h/mcuconf.h @@ -1,4 +1,4 @@ -/* Copyright 2022 Gondolindrim +/* Copyright 2022 Gondolindrim * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/keyboards/smithrune/iron160/iron160_s/mcuconf.h b/keyboards/smithrune/iron160/iron160_s/mcuconf.h index fbdfecf3bdc1..c9bd9ded2679 100644 --- a/keyboards/smithrune/iron160/iron160_s/mcuconf.h +++ b/keyboards/smithrune/iron160/iron160_s/mcuconf.h @@ -1,3 +1,20 @@ +/* +Copyright 2022 Gondolindrim + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + #pragma once #include_next From 35c85f0dcb915c3d0a8dc02c563d5d88be4a0e0c Mon Sep 17 00:00:00 2001 From: Gondolindrim Date: Fri, 10 Mar 2023 00:55:40 -0300 Subject: [PATCH 06/18] Remove caps lock LED update callback --- keyboards/smithrune/iron160/iron160_s/iron160_s.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/keyboards/smithrune/iron160/iron160_s/iron160_s.c b/keyboards/smithrune/iron160/iron160_s/iron160_s.c index 82aaa4f7bbe1..d78be6b6a40d 100644 --- a/keyboards/smithrune/iron160/iron160_s/iron160_s.c +++ b/keyboards/smithrune/iron160/iron160_s/iron160_s.c @@ -16,10 +16,3 @@ along with this program. If not, see . */ #include "iron160_s.h" - -bool led_update_kb(led_t led_state) { - bool res = led_update_user(led_state); - if(res) writePin(LED_CAPS_LOCK_PIN, led_state.caps_lock); - return res; -} - From 0fa884797f8e940a19913ec6a2f257d1e8877c77 Mon Sep 17 00:00:00 2001 From: Gondolindrim Date: Fri, 10 Mar 2023 00:57:11 -0300 Subject: [PATCH 07/18] Remove MATRIX_COLS and MATRIX_ROWS --- keyboards/smithrune/iron160/iron160_s/config.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/keyboards/smithrune/iron160/iron160_s/config.h b/keyboards/smithrune/iron160/iron160_s/config.h index 967e2575c4c3..e78b7971dc3a 100644 --- a/keyboards/smithrune/iron160/iron160_s/config.h +++ b/keyboards/smithrune/iron160/iron160_s/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 14 - // C0 , C1 , C2 , C3 , C4 , C5 , C6 , C7 , C8 , C9 , C10, C11, C12, C13 #define MATRIX_COL_PINS { A3 , B9 , B8 , B5 , B4 , B3 , A6 , A5 , A4 , A2 , A1 , A0 , C15, C14} // R0 , R1 , R2 , R3 , R4 From d7770bf7911e75fab156b8bc848a04b98072a333 Mon Sep 17 00:00:00 2001 From: Gondolindrim Date: Fri, 10 Mar 2023 00:59:03 -0300 Subject: [PATCH 08/18] Add low-res version iamge to README --- keyboards/smithrune/iron160/iron160_h/config.h | 4 ---- keyboards/smithrune/iron160/readme.md | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/keyboards/smithrune/iron160/iron160_h/config.h b/keyboards/smithrune/iron160/iron160_h/config.h index 0e25832acf3f..9bbfa182ab84 100644 --- a/keyboards/smithrune/iron160/iron160_h/config.h +++ b/keyboards/smithrune/iron160/iron160_h/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 14 - // C0 , C1 , C2 , C3 , C4 , C5 , C6 , C7 , C8 , C9 , C10, C11, C12, C13 #define MATRIX_COL_PINS { A3 , B9 , B8 , B5 , B4 , B3 , A6 , A5 , A4 , A2 , A1 , A0 , C15, C14} // R0 , R1 , R2 , R3 , R4 diff --git a/keyboards/smithrune/iron160/readme.md b/keyboards/smithrune/iron160/readme.md index f81bc4f0f8b9..2c4fe63d461d 100644 --- a/keyboards/smithrune/iron160/readme.md +++ b/keyboards/smithrune/iron160/readme.md @@ -1,6 +1,6 @@ # Iron 160 QMK folder -![Iron160](https://i.imgur.com/8B2l2pn.jpg) +![Iron160](https://i.imgur.com/8B2l2pnh.jpg) ## Introduction From 65909ac610b097c0a66465de64bda299a1e280a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20A=2E=20Volpato?= Date: Fri, 10 Mar 2023 15:27:27 -0300 Subject: [PATCH 09/18] Remove processor, bootloader, backlight and matrix configurations from source files Co-authored-by: Ryan --- keyboards/smithrune/iron160/iron160_h/config.h | 9 --------- keyboards/smithrune/iron160/iron160_h/rules.mk | 6 ------ keyboards/smithrune/iron160/iron160_s/config.h | 11 ----------- keyboards/smithrune/iron160/iron160_s/rules.mk | 6 ------ 4 files changed, 32 deletions(-) diff --git a/keyboards/smithrune/iron160/iron160_h/config.h b/keyboards/smithrune/iron160/iron160_h/config.h index 9bbfa182ab84..bc089cbfb7f7 100644 --- a/keyboards/smithrune/iron160/iron160_h/config.h +++ b/keyboards/smithrune/iron160/iron160_h/config.h @@ -17,18 +17,9 @@ along with this program. If not, see . #pragma once -// C0 , C1 , C2 , C3 , C4 , C5 , C6 , C7 , C8 , C9 , C10, C11, C12, C13 -#define MATRIX_COL_PINS { A3 , B9 , B8 , B5 , B4 , B3 , A6 , A5 , A4 , A2 , A1 , A0 , C15, C14} -// R0 , R1 , R2 , R3 , R4 -#define MATRIX_ROW_PINS { A10, A15, C13, A7 , B0 } -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B15 #define RGBLED_NUM 1 -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/smithrune/iron160/iron160_h/rules.mk b/keyboards/smithrune/iron160/iron160_h/rules.mk index 06a00ed57f37..4c6ba89ef9d0 100644 --- a/keyboards/smithrune/iron160/iron160_h/rules.mk +++ b/keyboards/smithrune/iron160/iron160_h/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/smithrune/iron160/iron160_s/config.h b/keyboards/smithrune/iron160/iron160_s/config.h index e78b7971dc3a..09fa7075fa72 100644 --- a/keyboards/smithrune/iron160/iron160_s/config.h +++ b/keyboards/smithrune/iron160/iron160_s/config.h @@ -17,20 +17,9 @@ along with this program. If not, see . #pragma once -// C0 , C1 , C2 , C3 , C4 , C5 , C6 , C7 , C8 , C9 , C10, C11, C12, C13 -#define MATRIX_COL_PINS { A3 , B9 , B8 , B5 , B4 , B3 , A6 , A5 , A4 , A2 , A1 , A0 , C15, C14} -// R0 , R1 , R2 , R3 , R4 -#define MATRIX_ROW_PINS { A10, A15, C13, B1 , B10} -#define DIODE_DIRECTION COL2ROW - -#define BACKLIGHT_PIN A7 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 2 #define BACKLIGHT_PAL_MODE 1 -#define BACKLIGHT_LEVELS 20 -#define BACKLIGHT_BREATHING -#define BREATHING_PERIOD 3 -#define BACKLIGHT_ON_STATE 1 #define LED_CAPS_LOCK_PIN B0 /* Set 0 if debouncing isn't needed */ #define DEBOUNCE 5 diff --git a/keyboards/smithrune/iron160/iron160_s/rules.mk b/keyboards/smithrune/iron160/iron160_s/rules.mk index b8d0512ae209..b7824fcbdf74 100644 --- a/keyboards/smithrune/iron160/iron160_s/rules.mk +++ b/keyboards/smithrune/iron160/iron160_s/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # From 11a1b9521d290bf5600ff3d2d6c00cd47f879f0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20A=2E=20Volpato?= Date: Fri, 10 Mar 2023 15:27:59 -0300 Subject: [PATCH 10/18] Move matrix, indicator, backlight and processor info to info.json Co-authored-by: Ryan --- keyboards/smithrune/iron160/iron160_s/info.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/keyboards/smithrune/iron160/iron160_s/info.json b/keyboards/smithrune/iron160/iron160_s/info.json index 74d73fb67798..58f462b0c6bd 100644 --- a/keyboards/smithrune/iron160/iron160_s/info.json +++ b/keyboards/smithrune/iron160/iron160_s/info.json @@ -8,6 +8,22 @@ "pid": "0x1653", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader: "stm32-dfu", + "matrix_pins": { + "cols": ["A3", "B9", "B8", "B5", "B4", "B3", "A6", "A5", "A4", "A2", "A1", "A0", "C15", "C14"], + "rows": ["A10", "A15", "C13", "B1", "B10"] + }, + "diode_direction": "COL2ROW", + "backlight": { + "pin": "A7", + "levels": 20, + "breathing": true, + "breathing_period": 3 + }, + "indicators": { + "caps_lock": "B0" + }, "layouts": { "LAYOUT": { "layout": [ From 3343f9a45ae40694a048ce2a90ccdd9844ba5c6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20A=2E=20Volpato?= Date: Fri, 10 Mar 2023 15:28:49 -0300 Subject: [PATCH 11/18] Remove indicator options from config.h Co-authored-by: Ryan --- keyboards/smithrune/iron160/iron160_s/config.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/keyboards/smithrune/iron160/iron160_s/config.h b/keyboards/smithrune/iron160/iron160_s/config.h index 09fa7075fa72..e5da34f31218 100644 --- a/keyboards/smithrune/iron160/iron160_s/config.h +++ b/keyboards/smithrune/iron160/iron160_s/config.h @@ -20,10 +20,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 2 #define BACKLIGHT_PAL_MODE 1 -#define LED_CAPS_LOCK_PIN B0 -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ From e2c3d659c359bab24eae20eb0187c370798be158 Mon Sep 17 00:00:00 2001 From: Gondolindrim Date: Fri, 10 Mar 2023 15:32:35 -0300 Subject: [PATCH 12/18] Fix delimiter in info.json --- keyboards/smithrune/iron160/iron160_s/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/smithrune/iron160/iron160_s/info.json b/keyboards/smithrune/iron160/iron160_s/info.json index 58f462b0c6bd..f400bdac852b 100644 --- a/keyboards/smithrune/iron160/iron160_s/info.json +++ b/keyboards/smithrune/iron160/iron160_s/info.json @@ -9,7 +9,7 @@ "device_version": "0.0.1" }, "processor": "STM32F072", - "bootloader: "stm32-dfu", + "bootloader": "stm32-dfu", "matrix_pins": { "cols": ["A3", "B9", "B8", "B5", "B4", "B3", "A6", "A5", "A4", "A2", "A1", "A0", "C15", "C14"], "rows": ["A10", "A15", "C13", "B1", "B10"] From bbafa1ac73e6ef684b4bc08bb2b6e045901d89c8 Mon Sep 17 00:00:00 2001 From: Gondolindrim Date: Fri, 10 Mar 2023 16:16:54 -0300 Subject: [PATCH 13/18] HS PCB options moved to info.json --- .../smithrune/iron160/iron160_h/info.json | 131 +++++++++-------- .../smithrune/iron160/iron160_h/iron160_h.c | 2 +- .../smithrune/iron160/iron160_h/iron160_h.h | 36 ----- .../smithrune/iron160/iron160_s/info.json | 132 +++++++++--------- 4 files changed, 136 insertions(+), 165 deletions(-) delete mode 100644 keyboards/smithrune/iron160/iron160_h/iron160_h.h diff --git a/keyboards/smithrune/iron160/iron160_h/info.json b/keyboards/smithrune/iron160/iron160_h/info.json index f68589817fbd..f573df702a87 100644 --- a/keyboards/smithrune/iron160/iron160_h/info.json +++ b/keyboards/smithrune/iron160/iron160_h/info.json @@ -8,71 +8,78 @@ "pid": "0x1648", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", + "matrix_pins": { + "cols": ["A3" , "B9" , "B8" , "B5" , "B4", "B3" , "A6" , "A5" , "A4" , "A2" , "A1" , "A0" , "C15" , "C14"], + "rows": ["A10", "A15", "C13", "A7" , "B0"] + }, + "diode_direction": "COL2ROW", "layouts": { "LAYOUT": { "layout": [ - {"label":"~", "x":0, "y":0}, - {"label":"!", "x":1, "y":0}, - {"label":"@", "x":2, "y":0}, - {"label":"#", "x":3, "y":0}, - {"label":"$", "x":4, "y":0}, - {"label":"%", "x":5, "y":0}, - {"label":"^", "x":6, "y":0}, - {"label":"&", "x":7, "y":0}, - {"label":"*", "x":8, "y":0}, - {"label":"(", "x":9, "y":0}, - {"label":")", "x":10, "y":0}, - {"label":"_", "x":11, "y":0}, - {"label":"+", "x":12, "y":0}, - {"label":"Bspc", "x":13, "y":0}, - {"label":"Bspc", "x":14, "y":0}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":2.5, "y":1}, - {"label":"E", "x":3.5, "y":1}, - {"label":"R", "x":4.5, "y":1}, - {"label":"T", "x":5.5, "y":1}, - {"label":"Y", "x":6.5, "y":1}, - {"label":"U", "x":7.5, "y":1}, - {"label":"I", "x":8.5, "y":1}, - {"label":"O", "x":9.5, "y":1}, - {"label":"P", "x":10.5, "y":1}, - {"label":"{", "x":11.5, "y":1}, - {"label":"}", "x":12.5, "y":1}, - {"label":"|", "x":13.5, "y":1, "w":1.5}, - {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":6.75, "y":2}, - {"label":"J", "x":7.75, "y":2}, - {"label":"K", "x":8.75, "y":2}, - {"label":"L", "x":9.75, "y":2}, - {"label":":", "x":10.75, "y":2}, - {"label":"\"", "x":11.75, "y":2}, - {"label":"Enter", "x":12.75, "y":2, "w":1.25}, - {"label":"Shift", "x":0, "y":3, "w":1.25}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"N", "x":7.25, "y":3}, - {"label":"M", "x":8.25, "y":3}, - {"label":"<", "x":9.25, "y":3}, - {"label":">", "x":10.25, "y":3}, - {"label":"?", "x":11.25, "y":3}, - {"label":"Shift", "x":12.25, "y":3, "w":1.75}, - {"label":"MO(1)", "x":14, "y":3}, - {"label":"Ctrl", "x":0, "y":4, "w":1.25}, - {"label":"Win", "x":1.5, "y":4}, - {"label":"Alt", "x":2.5, "y":4, "w":1.25}, - {"x":4, "y":4, "w":7}, - {"label":"Alt", "x":11, "y":4, "w":1.5}, - {"label":"Win", "x":12.5, "y":4}, - {"label":"Ctrl", "x":13.5, "y":4, "w":1.5} + { "label": "Esc", "matrix": [0, 0 ], "w": 1, "x": 0, "y": 0 }, + { "label": "1", "matrix": [0, 1 ], "w": 1, "x": 1, "y": 0 }, + { "label": "2", "matrix": [0, 2 ], "w": 1, "x": 2, "y": 0 }, + { "label": "3", "matrix": [0, 3 ], "w": 1, "x": 3, "y": 0 }, + { "label": "4", "matrix": [0, 4 ], "w": 1, "x": 4, "y": 0 }, + { "label": "5", "matrix": [0, 5 ], "w": 1, "x": 5, "y": 0 }, + { "label": "6", "matrix": [0, 6 ], "w": 1, "x": 6, "y": 0 }, + { "label": "7", "matrix": [0, 7 ], "w": 1, "x": 7, "y": 0 }, + { "label": "8", "matrix": [0, 8 ], "w": 1, "x": 8, "y": 0 }, + { "label": "9", "matrix": [0, 9 ], "w": 1, "x": 9, "y": 0 }, + { "label": "0", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, + { "label": "_", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 }, + { "label": "+", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 }, + { "label": "Bspc", "matrix": [0, 13], "w": 1, "x": 13, "y": 0 }, + { "label": "Bspc", "matrix": [4, 13], "w": 1, "x": 14, "y": 0 }, + { "label": "Tab", "matrix": [1, 0 ], "w": 1.5, "x": 0, "y": 1 }, + { "label": "Q", "matrix": [1, 1 ], "w": 1, "x": 1.5, "y": 1 }, + { "label": "W", "matrix": [1, 2 ], "w": 1, "x": 2.5, "y": 1 }, + { "label": "E", "matrix": [1, 3 ], "w": 1, "x": 3.5, "y": 1 }, + { "label": "R", "matrix": [1, 4 ], "w": 1, "x": 4.5, "y": 1 }, + { "label": "T", "matrix": [1, 5 ], "w": 1, "x": 5.5, "y": 1 }, + { "label": "Y", "matrix": [1, 6 ], "w": 1, "x": 6.5, "y": 1 }, + { "label": "U", "matrix": [1, 7 ], "w": 1, "x": 7.5, "y": 1 }, + { "label": "I", "matrix": [1, 8 ], "w": 1, "x": 8.5, "y": 1 }, + { "label": "O", "matrix": [1, 9 ], "w": 1, "x": 9.5, "y": 1 }, + { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 }, + { "label": "{", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 }, + { "label": "}", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 }, + { "label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 }, + { "label": "Caps", "matrix": [2, 0 ], "w": 1.75, "x": 0, "y": 2 }, + { "label": "A", "matrix": [2, 1 ], "w": 1, "x": 1.75, "y": 2 }, + { "label": "S", "matrix": [2, 2 ], "w": 1, "x": 2.75, "y": 2 }, + { "label": "D", "matrix": [2, 3 ], "w": 1, "x": 3.75, "y": 2 }, + { "label": "F", "matrix": [2, 4 ], "w": 1, "x": 4.75, "y": 2 }, + { "label": "G", "matrix": [2, 5 ], "w": 1, "x": 5.75, "y": 2 }, + { "label": "H", "matrix": [2, 6 ], "w": 1, "x": 6.75, "y": 2 }, + { "label": "J", "matrix": [2, 7 ], "w": 1, "x": 7.75, "y": 2 }, + { "label": "K", "matrix": [2, 8 ], "w": 1, "x": 8.75, "y": 2 }, + { "label": "L", "matrix": [2, 9 ], "w": 1, "x": 9.75, "y": 2 }, + { "label": ":", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 }, + { "label": "\"", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 }, + { "label": "Enter", "matrix": [2, 13], "w": 1.25, "x": 12.75, "y": 2 }, + { "label": "Shift", "matrix": [3, 0 ], "w": 1.25, "x": 0, "y": 3 }, + { "label": "Z", "matrix": [3, 2 ], "w": 1, "x": 2.25, "y": 3 }, + { "label": "X", "matrix": [3, 3 ], "w": 1, "x": 3.25, "y": 3 }, + { "label": "C", "matrix": [3, 4 ], "w": 1, "x": 4.25, "y": 3 }, + { "label": "V", "matrix": [3, 5 ], "w": 1, "x": 5.25, "y": 3 }, + { "label": "B", "matrix": [3, 6 ], "w": 1, "x": 6.25, "y": 3 }, + { "label": "N", "matrix": [3, 7 ], "w": 1, "x": 7.25, "y": 3 }, + { "label": "M", "matrix": [3, 8 ], "w": 1, "x": 8.25, "y": 3 }, + { "label": "<", "matrix": [3, 9 ], "w": 1, "x": 9.25, "y": 3 }, + { "label": ">", "matrix": [3, 10], "w": 1, "x": 10.25, "y": 3 }, + { "label": "?", "matrix": [3, 11], "w": 1, "x": 11.25, "y": 3 }, + { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 }, + { "label": "MO(1)", "matrix": [3, 13], "w": 1, "x": 14, "y": 3 }, + { "label": "Ctrl", "matrix": [4, 0 ], "w": 1.25, "x": 0, "y": 4 }, + { "label": "Win", "matrix": [4, 1 ], "w": 1, "x": 1.5, "y": 4 }, + { "label": "Alt", "matrix": [4, 2 ], "w": 1.25, "x": 2.5, "y": 4 }, + { "label": "Space", "matrix": [4, 6 ], "w": 7, "x": 4, "y": 4 }, + { "label": "Alt", "matrix": [4, 10], "w": 1.5, "x": 11, "y": 4 }, + { "label": "Win", "matrix": [4, 11], "w": 1, "x": 12.5, "y": 4 }, + { "label": "Ctrl", "matrix": [4, 12], "w": 1.5, "x": 13.5, "y": 4 } ] } } diff --git a/keyboards/smithrune/iron160/iron160_h/iron160_h.c b/keyboards/smithrune/iron160/iron160_h/iron160_h.c index 611b40cc1a2a..d87d4cbf3bc4 100644 --- a/keyboards/smithrune/iron160/iron160_h/iron160_h.c +++ b/keyboards/smithrune/iron160/iron160_h/iron160_h.c @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "iron160_h.h" +#include "quantum.h" // Defining indicator colors uint8_t caps_color[3] = {0x33,0x33,0x33}; diff --git a/keyboards/smithrune/iron160/iron160_h/iron160_h.h b/keyboards/smithrune/iron160/iron160_h/iron160_h.h deleted file mode 100644 index 2e877b7bf25b..000000000000 --- a/keyboards/smithrune/iron160/iron160_h/iron160_h.h +++ /dev/null @@ -1,36 +0,0 @@ -/* -Copyright 2022 Gondolindrim - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -#define ___ KC_NO - -#include "quantum.h" - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \ - K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ - K40, K41, K42, K46, K4A, K4B, K4C, K4D \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D}, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D}, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D}, \ - { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D}, \ - { K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, K4A, K4B, K4C, K4D} \ -} diff --git a/keyboards/smithrune/iron160/iron160_s/info.json b/keyboards/smithrune/iron160/iron160_s/info.json index f400bdac852b..5eda7443b431 100644 --- a/keyboards/smithrune/iron160/iron160_s/info.json +++ b/keyboards/smithrune/iron160/iron160_s/info.json @@ -27,72 +27,72 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"~", "x":0, "y":0}, - {"label":"!", "x":1, "y":0}, - {"label":"@", "x":2, "y":0}, - {"label":"#", "x":3, "y":0}, - {"label":"$", "x":4, "y":0}, - {"label":"%", "x":5, "y":0}, - {"label":"^", "x":6, "y":0}, - {"label":"&", "x":7, "y":0}, - {"label":"*", "x":8, "y":0}, - {"label":"(", "x":9, "y":0}, - {"label":")", "x":10, "y":0}, - {"label":"_", "x":11, "y":0}, - {"label":"+", "x":12, "y":0}, - {"label":"Bspc", "x":13, "y":0}, - {"label":"Bspc", "x":14, "y":0}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":2.5, "y":1}, - {"label":"E", "x":3.5, "y":1}, - {"label":"R", "x":4.5, "y":1}, - {"label":"T", "x":5.5, "y":1}, - {"label":"Y", "x":6.5, "y":1}, - {"label":"U", "x":7.5, "y":1}, - {"label":"I", "x":8.5, "y":1}, - {"label":"O", "x":9.5, "y":1}, - {"label":"P", "x":10.5, "y":1}, - {"label":"{", "x":11.5, "y":1}, - {"label":"}", "x":12.5, "y":1}, - {"label":"|", "x":13.5, "y":1, "w":1.5}, - {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":6.75, "y":2}, - {"label":"J", "x":7.75, "y":2}, - {"label":"K", "x":8.75, "y":2}, - {"label":"L", "x":9.75, "y":2}, - {"label":":", "x":10.75, "y":2}, - {"label":"\"", "x":11.75, "y":2}, - {"label":"~", "x":12.75, "y":2}, - {"label":"Enter", "x":13.75, "y":2, "w":1.25}, - {"label":"Shift", "x":0, "y":3, "w":1.25}, - {"label":"|", "x":1.25, "y":3}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"N", "x":7.25, "y":3}, - {"label":"M", "x":8.25, "y":3}, - {"label":"<", "x":9.25, "y":3}, - {"label":">", "x":10.25, "y":3}, - {"label":"?", "x":11.25, "y":3}, - {"label":"Shift", "x":12.25, "y":3, "w":1.75}, - {"label":"MO(1)", "x":14, "y":3}, - {"label":"Ctrl", "x":0, "y":4, "w":1.25}, - {"label":"Win", "x":1.25, "y":4, "w":1.25}, - {"label":"Alt", "x":2.5, "y":4, "w":1.25}, - {"x":3.75, "y":4, "w":6.25}, - {"label":"Alt", "x":10, "y":4, "w":1.25}, - {"label":"Win", "x":11.25, "y":4, "w":1.25}, - {"label":"Menu", "x":12.5, "y":4, "w":1.25}, - {"label":"Ctrl", "x":13.75, "y":4, "w":1.25} - ] + { "label": "~", "matrix": [0, 0 ], "w": 1, "x": 0, "y": 0 }, + { "label": "!", "matrix": [0, 1 ], "w": 1, "x": 1, "y": 0 }, + { "label": "@", "matrix": [0, 2 ], "w": 1, "x": 2, "y": 0 }, + { "label": "#", "matrix": [0, 3 ], "w": 1, "x": 3, "y": 0 }, + { "label": "$", "matrix": [0, 4 ], "w": 1, "x": 4, "y": 0 }, + { "label": "%", "matrix": [0, 5 ], "w": 1, "x": 5, "y": 0 }, + { "label": "^", "matrix": [0, 6 ], "w": 1, "x": 6, "y": 0 }, + { "label": "&", "matrix": [0, 7 ], "w": 1, "x": 7, "y": 0 }, + { "label": "*", "matrix": [0, 8 ], "w": 1, "x": 8, "y": 0 }, + { "label": "(", "matrix": [0, 9 ], "w": 1, "x": 9, "y": 0 }, + { "label": ")", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, + { "label": "_", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 }, + { "label": "+", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 }, + { "label": "Bspc", "matrix": [0, 13], "w": 1, "x": 13, "y": 0 }, + { "label": "Bspc", "matrix": [4, 13], "w": 1, "x": 14, "y": 0 }, + { "label": "Tab", "matrix": [1, 0 ], "w": 1.5, "x": 0, "y": 1 }, + { "label": "Q", "matrix": [1, 1 ], "w": 1, "x": 1.5, "y": 1 }, + { "label": "W", "matrix": [1, 2 ], "w": 1, "x": 2.5, "y": 1 }, + { "label": "E", "matrix": [1, 3 ], "w": 1, "x": 3.5, "y": 1 }, + { "label": "R", "matrix": [1, 4 ], "w": 1, "x": 4.5, "y": 1 }, + { "label": "T", "matrix": [1, 5 ], "w": 1, "x": 5.5, "y": 1 }, + { "label": "Y", "matrix": [1, 6 ], "w": 1, "x": 6.5, "y": 1 }, + { "label": "U", "matrix": [1, 7 ], "w": 1, "x": 7.5, "y": 1 }, + { "label": "I", "matrix": [1, 8 ], "w": 1, "x": 8.5, "y": 1 }, + { "label": "O", "matrix": [1, 9 ], "w": 1, "x": 9.5, "y": 1 }, + { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 }, + { "label": "]", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 }, + { "label": "[", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 }, + { "label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 }, + { "label": "Caps", "matrix": [2, 0 ], "w": 1.75, "x": 0, "y": 2 }, + { "label": "A", "matrix": [2, 1 ], "w": 1, "x": 1.75, "y": 2 }, + { "label": "S", "matrix": [2, 2 ], "w": 1, "x": 2.75, "y": 2 }, + { "label": "D", "matrix": [2, 3 ], "w": 1, "x": 3.75, "y": 2 }, + { "label": "F", "matrix": [2, 4 ], "w": 1, "x": 4.75, "y": 2 }, + { "label": "G", "matrix": [2, 5 ], "w": 1, "x": 5.75, "y": 2 }, + { "label": "H", "matrix": [2, 6 ], "w": 1, "x": 6.75, "y": 2 }, + { "label": "J", "matrix": [2, 7 ], "w": 1, "x": 7.75, "y": 2 }, + { "label": "K", "matrix": [2, 8 ], "w": 1, "x": 8.75, "y": 2 }, + { "label": "L", "matrix": [2, 9 ], "w": 1, "x": 9.75, "y": 2 }, + { "label": ":", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 }, + { "label": "\"", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 }, + { "label": "~", "matrix": [2, 12], "w": 1, "x": 12.75, "y": 2 }, + { "label": "Enter", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 2 }, + { "label": "Shift", "matrix": [3, 0 ], "w": 1.25, "x": 0, "y": 3 }, + { "label": "|", "matrix": [3, 1 ], "w": 1, "x": 1.25, "y": 3 }, + { "label": "Z", "matrix": [3, 2 ], "w": 1, "x": 2.25, "y": 3 }, + { "label": "X", "matrix": [3, 3 ], "w": 1, "x": 3.25, "y": 3 }, + { "label": "C", "matrix": [3, 4 ], "w": 1, "x": 4.25, "y": 3 }, + { "label": "V", "matrix": [3, 5 ], "w": 1, "x": 5.25, "y": 3 }, + { "label": "B", "matrix": [3, 6 ], "w": 1, "x": 6.25, "y": 3 }, + { "label": "N", "matrix": [3, 7 ], "w": 1, "x": 7.25, "y": 3 }, + { "label": "M", "matrix": [3, 8 ], "w": 1, "x": 8.25, "y": 3 }, + { "label": "<", "matrix": [3, 9 ], "w": 1, "x": 9.25, "y": 3 }, + { "label": ">", "matrix": [3, 10], "w": 1, "x": 10.25, "y": 3 }, + { "label": "?", "matrix": [3, 11], "w": 1, "x": 11.25, "y": 3 }, + { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 }, + { "label": "MO(1)", "matrix": [3, 13 ], "w": 1, "x": 14, "y": 3 }, + { "label": "Ctrl", "matrix": [4, 0 ], "w": 1.25, "x": 0, "y": 4 }, + { "label": "Win", "matrix": [4, 1 ], "w": 1.25, "x": 1.25, "y": 4 }, + { "label": "Alt", "matrix": [4, 2 ], "w": 1.25, "x": 2.5, "y": 4 }, + { "label": "Space", "matrix": [4, 6 ], "w": 6.25, "x": 3.75, "y": 4 }, + { "label": "Alt", "matrix": [4, 9 ], "w": 1.25, "x": 10, "y": 4 }, + { "label": "Win", "matrix": [4, 10], "w": 1.25, "x": 11.25, "y": 4 }, + { "label": "Menu", "matrix": [4, 11], "w": 1.25, "x": 12.5, "y": 4 }, + { "label": "Ctrl", "matrix": [4, 12], "w": 1.25, "x": 13.75, "y": 4 } + ] } } } From 0e42f3afff7a5e105487fa1c9742331353ef2c20 Mon Sep 17 00:00:00 2001 From: Gondolindrim Date: Fri, 10 Mar 2023 16:18:32 -0300 Subject: [PATCH 14/18] Remove keyboard.c and keyboard.h --- .../smithrune/iron160/iron160_s/iron160_s.c | 18 ---------- .../smithrune/iron160/iron160_s/iron160_s.h | 36 ------------------- 2 files changed, 54 deletions(-) delete mode 100644 keyboards/smithrune/iron160/iron160_s/iron160_s.c delete mode 100644 keyboards/smithrune/iron160/iron160_s/iron160_s.h diff --git a/keyboards/smithrune/iron160/iron160_s/iron160_s.c b/keyboards/smithrune/iron160/iron160_s/iron160_s.c deleted file mode 100644 index d78be6b6a40d..000000000000 --- a/keyboards/smithrune/iron160/iron160_s/iron160_s.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2022 Gondolindrim - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#include "iron160_s.h" diff --git a/keyboards/smithrune/iron160/iron160_s/iron160_s.h b/keyboards/smithrune/iron160/iron160_s/iron160_s.h deleted file mode 100644 index 9320a26b37b3..000000000000 --- a/keyboards/smithrune/iron160/iron160_s/iron160_s.h +++ /dev/null @@ -1,36 +0,0 @@ -/* -Copyright 2022 Gondolindrim - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -#define ___ KC_NO - -#include "quantum.h" - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ - K40, K41, K42, K46, K49, K4A, K4B, K4C, K4D \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D}, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D}, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D}, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D}, \ - { K40, K41, K42, ___, ___, ___, K46, ___, ___, K49, K4A, K4B, K4C, K4D} \ -} From 9ff39143dd092d81393d576f7d8a397298ea1a0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20A=2E=20Volpato?= Date: Sat, 11 Mar 2023 20:55:36 -0300 Subject: [PATCH 15/18] Add rgblight configurations to info.json Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/smithrune/iron160/iron160_h/info.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/keyboards/smithrune/iron160/iron160_h/info.json b/keyboards/smithrune/iron160/iron160_h/info.json index f573df702a87..0c2886206814 100644 --- a/keyboards/smithrune/iron160/iron160_h/info.json +++ b/keyboards/smithrune/iron160/iron160_h/info.json @@ -14,6 +14,10 @@ "cols": ["A3" , "B9" , "B8" , "B5" , "B4", "B3" , "A6" , "A5" , "A4" , "A2" , "A1" , "A0" , "C15" , "C14"], "rows": ["A10", "A15", "C13", "A7" , "B0"] }, + "rgblight": { + "led_count": 1, + "pin": "B15" + }, "diode_direction": "COL2ROW", "layouts": { "LAYOUT": { From 2571a96cf4948bd57b922b03902c216cd75a9b80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20A=2E=20Volpato?= Date: Sat, 11 Mar 2023 20:56:08 -0300 Subject: [PATCH 16/18] Adjust default keymap files Co-authored-by: jack <0x6a73@protonmail.com> --- .../iron160/iron160_h/keymaps/default/keymap.c | 18 ++---------------- .../iron160/iron160_s/keymaps/default/keymap.c | 16 +--------------- 2 files changed, 3 insertions(+), 31 deletions(-) diff --git a/keyboards/smithrune/iron160/iron160_h/keymaps/default/keymap.c b/keyboards/smithrune/iron160/iron160_h/keymaps/default/keymap.c index 8b885147fcfc..b39e8d72eb40 100755 --- a/keyboards/smithrune/iron160/iron160_h/keymaps/default/keymap.c +++ b/keyboards/smithrune/iron160/iron160_h/keymaps/default/keymap.c @@ -26,24 +26,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LWIN, KC_LALT, KC_SPC , KC_RALT, KC_RWIN, MO(1) , KC_RCTL ), [1] = LAYOUT( - RESET , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - [2] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______ - ), - [3] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______ - ), + ) }; diff --git a/keyboards/smithrune/iron160/iron160_s/keymaps/default/keymap.c b/keyboards/smithrune/iron160/iron160_s/keymaps/default/keymap.c index f8790cc60076..1cc3dea2f6da 100755 --- a/keyboards/smithrune/iron160/iron160_s/keymaps/default/keymap.c +++ b/keyboards/smithrune/iron160/iron160_s/keymaps/default/keymap.c @@ -31,19 +31,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - [2] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - [3] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), + ) }; From 9bc1b94d8480ba43ba0a39cb7534dfd29d6d8c4d Mon Sep 17 00:00:00 2001 From: Gondolindrim Date: Sat, 11 Mar 2023 20:59:39 -0300 Subject: [PATCH 17/18] Delete config.h from I160-H --- .../smithrune/iron160/iron160_h/config.h | 29 ------------------- 1 file changed, 29 deletions(-) delete mode 100644 keyboards/smithrune/iron160/iron160_h/config.h diff --git a/keyboards/smithrune/iron160/iron160_h/config.h b/keyboards/smithrune/iron160/iron160_h/config.h deleted file mode 100644 index bc089cbfb7f7..000000000000 --- a/keyboards/smithrune/iron160/iron160_h/config.h +++ /dev/null @@ -1,29 +0,0 @@ -/* -Copyright 2022 Gondolindrim - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -#define RGB_DI_PIN B15 -#define RGBLED_NUM 1 - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* Defining RGB default brightness to zero */ -#define RGBLIGHT_DEFAULT_VAL 0 From 61a036fb2268c7c69095099a0a5f3d7c3ba82793 Mon Sep 17 00:00:00 2001 From: Gondolindrim Date: Sat, 11 Mar 2023 21:03:56 -0300 Subject: [PATCH 18/18] Reinsert config.h with RGB value set to zero --- keyboards/smithrune/iron160/iron160_h/config.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 keyboards/smithrune/iron160/iron160_h/config.h diff --git a/keyboards/smithrune/iron160/iron160_h/config.h b/keyboards/smithrune/iron160/iron160_h/config.h new file mode 100644 index 000000000000..4edf24a4d9d0 --- /dev/null +++ b/keyboards/smithrune/iron160/iron160_h/config.h @@ -0,0 +1,18 @@ +/* +Copyright 2022 Gondolindrim +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#pragma once + +/* Defining RGB default brightness to zero */ +#define RGBLIGHT_DEFAULT_VAL 0