From 56555c61e1396a0b1f85105abe78f0a2b3a7c4f3 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 10 Jan 2023 13:48:20 +1100 Subject: Migrate `LAYOUTS` to data driven (#19541) * Migrate `LAYOUTS` to data driven, 0-9 * Migrate `LAYOUTS` to data driven, A * Migrate `LAYOUTS` to data driven, B * Migrate `LAYOUTS` to data driven, C * Migrate `LAYOUTS` to data driven, D * Migrate `LAYOUTS` to data driven, E * Migrate `LAYOUTS` to data driven, F * Migrate `LAYOUTS` to data driven, G * Migrate `LAYOUTS` to data driven, H * Migrate `LAYOUTS` to data driven, handwired * Migrate `LAYOUTS` to data driven, I * Migrate `LAYOUTS` to data driven, J * Migrate `LAYOUTS` to data driven, K * Migrate `LAYOUTS` to data driven, L * Migrate `LAYOUTS` to data driven, M * Migrate `LAYOUTS` to data driven, N * Migrate `LAYOUTS` to data driven, O * Migrate `LAYOUTS` to data driven, P * Migrate `LAYOUTS` to data driven, Q * Migrate `LAYOUTS` to data driven, R * Migrate `LAYOUTS` to data driven, S * Migrate `LAYOUTS` to data driven, T * Migrate `LAYOUTS` to data driven, U * Migrate `LAYOUTS` to data driven, V * Migrate `LAYOUTS` to data driven, W * Migrate `LAYOUTS` to data driven, X * Migrate `LAYOUTS` to data driven, Y * Migrate `LAYOUTS` to data driven, Z --- keyboards/acheron/keebspcb/info.json | 1 + keyboards/acheron/keebspcb/rules.mk | 2 -- keyboards/acheron/lasgweloth/info.json | 1 + keyboards/acheron/lasgweloth/rules.mk | 2 -- keyboards/acheron/shark/alpha/info.json | 1 + keyboards/acheron/shark/alpha/rules.mk | 2 -- keyboards/acheron/shark/beta/info.json | 1 + keyboards/acheron/shark/beta/rules.mk | 1 - 8 files changed, 4 insertions(+), 7 deletions(-) (limited to 'keyboards/acheron') diff --git a/keyboards/acheron/keebspcb/info.json b/keyboards/acheron/keebspcb/info.json index 31dc899c42..9a2d8ca84a 100644 --- a/keyboards/acheron/keebspcb/info.json +++ b/keyboards/acheron/keebspcb/info.json @@ -8,6 +8,7 @@ "pid": "0x4B45", "device_version": "0.0.1" }, + "community_layouts": ["60_ansi_tsangan"], "layouts": { "LAYOUT_60_ansi_tsangan": { "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":2.75}, {"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":"Menu", "x":13.5, "y":4, "w":1.5}] diff --git a/keyboards/acheron/keebspcb/rules.mk b/keyboards/acheron/keebspcb/rules.mk index 978e6b6a8f..12d787ae8c 100644 --- a/keyboards/acheron/keebspcb/rules.mk +++ b/keyboards/acheron/keebspcb/rules.mk @@ -18,5 +18,3 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE - -LAYOUTS = 60_ansi_tsangan diff --git a/keyboards/acheron/lasgweloth/info.json b/keyboards/acheron/lasgweloth/info.json index 7cade663da..d1f01d1dce 100644 --- a/keyboards/acheron/lasgweloth/info.json +++ b/keyboards/acheron/lasgweloth/info.json @@ -8,6 +8,7 @@ "pid": "0x7641", "device_version": "0.0.1" }, + "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift"], "layouts": { "LAYOUT_60_ansi": { "layout": [ diff --git a/keyboards/acheron/lasgweloth/rules.mk b/keyboards/acheron/lasgweloth/rules.mk index e8b4e15c69..0427bb23fd 100644 --- a/keyboards/acheron/lasgweloth/rules.mk +++ b/keyboards/acheron/lasgweloth/rules.mk @@ -20,5 +20,3 @@ ENCODER_ENABLE = no # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE - -LAYOUTS = 60_ansi 60_ansi_split_bs_rshift diff --git a/keyboards/acheron/shark/alpha/info.json b/keyboards/acheron/shark/alpha/info.json index 435ea843aa..94b8834fb2 100644 --- a/keyboards/acheron/shark/alpha/info.json +++ b/keyboards/acheron/shark/alpha/info.json @@ -6,6 +6,7 @@ "pid": "0x5368", "device_version": "0.0.1" }, + "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT_ortho_4x12": { "layout": [ diff --git a/keyboards/acheron/shark/alpha/rules.mk b/keyboards/acheron/shark/alpha/rules.mk index a5b2141884..e3efc0c371 100644 --- a/keyboards/acheron/shark/alpha/rules.mk +++ b/keyboards/acheron/shark/alpha/rules.mk @@ -19,8 +19,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes -LAYOUTS = ortho_4x12 - # Disable unsupported hardware RGBLIGHT_SUPPORTED = no AUDIO_SUPPORTED = no diff --git a/keyboards/acheron/shark/beta/info.json b/keyboards/acheron/shark/beta/info.json index e763f04484..e167619485 100644 --- a/keyboards/acheron/shark/beta/info.json +++ b/keyboards/acheron/shark/beta/info.json @@ -4,6 +4,7 @@ "pid": "0x5369", "device_version": "0.0.2" }, + "community_layouts": ["ortho_4x12"] "layouts": { "LAYOUT_ortho_4x12": { "layout": [ diff --git a/keyboards/acheron/shark/beta/rules.mk b/keyboards/acheron/shark/beta/rules.mk index 0347228300..428522a65a 100644 --- a/keyboards/acheron/shark/beta/rules.mk +++ b/keyboards/acheron/shark/beta/rules.mk @@ -20,7 +20,6 @@ BACKLIGHT_DRIVER = pwm LTO_ENABLE = no ENCODER_ENABLE = yes -LAYOUTS = ortho_4x12 EEPROM_DRIVER = i2c # Enter lower-power sleep mode when on the ChibiOS idle thread -- cgit v1.2.3 From b7274343913eb3e019f0dc08fa8f7774165e787d Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 29 Jan 2023 02:42:44 +1100 Subject: Remove commented out backlight config & stray "backlight levels" (#19703) --- keyboards/acheron/arctic/config.h | 8 -------- keyboards/acheron/elongate/beta/config.h | 4 ---- keyboards/acheron/keebspcb/config.h | 8 -------- keyboards/acheron/lasgweloth/config.h | 8 -------- keyboards/acheron/shark/alpha/config.h | 6 ------ 5 files changed, 34 deletions(-) (limited to 'keyboards/acheron') diff --git a/keyboards/acheron/arctic/config.h b/keyboards/acheron/arctic/config.h index 63fa908081..645add73f9 100644 --- a/keyboards/acheron/arctic/config.h +++ b/keyboards/acheron/arctic/config.h @@ -25,14 +25,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { B7, B6, A6, A7, B1} #define DIODE_DIRECTION COL2ROW -//#define BACKLIGHT_PIN A6 -//#define BACKLIGHT_PWM_DRIVER PWMD3 -//#define BACKLIGHT_PWM_CHANNEL 1 -//#define BACKLIGHT_PAL_MODE 1 -//#define BACKLIGHT_LEVELS 6 -//#define BACKLIGHT_BREATHING -//#define BREATHING_PERIOD 6 - /* define if matrix has ghost */ //#define MATRIX_HAS_GHOST diff --git a/keyboards/acheron/elongate/beta/config.h b/keyboards/acheron/elongate/beta/config.h index d801d3f6d9..614cb7872b 100644 --- a/keyboards/acheron/elongate/beta/config.h +++ b/keyboards/acheron/elongate/beta/config.h @@ -44,10 +44,6 @@ along with this program. If not, see . */ // #define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 -// #define BACKLIGHT_PIN B7 -// #define BACKLIGHT_BREATHING -// #define BACKLIGHT_LEVELS 3 - #define RGB_DI_PIN D7 #ifdef RGB_DI_PIN #define RGBLED_NUM 16 diff --git a/keyboards/acheron/keebspcb/config.h b/keyboards/acheron/keebspcb/config.h index 4991c68a50..6efdf5a787 100644 --- a/keyboards/acheron/keebspcb/config.h +++ b/keyboards/acheron/keebspcb/config.h @@ -25,14 +25,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { B4, B3, A2, A3, A4} #define DIODE_DIRECTION COL2ROW -//#define BACKLIGHT_PIN A6 -//#define BACKLIGHT_PWM_DRIVER PWMD3 -//#define BACKLIGHT_PWM_CHANNEL 1 -//#define BACKLIGHT_PAL_MODE 1 -//#define BACKLIGHT_LEVELS 6 -//#define BACKLIGHT_BREATHING -//#define BREATHING_PERIOD 6 - /* define if matrix has ghost */ //#define MATRIX_HAS_GHOST diff --git a/keyboards/acheron/lasgweloth/config.h b/keyboards/acheron/lasgweloth/config.h index aebe821e3b..937317894a 100644 --- a/keyboards/acheron/lasgweloth/config.h +++ b/keyboards/acheron/lasgweloth/config.h @@ -25,14 +25,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { B9 , B8 , A3 , B0 , B1 } #define DIODE_DIRECTION COL2ROW -//#define BACKLIGHT_PIN A6 -//#define BACKLIGHT_PWM_DRIVER PWMD3 -//#define BACKLIGHT_PWM_CHANNEL 1 -//#define BACKLIGHT_PAL_MODE 1 -//#define BACKLIGHT_LEVELS 6 -//#define BACKLIGHT_BREATHING -//#define BREATHING_PERIOD 6 - /* define if matrix has ghost */ //#define MATRIX_HAS_GHOST diff --git a/keyboards/acheron/shark/alpha/config.h b/keyboards/acheron/shark/alpha/config.h index ae05d76333..b79356673c 100644 --- a/keyboards/acheron/shark/alpha/config.h +++ b/keyboards/acheron/shark/alpha/config.h @@ -58,10 +58,6 @@ B0, which is unconnected on the PCB */ //#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 -// #define BACKLIGHT_PIN B7 -// #define BACKLIGHT_BREATHING -// #define BACKLIGHT_LEVELS 3 - // #define RGB_DI_PIN E2 // #ifdef RGB_DI_PIN // #define RGBLED_NUM 16 @@ -84,8 +80,6 @@ B0, which is unconnected on the PCB /* define if matrix has ghost (lacks anti-ghosting diodes) */ //#define MATRIX_HAS_GHOST -/* number of backlight levels */ - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ -- cgit v1.2.3 From f6dd8dea2e493dc549a60fee99de871c4088d09a Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Tue, 31 Jan 2023 06:03:30 +1100 Subject: Remove usages of config_common.h from config.h files. (#19714) --- keyboards/acheron/athena/alpha/config.h | 1 - keyboards/acheron/athena/beta/config.h | 1 - keyboards/acheron/elongate/beta/config.h | 1 - keyboards/acheron/elongate/delta/config.h | 1 - keyboards/acheron/shark/alpha/config.h | 1 - keyboards/acheron/shark/beta/config.h | 1 - keyboards/acheron/shark/beta/keymaps/gondolindrim/keymap.c | 9 ++++----- 7 files changed, 4 insertions(+), 11 deletions(-) (limited to 'keyboards/acheron') diff --git a/keyboards/acheron/athena/alpha/config.h b/keyboards/acheron/athena/alpha/config.h index 99dbd76c6f..e7843932ef 100644 --- a/keyboards/acheron/athena/alpha/config.h +++ b/keyboards/acheron/athena/alpha/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" #define MATRIX_ROWS 6 #define MATRIX_COLS 17 diff --git a/keyboards/acheron/athena/beta/config.h b/keyboards/acheron/athena/beta/config.h index 4b2ae3f06b..d2e1ccd575 100644 --- a/keyboards/acheron/athena/beta/config.h +++ b/keyboards/acheron/athena/beta/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" #define MATRIX_ROWS 6 #define MATRIX_COLS 17 diff --git a/keyboards/acheron/elongate/beta/config.h b/keyboards/acheron/elongate/beta/config.h index 614cb7872b..14851af604 100644 --- a/keyboards/acheron/elongate/beta/config.h +++ b/keyboards/acheron/elongate/beta/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 5 diff --git a/keyboards/acheron/elongate/delta/config.h b/keyboards/acheron/elongate/delta/config.h index 8ebc6300d7..86332eada2 100755 --- a/keyboards/acheron/elongate/delta/config.h +++ b/keyboards/acheron/elongate/delta/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/acheron/shark/alpha/config.h b/keyboards/acheron/shark/alpha/config.h index b79356673c..d9d6027835 100644 --- a/keyboards/acheron/shark/alpha/config.h +++ b/keyboards/acheron/shark/alpha/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 4 diff --git a/keyboards/acheron/shark/beta/config.h b/keyboards/acheron/shark/beta/config.h index c0d4b66b13..05a7982c98 100644 --- a/keyboards/acheron/shark/beta/config.h +++ b/keyboards/acheron/shark/beta/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" #define MATRIX_ROWS 4 #define MATRIX_COLS 12 diff --git a/keyboards/acheron/shark/beta/keymaps/gondolindrim/keymap.c b/keyboards/acheron/shark/beta/keymaps/gondolindrim/keymap.c index fd7f556b56..ffd104c771 100755 --- a/keyboards/acheron/shark/beta/keymaps/gondolindrim/keymap.c +++ b/keyboards/acheron/shark/beta/keymaps/gondolindrim/keymap.c @@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "config_common.h" #define MEDIA_KEY_DELAY 10 #define ALT_TAB_DELAY 1000 @@ -187,7 +186,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) { uint32_t held_click_timer = 0; bool is_click_held = false; bool is_shift_held = false; -bool automatic_hold_cycle = false; // This flag registers if the encoder hold was automatically cycled +bool automatic_hold_cycle = false; // This flag registers if the encoder hold was automatically cycled // This bool records if LALT is pressed or not. Due to the automatic disabling of the ALT-TAB of the ALTTABS custom keystroke, the automatic disabling can un-register KC_LALT even when the LALT key is phisically pressed. Hence there needs to be two bools: one that keebs track of the ALT-TAB activity and one that keeps track of LALT so that the automatic disabling will not disable LALT if it is phisically pressed. bool is_lalt_pressed = false; @@ -213,7 +212,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { return true; // Skip all further processing of this key case KC_LALT: // If this is not defined, if the encoder is activated in the alt-tab mode while the LALT key is pressed, the menu goes away. if (record->event.pressed) is_lalt_pressed = true; - else is_lalt_pressed = false; + else is_lalt_pressed = false; return true; case ENCMUP: case ENCMDN: @@ -225,7 +224,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { if (!is_alt_tab_active) { is_alt_tab_active = true; register_code(KC_LALT); - + } tap_code16(keycode == ALTTABF ? KC_TAB : S(KC_TAB)); // Due to S(KC_TAB), the 16-bit tap_code16 is needed. alt_tab_timer = timer_read32(); @@ -252,7 +251,7 @@ void housekeeping_task_user(void) { is_alt_tab_active = false; } } -/* This piece of the code checks for the encoder push timer. If the encoder push interval was less than encoder_click_delay then it is automatically processed by process_record_user by triggering the current mode's click key. However, if the encoder push is held for more time than the defined delay, then the encoder hold "cycles", that is, gets activated and the timer needs to be reset. This does three things: +/* This piece of the code checks for the encoder push timer. If the encoder push interval was less than encoder_click_delay then it is automatically processed by process_record_user by triggering the current mode's click key. However, if the encoder push is held for more time than the defined delay, then the encoder hold "cycles", that is, gets activated and the timer needs to be reset. This does three things: - (1) Sets the automatic_hold_cycle flag which prevents process_record_user from triggering the click key when the push is released - (2) Processes the current mode's hold key in process_record_user - (3) Resets the click timer -- cgit v1.2.3 From b867522f8cf90aef6f4531e669e35aba5ec0bf1c Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 31 Jan 2023 07:45:41 +1100 Subject: Clean up Force NKRO in config.h (#19718) --- keyboards/acheron/elongate/beta/config.h | 21 --------------------- keyboards/acheron/shark/alpha/config.h | 21 --------------------- 2 files changed, 42 deletions(-) (limited to 'keyboards/acheron') diff --git a/keyboards/acheron/elongate/beta/config.h b/keyboards/acheron/elongate/beta/config.h index 14851af604..2cd3557cd0 100644 --- a/keyboards/acheron/elongate/beta/config.h +++ b/keyboards/acheron/elongate/beta/config.h @@ -85,27 +85,6 @@ along with this program. If not, see . */ // #define GRAVE_ESC_CTRL_OVERRIDE -/* - * Force NKRO - * - * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved - * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the - * makefile for this to work.) - * - * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) - * until the next keyboard reset. - * - * NKRO may prevent your keystrokes from being detected in the BIOS, but it is - * fully operational during normal computer usage. - * - * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) - * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by - * bootmagic, NKRO mode will always be enabled until it is toggled again during a - * power-up. - * - */ -//#define FORCE_NKRO - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/acheron/shark/alpha/config.h b/keyboards/acheron/shark/alpha/config.h index d9d6027835..1abd7fcf21 100644 --- a/keyboards/acheron/shark/alpha/config.h +++ b/keyboards/acheron/shark/alpha/config.h @@ -89,27 +89,6 @@ B0, which is unconnected on the PCB */ // #define GRAVE_ESC_CTRL_OVERRIDE -/* - * Force NKRO - * - * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved - * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the - * makefile for this to work.) - * - * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) - * until the next keyboard reset. - * - * NKRO may prevent your keystrokes from being detected in the BIOS, but it is - * fully operational during normal computer usage. - * - * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) - * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by - * bootmagic, NKRO mode will always be enabled until it is toggled again during a - * power-up. - * - */ -//#define FORCE_NKRO - /* * Feature disable options * These options are also useful to firmware size reduction. -- cgit v1.2.3 From f20a05440ed38bb3de754b2193e56d3e41a939a1 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 3 Feb 2023 11:04:10 +1100 Subject: Remove unused `MATRIX_HAS_GHOST` from config.h (#19726) --- keyboards/acheron/apollo/87h/delta/config.h | 3 --- keyboards/acheron/apollo/87h/gamma/config.h | 3 --- keyboards/acheron/apollo/87htsc/config.h | 3 --- keyboards/acheron/apollo/88htsc/config.h | 3 --- keyboards/acheron/arctic/config.h | 3 --- keyboards/acheron/austin/config.h | 3 --- keyboards/acheron/elongate/beta/config.h | 3 --- keyboards/acheron/elongate/delta/config.h | 3 --- keyboards/acheron/keebspcb/config.h | 3 --- keyboards/acheron/lasgweloth/config.h | 3 --- keyboards/acheron/shark/alpha/config.h | 3 --- 11 files changed, 33 deletions(-) (limited to 'keyboards/acheron') diff --git a/keyboards/acheron/apollo/87h/delta/config.h b/keyboards/acheron/apollo/87h/delta/config.h index 8b92c3f4b2..9608141bda 100644 --- a/keyboards/acheron/apollo/87h/delta/config.h +++ b/keyboards/acheron/apollo/87h/delta/config.h @@ -27,9 +27,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { B3 , D2 , C12, A6 , A5 , A4 } #define DIODE_DIRECTION COL2ROW -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - /* Set 0 if debouncing isn't needed */ #define DEBOUNCE 5 diff --git a/keyboards/acheron/apollo/87h/gamma/config.h b/keyboards/acheron/apollo/87h/gamma/config.h index f18733c333..1dbf638053 100644 --- a/keyboards/acheron/apollo/87h/gamma/config.h +++ b/keyboards/acheron/apollo/87h/gamma/config.h @@ -27,9 +27,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { C14, C13, B9 , B4 , A3 , A2 } #define DIODE_DIRECTION COL2ROW -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - /* Set 0 if debouncing isn't needed */ #define DEBOUNCE 5 diff --git a/keyboards/acheron/apollo/87htsc/config.h b/keyboards/acheron/apollo/87htsc/config.h index 918546f3d3..2a354bb554 100644 --- a/keyboards/acheron/apollo/87htsc/config.h +++ b/keyboards/acheron/apollo/87htsc/config.h @@ -27,9 +27,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { B3 , D2 , C12, A6 , A5 , A4 } #define DIODE_DIRECTION COL2ROW -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - /* Set 0 if debouncing isn't needed */ #define DEBOUNCE 5 diff --git a/keyboards/acheron/apollo/88htsc/config.h b/keyboards/acheron/apollo/88htsc/config.h index 8b92c3f4b2..9608141bda 100644 --- a/keyboards/acheron/apollo/88htsc/config.h +++ b/keyboards/acheron/apollo/88htsc/config.h @@ -27,9 +27,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { B3 , D2 , C12, A6 , A5 , A4 } #define DIODE_DIRECTION COL2ROW -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - /* Set 0 if debouncing isn't needed */ #define DEBOUNCE 5 diff --git a/keyboards/acheron/arctic/config.h b/keyboards/acheron/arctic/config.h index 645add73f9..ec29ae0251 100644 --- a/keyboards/acheron/arctic/config.h +++ b/keyboards/acheron/arctic/config.h @@ -25,9 +25,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { B7, B6, A6, A7, B1} #define DIODE_DIRECTION COL2ROW -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - /* Set 0 if debouncing isn't needed */ #define DEBOUNCE 5 diff --git a/keyboards/acheron/austin/config.h b/keyboards/acheron/austin/config.h index 3b51bb3f86..34985daae8 100644 --- a/keyboards/acheron/austin/config.h +++ b/keyboards/acheron/austin/config.h @@ -33,9 +33,6 @@ along with this program. If not, see . #define BACKLIGHT_BREATHING #define BREATHING_PERIOD 6 -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - /* Set 0 if debouncing isn't needed */ #define DEBOUNCE 5 diff --git a/keyboards/acheron/elongate/beta/config.h b/keyboards/acheron/elongate/beta/config.h index 2cd3557cd0..7897b80a50 100644 --- a/keyboards/acheron/elongate/beta/config.h +++ b/keyboards/acheron/elongate/beta/config.h @@ -72,9 +72,6 @@ along with this program. If not, see . /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 5 -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - /* 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/acheron/elongate/delta/config.h b/keyboards/acheron/elongate/delta/config.h index 86332eada2..cb1eb5078a 100755 --- a/keyboards/acheron/elongate/delta/config.h +++ b/keyboards/acheron/elongate/delta/config.h @@ -55,9 +55,6 @@ along with this program. If not, see . /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 5 -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - /* 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/acheron/keebspcb/config.h b/keyboards/acheron/keebspcb/config.h index 6efdf5a787..7f5099025b 100644 --- a/keyboards/acheron/keebspcb/config.h +++ b/keyboards/acheron/keebspcb/config.h @@ -25,9 +25,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { B4, B3, A2, A3, A4} #define DIODE_DIRECTION COL2ROW -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - /* Set 0 if debouncing isn't needed */ #define DEBOUNCE 5 diff --git a/keyboards/acheron/lasgweloth/config.h b/keyboards/acheron/lasgweloth/config.h index 937317894a..d0a9af509b 100644 --- a/keyboards/acheron/lasgweloth/config.h +++ b/keyboards/acheron/lasgweloth/config.h @@ -25,9 +25,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { B9 , B8 , A3 , B0 , B1 } #define DIODE_DIRECTION COL2ROW -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - /* Set 0 if debouncing isn't needed */ #define DEBOUNCE 5 diff --git a/keyboards/acheron/shark/alpha/config.h b/keyboards/acheron/shark/alpha/config.h index 1abd7fcf21..113187ab1f 100644 --- a/keyboards/acheron/shark/alpha/config.h +++ b/keyboards/acheron/shark/alpha/config.h @@ -76,9 +76,6 @@ B0, which is unconnected on the PCB /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 5 -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ -- cgit v1.2.3 From ebb512db827e84619e7151fcf76e3daf9328fe59 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 4 Feb 2023 06:19:58 +1100 Subject: Debounce defines cleanup (#19742) * Clean up `DEBOUNCE` in config.h, 0-9 * Clean up `DEBOUNCE` in config.h, A * Clean up `DEBOUNCE` in config.h, B * Clean up `DEBOUNCE` in config.h, C * Clean up `DEBOUNCE` in config.h, D * Clean up `DEBOUNCE` in config.h, E * Clean up `DEBOUNCE` in config.h, F * Clean up `DEBOUNCE` in config.h, G * Clean up `DEBOUNCE` in config.h, H * Clean up `DEBOUNCE` in config.h, handwired * Clean up `DEBOUNCE` in config.h, I * Clean up `DEBOUNCE` in config.h, J * Clean up `DEBOUNCE` in config.h, K * Clean up `DEBOUNCE` in config.h, L * Clean up `DEBOUNCE` in config.h, M * Clean up `DEBOUNCE` in config.h, N * Clean up `DEBOUNCE` in config.h, O * Clean up `DEBOUNCE` in config.h, P * Clean up `DEBOUNCE` in config.h, Q * Clean up `DEBOUNCE` in config.h, R * Clean up `DEBOUNCE` in config.h, S * Clean up `DEBOUNCE` in config.h, T * Clean up `DEBOUNCE` in config.h, U * Clean up `DEBOUNCE` in config.h, V * Clean up `DEBOUNCE` in config.h, W * Clean up `DEBOUNCE` in config.h, X * Clean up `DEBOUNCE` in config.h, Y * Clean up `DEBOUNCE` in config.h, Z * Remove default debounce from info.json * Migrate non-default debounce to info.json --- keyboards/acheron/apollo/87h/delta/config.h | 3 --- keyboards/acheron/apollo/87h/gamma/config.h | 3 --- keyboards/acheron/apollo/87htsc/config.h | 3 --- keyboards/acheron/apollo/88htsc/config.h | 3 --- keyboards/acheron/arctic/config.h | 3 --- keyboards/acheron/athena/alpha/config.h | 2 -- keyboards/acheron/athena/beta/config.h | 2 -- keyboards/acheron/austin/config.h | 3 --- keyboards/acheron/elongate/beta/config.h | 3 --- keyboards/acheron/elongate/delta/config.h | 3 --- keyboards/acheron/keebspcb/config.h | 3 --- keyboards/acheron/lasgweloth/config.h | 3 --- keyboards/acheron/shark/alpha/config.h | 3 --- keyboards/acheron/shark/beta/config.h | 2 -- 14 files changed, 39 deletions(-) (limited to 'keyboards/acheron') diff --git a/keyboards/acheron/apollo/87h/delta/config.h b/keyboards/acheron/apollo/87h/delta/config.h index 9608141bda..5874b50665 100644 --- a/keyboards/acheron/apollo/87h/delta/config.h +++ b/keyboards/acheron/apollo/87h/delta/config.h @@ -27,9 +27,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { B3 , D2 , C12, A6 , A5 , A4 } #define DIODE_DIRECTION COL2ROW -/* 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/acheron/apollo/87h/gamma/config.h b/keyboards/acheron/apollo/87h/gamma/config.h index 1dbf638053..db57281877 100644 --- a/keyboards/acheron/apollo/87h/gamma/config.h +++ b/keyboards/acheron/apollo/87h/gamma/config.h @@ -27,9 +27,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { C14, C13, B9 , B4 , A3 , A2 } #define DIODE_DIRECTION COL2ROW -/* 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/acheron/apollo/87htsc/config.h b/keyboards/acheron/apollo/87htsc/config.h index 2a354bb554..226deba17d 100644 --- a/keyboards/acheron/apollo/87htsc/config.h +++ b/keyboards/acheron/apollo/87htsc/config.h @@ -27,9 +27,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { B3 , D2 , C12, A6 , A5 , A4 } #define DIODE_DIRECTION COL2ROW -/* 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/acheron/apollo/88htsc/config.h b/keyboards/acheron/apollo/88htsc/config.h index 9608141bda..5874b50665 100644 --- a/keyboards/acheron/apollo/88htsc/config.h +++ b/keyboards/acheron/apollo/88htsc/config.h @@ -27,9 +27,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { B3 , D2 , C12, A6 , A5 , A4 } #define DIODE_DIRECTION COL2ROW -/* 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/acheron/arctic/config.h b/keyboards/acheron/arctic/config.h index ec29ae0251..8e087114f1 100644 --- a/keyboards/acheron/arctic/config.h +++ b/keyboards/acheron/arctic/config.h @@ -25,9 +25,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { B7, B6, A6, A7, B1} #define DIODE_DIRECTION COL2ROW -/* 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/acheron/athena/alpha/config.h b/keyboards/acheron/athena/alpha/config.h index e7843932ef..01192025c0 100644 --- a/keyboards/acheron/athena/alpha/config.h +++ b/keyboards/acheron/athena/alpha/config.h @@ -26,8 +26,6 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW -#define DEBOUNCE 5 - #define LOCKING_SUPPORT_ENABLE #define LOCKING_RESYNC_ENABLE diff --git a/keyboards/acheron/athena/beta/config.h b/keyboards/acheron/athena/beta/config.h index d2e1ccd575..7c85861eea 100644 --- a/keyboards/acheron/athena/beta/config.h +++ b/keyboards/acheron/athena/beta/config.h @@ -26,8 +26,6 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW -#define DEBOUNCE 5 - #define LOCKING_SUPPORT_ENABLE #define LOCKING_RESYNC_ENABLE diff --git a/keyboards/acheron/austin/config.h b/keyboards/acheron/austin/config.h index 34985daae8..9de87c263e 100644 --- a/keyboards/acheron/austin/config.h +++ b/keyboards/acheron/austin/config.h @@ -33,9 +33,6 @@ along with this program. If not, see . #define BACKLIGHT_BREATHING #define BREATHING_PERIOD 6 -/* 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/acheron/elongate/beta/config.h b/keyboards/acheron/elongate/beta/config.h index 7897b80a50..7612552dc4 100644 --- a/keyboards/acheron/elongate/beta/config.h +++ b/keyboards/acheron/elongate/beta/config.h @@ -69,9 +69,6 @@ along with this program. If not, see . // #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 #endif -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not 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/acheron/elongate/delta/config.h b/keyboards/acheron/elongate/delta/config.h index cb1eb5078a..0b875dc2f6 100755 --- a/keyboards/acheron/elongate/delta/config.h +++ b/keyboards/acheron/elongate/delta/config.h @@ -52,9 +52,6 @@ along with this program. If not, see . #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 5) -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not 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/acheron/keebspcb/config.h b/keyboards/acheron/keebspcb/config.h index 7f5099025b..21a05fc181 100644 --- a/keyboards/acheron/keebspcb/config.h +++ b/keyboards/acheron/keebspcb/config.h @@ -25,9 +25,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { B4, B3, A2, A3, A4} #define DIODE_DIRECTION COL2ROW -/* 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/acheron/lasgweloth/config.h b/keyboards/acheron/lasgweloth/config.h index d0a9af509b..59a44a9b9b 100644 --- a/keyboards/acheron/lasgweloth/config.h +++ b/keyboards/acheron/lasgweloth/config.h @@ -25,9 +25,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { B9 , B8 , A3 , B0 , B1 } #define DIODE_DIRECTION COL2ROW -/* 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/acheron/shark/alpha/config.h b/keyboards/acheron/shark/alpha/config.h index 113187ab1f..f1c8aa0d0b 100644 --- a/keyboards/acheron/shark/alpha/config.h +++ b/keyboards/acheron/shark/alpha/config.h @@ -73,9 +73,6 @@ B0, which is unconnected on the PCB // #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 // #endif -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not 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/acheron/shark/beta/config.h b/keyboards/acheron/shark/beta/config.h index 05a7982c98..7c56f2d258 100644 --- a/keyboards/acheron/shark/beta/config.h +++ b/keyboards/acheron/shark/beta/config.h @@ -25,8 +25,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { A8 , B14, A4 , A3 } #define DIODE_DIRECTION COL2ROW -#define DEBOUNCE 5 - #define LOCKING_SUPPORT_ENABLE #define LOCKING_RESYNC_ENABLE -- cgit v1.2.3 From a988f8a169112e31b21ff7c61870ab483c396cf3 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 6 Feb 2023 13:40:23 +1100 Subject: Remove unused `GRAVE_ESC_CTRL_OVERRIDE` from config.h (#19752) --- keyboards/acheron/elongate/beta/config.h | 5 ----- keyboards/acheron/shark/alpha/config.h | 5 ----- 2 files changed, 10 deletions(-) (limited to 'keyboards/acheron') diff --git a/keyboards/acheron/elongate/beta/config.h b/keyboards/acheron/elongate/beta/config.h index 7612552dc4..b50be0657e 100644 --- a/keyboards/acheron/elongate/beta/config.h +++ b/keyboards/acheron/elongate/beta/config.h @@ -74,11 +74,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. - * This is userful for the Windows task manager shortcut (ctrl+shift+esc). - */ -// #define GRAVE_ESC_CTRL_OVERRIDE - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/acheron/shark/alpha/config.h b/keyboards/acheron/shark/alpha/config.h index f1c8aa0d0b..5b5b3ae572 100644 --- a/keyboards/acheron/shark/alpha/config.h +++ b/keyboards/acheron/shark/alpha/config.h @@ -78,11 +78,6 @@ B0, which is unconnected on the PCB /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. - * This is userful for the Windows task manager shortcut (ctrl+shift+esc). - */ -// #define GRAVE_ESC_CTRL_OVERRIDE - /* * Feature disable options * These options are also useful to firmware size reduction. -- cgit v1.2.3 From 11b6bb8179ce93c5954c96e24ef6dd09c497a131 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 7 Feb 2023 11:05:37 +1100 Subject: Remove unused Bootmagic row/col defines from config.h (#19761) --- keyboards/acheron/elongate/beta/config.h | 4 ---- keyboards/acheron/shark/alpha/config.h | 4 ---- 2 files changed, 8 deletions(-) (limited to 'keyboards/acheron') diff --git a/keyboards/acheron/elongate/beta/config.h b/keyboards/acheron/elongate/beta/config.h index b50be0657e..97ba2d870e 100644 --- a/keyboards/acheron/elongate/beta/config.h +++ b/keyboards/acheron/elongate/beta/config.h @@ -90,10 +90,6 @@ along with this program. If not, see . //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT -/* Bootmagic Lite key configuration */ -// #define BOOTMAGIC_LITE_ROW 0 -// #define BOOTMAGIC_LITE_COLUMN 0 - #define LED_NUM_LOCK_PIN D2 #define LED_CAPS_LOCK_PIN D1 #define LED_SCROLL_LOCK_PIN D0 diff --git a/keyboards/acheron/shark/alpha/config.h b/keyboards/acheron/shark/alpha/config.h index 5b5b3ae572..4e624fd4bb 100644 --- a/keyboards/acheron/shark/alpha/config.h +++ b/keyboards/acheron/shark/alpha/config.h @@ -93,7 +93,3 @@ B0, which is unconnected on the PCB //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT - -/* Bootmagic Lite key configuration */ -// #define BOOTMAGIC_LITE_ROW 0 -// #define BOOTMAGIC_LITE_COLUMN 0 -- cgit v1.2.3 From 8d6bf19fc78fe372cd42486718d753f342895d2f Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 8 Feb 2023 01:46:51 +1100 Subject: Remove unused `SOFT_SERIAL_PIN` from config.h (#19768) --- keyboards/acheron/elongate/beta/config.h | 5 ----- keyboards/acheron/shark/alpha/config.h | 5 ----- 2 files changed, 10 deletions(-) (limited to 'keyboards/acheron') diff --git a/keyboards/acheron/elongate/beta/config.h b/keyboards/acheron/elongate/beta/config.h index 97ba2d870e..c4425e6e85 100644 --- a/keyboards/acheron/elongate/beta/config.h +++ b/keyboards/acheron/elongate/beta/config.h @@ -38,11 +38,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -/* - * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. - */ -// #define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 - #define RGB_DI_PIN D7 #ifdef RGB_DI_PIN #define RGBLED_NUM 16 diff --git a/keyboards/acheron/shark/alpha/config.h b/keyboards/acheron/shark/alpha/config.h index 4e624fd4bb..e45d721a01 100644 --- a/keyboards/acheron/shark/alpha/config.h +++ b/keyboards/acheron/shark/alpha/config.h @@ -52,11 +52,6 @@ B0, which is unconnected on the PCB #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 3 -/* - * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. - */ -//#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 - // #define RGB_DI_PIN E2 // #ifdef RGB_DI_PIN // #define RGBLED_NUM 16 -- cgit v1.2.3 From f9aeea64c1f85d388485503e52035b5f7533ed26 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 8 Feb 2023 18:41:46 +1100 Subject: Migrate `MCU` and `BOOTLOADER` to data-driven (#19529) --- keyboards/acheron/apollo/87h/delta/info.json | 4 +++- keyboards/acheron/apollo/87h/delta/rules.mk | 7 ------- keyboards/acheron/apollo/87h/gamma/info.json | 4 +++- keyboards/acheron/apollo/87h/gamma/rules.mk | 7 ------- keyboards/acheron/apollo/87htsc/info.json | 2 ++ keyboards/acheron/apollo/87htsc/rules.mk | 7 ------- keyboards/acheron/apollo/88htsc/info.json | 2 ++ keyboards/acheron/apollo/88htsc/rules.mk | 7 ------- keyboards/acheron/arctic/info.json | 2 ++ keyboards/acheron/arctic/rules.mk | 6 ------ keyboards/acheron/athena/alpha/info.json | 4 +++- keyboards/acheron/athena/alpha/rules.mk | 7 ------- keyboards/acheron/athena/beta/info.json | 4 +++- keyboards/acheron/athena/beta/rules.mk | 6 ------ keyboards/acheron/austin/info.json | 2 ++ keyboards/acheron/austin/rules.mk | 6 ------ keyboards/acheron/elongate/beta/info.json | 2 ++ keyboards/acheron/elongate/beta/rules.mk | 6 ------ keyboards/acheron/elongate/delta/info.json | 2 ++ keyboards/acheron/elongate/delta/rules.mk | 6 ------ keyboards/acheron/keebspcb/info.json | 2 ++ keyboards/acheron/keebspcb/rules.mk | 6 ------ keyboards/acheron/lasgweloth/info.json | 2 ++ keyboards/acheron/lasgweloth/rules.mk | 6 ------ keyboards/acheron/shark/alpha/info.json | 3 +++ keyboards/acheron/shark/alpha/rules.mk | 7 ------- keyboards/acheron/shark/beta/info.json | 4 +++- keyboards/acheron/shark/beta/rules.mk | 6 ------ 28 files changed, 34 insertions(+), 95 deletions(-) (limited to 'keyboards/acheron') diff --git a/keyboards/acheron/apollo/87h/delta/info.json b/keyboards/acheron/apollo/87h/delta/info.json index 8f501970a5..4e14f51df0 100644 --- a/keyboards/acheron/apollo/87h/delta/info.json +++ b/keyboards/acheron/apollo/87h/delta/info.json @@ -3,5 +3,7 @@ "usb": { "pid": "0x8775", "device_version": "0.0.4" - } + }, + "processor": "STM32F401", + "bootloader": "stm32-dfu" } diff --git a/keyboards/acheron/apollo/87h/delta/rules.mk b/keyboards/acheron/apollo/87h/delta/rules.mk index 4fa4db5450..0f7a9e78f7 100644 --- a/keyboards/acheron/apollo/87h/delta/rules.mk +++ b/keyboards/acheron/apollo/87h/delta/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F401 -BOARD = GENERIC_STM32_F401XC - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/acheron/apollo/87h/gamma/info.json b/keyboards/acheron/apollo/87h/gamma/info.json index 6a7a382eaa..4a93afd70c 100644 --- a/keyboards/acheron/apollo/87h/gamma/info.json +++ b/keyboards/acheron/apollo/87h/gamma/info.json @@ -3,5 +3,7 @@ "usb": { "pid": "0x8774", "device_version": "0.0.3" - } + }, + "processor": "STM32F411", + "bootloader": "stm32-dfu" } diff --git a/keyboards/acheron/apollo/87h/gamma/rules.mk b/keyboards/acheron/apollo/87h/gamma/rules.mk index 5b419929d5..419a95fe02 100644 --- a/keyboards/acheron/apollo/87h/gamma/rules.mk +++ b/keyboards/acheron/apollo/87h/gamma/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F411 -BOARD = GENERIC_STM32_F411XE - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/acheron/apollo/87htsc/info.json b/keyboards/acheron/apollo/87htsc/info.json index b2a9cf1643..68fc1b018a 100644 --- a/keyboards/acheron/apollo/87htsc/info.json +++ b/keyboards/acheron/apollo/87htsc/info.json @@ -8,6 +8,8 @@ "pid": "0x8776", "device_version": "0.0.1" }, + "processor": "STM32F401", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_tkl_ansi_tsangan": { "layout": [ diff --git a/keyboards/acheron/apollo/87htsc/rules.mk b/keyboards/acheron/apollo/87htsc/rules.mk index 4fa4db5450..0f7a9e78f7 100644 --- a/keyboards/acheron/apollo/87htsc/rules.mk +++ b/keyboards/acheron/apollo/87htsc/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F401 -BOARD = GENERIC_STM32_F401XC - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/acheron/apollo/88htsc/info.json b/keyboards/acheron/apollo/88htsc/info.json index 4d695faf70..92dd801826 100644 --- a/keyboards/acheron/apollo/88htsc/info.json +++ b/keyboards/acheron/apollo/88htsc/info.json @@ -8,6 +8,8 @@ "pid": "0x8873", "device_version": "0.0.1" }, + "processor": "STM32F401", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_tkl_f13_ansi_tsangan": { "layout": [ diff --git a/keyboards/acheron/apollo/88htsc/rules.mk b/keyboards/acheron/apollo/88htsc/rules.mk index 4fa4db5450..0f7a9e78f7 100644 --- a/keyboards/acheron/apollo/88htsc/rules.mk +++ b/keyboards/acheron/apollo/88htsc/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F401 -BOARD = GENERIC_STM32_F401XC - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/acheron/arctic/info.json b/keyboards/acheron/arctic/info.json index a0102aaaab..42a7bb7b42 100644 --- a/keyboards/acheron/arctic/info.json +++ b/keyboards/acheron/arctic/info.json @@ -8,6 +8,8 @@ "pid": "0x4152", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_60_ansi_tsangan": { "layout": [ diff --git a/keyboards/acheron/arctic/rules.mk b/keyboards/acheron/arctic/rules.mk index fd44980786..0aeca0dd9f 100644 --- a/keyboards/acheron/arctic/rules.mk +++ b/keyboards/acheron/arctic/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/acheron/athena/alpha/info.json b/keyboards/acheron/athena/alpha/info.json index 03640fd01d..10d720983c 100644 --- a/keyboards/acheron/athena/alpha/info.json +++ b/keyboards/acheron/athena/alpha/info.json @@ -3,5 +3,7 @@ "usb": { "pid": "0x6584", "device_version": "0.0.1" - } + }, + "processor": "STM32F411", + "bootloader": "stm32-dfu" } diff --git a/keyboards/acheron/athena/alpha/rules.mk b/keyboards/acheron/athena/alpha/rules.mk index 7711254bbe..962a27694f 100644 --- a/keyboards/acheron/athena/alpha/rules.mk +++ b/keyboards/acheron/athena/alpha/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F411 -BOARD = GENERIC_STM32_F411XE - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/acheron/athena/beta/info.json b/keyboards/acheron/athena/beta/info.json index 7db7665fe2..237c783866 100644 --- a/keyboards/acheron/athena/beta/info.json +++ b/keyboards/acheron/athena/beta/info.json @@ -3,5 +3,7 @@ "usb": { "pid": "0x6585", "device_version": "0.0.2" - } + }, + "processor": "STM32F401", + "bootloader": "stm32-dfu" } diff --git a/keyboards/acheron/athena/beta/rules.mk b/keyboards/acheron/athena/beta/rules.mk index 81bbce68c1..962a27694f 100644 --- a/keyboards/acheron/athena/beta/rules.mk +++ b/keyboards/acheron/athena/beta/rules.mk @@ -1,9 +1,3 @@ -MCU = STM32F401 -BOARD = GENERIC_STM32_F401XC - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/acheron/austin/info.json b/keyboards/acheron/austin/info.json index 6fda03534e..3f76e22f0c 100755 --- a/keyboards/acheron/austin/info.json +++ b/keyboards/acheron/austin/info.json @@ -8,6 +8,8 @@ "pid": "0x4175", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/acheron/austin/rules.mk b/keyboards/acheron/austin/rules.mk index 89a416941f..295d6960ee 100644 --- a/keyboards/acheron/austin/rules.mk +++ b/keyboards/acheron/austin/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/acheron/elongate/beta/info.json b/keyboards/acheron/elongate/beta/info.json index 7eb1de3c17..f381712a0c 100644 --- a/keyboards/acheron/elongate/beta/info.json +++ b/keyboards/acheron/elongate/beta/info.json @@ -8,6 +8,8 @@ "pid": "0x454C", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/acheron/elongate/beta/rules.mk b/keyboards/acheron/elongate/beta/rules.mk index 976f6aecc1..2aff52b20a 100644 --- a/keyboards/acheron/elongate/beta/rules.mk +++ b/keyboards/acheron/elongate/beta/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/acheron/elongate/delta/info.json b/keyboards/acheron/elongate/delta/info.json index 54e58deb92..d763023926 100644 --- a/keyboards/acheron/elongate/delta/info.json +++ b/keyboards/acheron/elongate/delta/info.json @@ -8,6 +8,8 @@ "pid": "0x454D", "device_version": "0.0.2" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/acheron/elongate/delta/rules.mk b/keyboards/acheron/elongate/delta/rules.mk index 20a0bab85e..f84ab5d602 100755 --- a/keyboards/acheron/elongate/delta/rules.mk +++ b/keyboards/acheron/elongate/delta/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/acheron/keebspcb/info.json b/keyboards/acheron/keebspcb/info.json index 9a2d8ca84a..9c96a01191 100644 --- a/keyboards/acheron/keebspcb/info.json +++ b/keyboards/acheron/keebspcb/info.json @@ -8,6 +8,8 @@ "pid": "0x4B45", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "community_layouts": ["60_ansi_tsangan"], "layouts": { "LAYOUT_60_ansi_tsangan": { diff --git a/keyboards/acheron/keebspcb/rules.mk b/keyboards/acheron/keebspcb/rules.mk index 12d787ae8c..f94f12cb84 100644 --- a/keyboards/acheron/keebspcb/rules.mk +++ b/keyboards/acheron/keebspcb/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/acheron/lasgweloth/info.json b/keyboards/acheron/lasgweloth/info.json index d1f01d1dce..b97521e48e 100644 --- a/keyboards/acheron/lasgweloth/info.json +++ b/keyboards/acheron/lasgweloth/info.json @@ -8,6 +8,8 @@ "pid": "0x7641", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift"], "layouts": { "LAYOUT_60_ansi": { diff --git a/keyboards/acheron/lasgweloth/rules.mk b/keyboards/acheron/lasgweloth/rules.mk index 0427bb23fd..93f25a13d8 100644 --- a/keyboards/acheron/lasgweloth/rules.mk +++ b/keyboards/acheron/lasgweloth/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/acheron/shark/alpha/info.json b/keyboards/acheron/shark/alpha/info.json index 94b8834fb2..0db6134e0b 100644 --- a/keyboards/acheron/shark/alpha/info.json +++ b/keyboards/acheron/shark/alpha/info.json @@ -6,6 +6,9 @@ "pid": "0x5368", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT_ortho_4x12": { diff --git a/keyboards/acheron/shark/alpha/rules.mk b/keyboards/acheron/shark/alpha/rules.mk index e3efc0c371..27db06a044 100644 --- a/keyboards/acheron/shark/alpha/rules.mk +++ b/keyboards/acheron/shark/alpha/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/acheron/shark/beta/info.json b/keyboards/acheron/shark/beta/info.json index e167619485..615e9a91b9 100644 --- a/keyboards/acheron/shark/beta/info.json +++ b/keyboards/acheron/shark/beta/info.json @@ -4,7 +4,9 @@ "pid": "0x5369", "device_version": "0.0.2" }, - "community_layouts": ["ortho_4x12"] + "processor": "STM32F411", + "bootloader": "stm32-dfu", + "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT_ortho_4x12": { "layout": [ diff --git a/keyboards/acheron/shark/beta/rules.mk b/keyboards/acheron/shark/beta/rules.mk index 428522a65a..b4a94395c6 100644 --- a/keyboards/acheron/shark/beta/rules.mk +++ b/keyboards/acheron/shark/beta/rules.mk @@ -1,9 +1,3 @@ -MCU = STM32F411 -BOARD = GENERIC_STM32_F411XE - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # -- cgit v1.2.3 From 7fad94ba2d5092abe451d0bbc95caaa37fec95bc Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Feb 2023 08:13:41 +1100 Subject: Remove unused RGBLight defines from config.h (#19859) --- keyboards/acheron/elongate/beta/config.h | 6 ------ keyboards/acheron/shark/alpha/config.h | 16 ---------------- 2 files changed, 22 deletions(-) (limited to 'keyboards/acheron') diff --git a/keyboards/acheron/elongate/beta/config.h b/keyboards/acheron/elongate/beta/config.h index c4425e6e85..619868ac08 100644 --- a/keyboards/acheron/elongate/beta/config.h +++ b/keyboards/acheron/elongate/beta/config.h @@ -56,12 +56,6 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_TWINKLE -/*== customize breathing effect ==*/ -/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ -# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 - /*==== use exp() and sin() ====*/ -// #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 -// #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 #endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/acheron/shark/alpha/config.h b/keyboards/acheron/shark/alpha/config.h index e45d721a01..139b21b0b9 100644 --- a/keyboards/acheron/shark/alpha/config.h +++ b/keyboards/acheron/shark/alpha/config.h @@ -52,22 +52,6 @@ B0, which is unconnected on the PCB #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 3 -// #define RGB_DI_PIN E2 -// #ifdef RGB_DI_PIN -// #define RGBLED_NUM 16 -// #define RGBLIGHT_HUE_STEP 8 -// #define RGBLIGHT_SAT_STEP 8 -// #define RGBLIGHT_VAL_STEP 8 -// #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ -// #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -// /*== customize breathing effect ==*/ -// /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ -// #define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 -// /*==== use exp() and sin() ====*/ -// #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 -// #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 -// #endif - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ -- cgit v1.2.3 From f4ba17c4a0ee59603c167b04f2d6f6eee8b2cf1b Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Feb 2023 13:14:29 +1100 Subject: Move LED indicator config to data driven (#19800) --- keyboards/acheron/athena/alpha/config.h | 2 -- keyboards/acheron/athena/alpha/info.json | 3 +++ keyboards/acheron/athena/beta/config.h | 2 -- keyboards/acheron/athena/beta/info.json | 3 +++ keyboards/acheron/elongate/beta/config.h | 4 ---- keyboards/acheron/elongate/beta/info.json | 5 +++++ 6 files changed, 11 insertions(+), 8 deletions(-) (limited to 'keyboards/acheron') diff --git a/keyboards/acheron/athena/alpha/config.h b/keyboards/acheron/athena/alpha/config.h index 01192025c0..2fdf4551a8 100644 --- a/keyboards/acheron/athena/alpha/config.h +++ b/keyboards/acheron/athena/alpha/config.h @@ -58,7 +58,5 @@ along with this program. If not, see . #define WS2812_DMA_STREAM STM32_DMA2_STREAM5 #define WS2812_DMA_CHANNEL 6 -#define LED_CAPS_LOCK_PIN A10 - // If this is defined, the caps lock LED will turn on and off according to the state of caps lock. If not, the LED will shine like all other LEDs despite the caps lock state. #define CAPSLOCK_INDICATOR diff --git a/keyboards/acheron/athena/alpha/info.json b/keyboards/acheron/athena/alpha/info.json index 10d720983c..cc2a5249d0 100644 --- a/keyboards/acheron/athena/alpha/info.json +++ b/keyboards/acheron/athena/alpha/info.json @@ -4,6 +4,9 @@ "pid": "0x6584", "device_version": "0.0.1" }, + "indicators": { + "caps_lock": "A10" + }, "processor": "STM32F411", "bootloader": "stm32-dfu" } diff --git a/keyboards/acheron/athena/beta/config.h b/keyboards/acheron/athena/beta/config.h index 7c85861eea..65c39754c3 100644 --- a/keyboards/acheron/athena/beta/config.h +++ b/keyboards/acheron/athena/beta/config.h @@ -58,7 +58,5 @@ along with this program. If not, see . #define WS2812_DMA_STREAM STM32_DMA2_STREAM5 #define WS2812_DMA_CHANNEL 6 -#define LED_CAPS_LOCK_PIN C8 - // If this is defined, the caps lock LED will turn on and off according to the state of caps lock. If not, the LED will shine like all other LEDs despite the caps lock state. #define CAPSLOCK_INDICATOR diff --git a/keyboards/acheron/athena/beta/info.json b/keyboards/acheron/athena/beta/info.json index 237c783866..51c335a850 100644 --- a/keyboards/acheron/athena/beta/info.json +++ b/keyboards/acheron/athena/beta/info.json @@ -4,6 +4,9 @@ "pid": "0x6585", "device_version": "0.0.2" }, + "indicators": { + "caps_lock": "C8" + }, "processor": "STM32F401", "bootloader": "stm32-dfu" } diff --git a/keyboards/acheron/elongate/beta/config.h b/keyboards/acheron/elongate/beta/config.h index 619868ac08..ea72c59000 100644 --- a/keyboards/acheron/elongate/beta/config.h +++ b/keyboards/acheron/elongate/beta/config.h @@ -78,7 +78,3 @@ along with this program. If not, see . //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT - -#define LED_NUM_LOCK_PIN D2 -#define LED_CAPS_LOCK_PIN D1 -#define LED_SCROLL_LOCK_PIN D0 diff --git a/keyboards/acheron/elongate/beta/info.json b/keyboards/acheron/elongate/beta/info.json index f381712a0c..1f625bca83 100644 --- a/keyboards/acheron/elongate/beta/info.json +++ b/keyboards/acheron/elongate/beta/info.json @@ -8,6 +8,11 @@ "pid": "0x454C", "device_version": "0.0.1" }, + "indicators": { + "caps_lock": "D1", + "num_lock": "D2", + "scroll_lock": "D0" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { -- cgit v1.2.3 From 2da0827d4ffbcba161126d6001f370e97d0172a8 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Feb 2023 16:08:25 +1100 Subject: Remove matrix size defines (#19581) --- keyboards/acheron/apollo/87h/delta/config.h | 4 ---- keyboards/acheron/apollo/87h/gamma/config.h | 4 ---- keyboards/acheron/apollo/87htsc/config.h | 4 ---- keyboards/acheron/apollo/88htsc/config.h | 4 ---- keyboards/acheron/arctic/config.h | 4 ---- keyboards/acheron/athena/alpha/config.h | 3 --- keyboards/acheron/athena/beta/config.h | 3 --- keyboards/acheron/austin/config.h | 4 ---- keyboards/acheron/elongate/beta/config.h | 4 ---- keyboards/acheron/elongate/delta/config.h | 3 --- keyboards/acheron/keebspcb/config.h | 4 ---- keyboards/acheron/lasgweloth/config.h | 4 ---- keyboards/acheron/shark/alpha/config.h | 4 ---- keyboards/acheron/shark/beta/config.h | 3 --- 14 files changed, 52 deletions(-) (limited to 'keyboards/acheron') diff --git a/keyboards/acheron/apollo/87h/delta/config.h b/keyboards/acheron/apollo/87h/delta/config.h index 5874b50665..490c13c2e9 100644 --- a/keyboards/acheron/apollo/87h/delta/config.h +++ b/keyboards/acheron/apollo/87h/delta/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 6 -#define MATRIX_COLS 17 - // C0 , C1 , C2 , C3 , C4 , C5 , C6 , C7 , C8 , C9 , C10, C11, C12, C13, C14, C15, C16 } #define MATRIX_COL_PINS { C8 , C9 , A8 , A10, C7 , C6 , B14, B12, B10, B1 , C5 , C4 , A7 , B0 , C11, A3 , B4 } // R0 , R1 , R2 , R3 , R4 , R5 diff --git a/keyboards/acheron/apollo/87h/gamma/config.h b/keyboards/acheron/apollo/87h/gamma/config.h index db57281877..07da517e24 100644 --- a/keyboards/acheron/apollo/87h/gamma/config.h +++ b/keyboards/acheron/apollo/87h/gamma/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 6 -#define MATRIX_COLS 16 - // C0 , C1 , C2 , C3 , C4 , C5 , C6 , C7 , C8 , C9 , C10, C11, C12, C13, C14, C15 } #define MATRIX_COL_PINS { B3 , A15, A10, A8 , B14, B12, B10, B1 , B0 , A7 , A4 , A5 , A6 , C15, A0 , A1 } // R0 , R1 , R2 , R3 , R4 , R5 diff --git a/keyboards/acheron/apollo/87htsc/config.h b/keyboards/acheron/apollo/87htsc/config.h index 226deba17d..8b61b285fd 100644 --- a/keyboards/acheron/apollo/87htsc/config.h +++ b/keyboards/acheron/apollo/87htsc/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 6 -#define MATRIX_COLS 17 - // C0 , C1 , C2 , C3 , C4 , C5 , C6 , C7 , C8 , C9 , C10, C11, C12, C13, C14, C15, C16 } #define MATRIX_COL_PINS { C8 , C9 , A8 , A10, C7 , C6 , B14, B12, B10, B1 , C5 , C4 , A7 , B0 , C11, A3 , B4 } // R0 , R1 , R2 , R3 , R4 , R5 diff --git a/keyboards/acheron/apollo/88htsc/config.h b/keyboards/acheron/apollo/88htsc/config.h index 5874b50665..490c13c2e9 100644 --- a/keyboards/acheron/apollo/88htsc/config.h +++ b/keyboards/acheron/apollo/88htsc/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 6 -#define MATRIX_COLS 17 - // C0 , C1 , C2 , C3 , C4 , C5 , C6 , C7 , C8 , C9 , C10, C11, C12, C13, C14, C15, C16 } #define MATRIX_COL_PINS { C8 , C9 , A8 , A10, C7 , C6 , B14, B12, B10, B1 , C5 , C4 , A7 , B0 , C11, A3 , B4 } // R0 , R1 , R2 , R3 , R4 , R5 diff --git a/keyboards/acheron/arctic/config.h b/keyboards/acheron/arctic/config.h index 8e087114f1..0187e823fc 100644 --- a/keyboards/acheron/arctic/config.h +++ b/keyboards/acheron/arctic/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 - #define MATRIX_COL_PINS { B0, A5, A4, A3, A2, A1, A0, F1, F0, C15, C14, C13, B9, B8} #define MATRIX_ROW_PINS { B7, B6, A6, A7, B1} #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/acheron/athena/alpha/config.h b/keyboards/acheron/athena/alpha/config.h index 2fdf4551a8..08526ea943 100644 --- a/keyboards/acheron/athena/alpha/config.h +++ b/keyboards/acheron/athena/alpha/config.h @@ -18,9 +18,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_ROWS 6 -#define MATRIX_COLS 17 - #define MATRIX_COL_PINS { A8 , B14, B12, B10, B1 , B0 , A5 , A4 , A3 , A2 , A1 , A0 , C15, A7 , B4 , B3 , A15 } #define MATRIX_ROW_PINS { B9 , C13, B8 , B5 , A14 , C14 } diff --git a/keyboards/acheron/athena/beta/config.h b/keyboards/acheron/athena/beta/config.h index 65c39754c3..8be04b3fa1 100644 --- a/keyboards/acheron/athena/beta/config.h +++ b/keyboards/acheron/athena/beta/config.h @@ -18,9 +18,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_ROWS 6 -#define MATRIX_COLS 17 - #define MATRIX_COL_PINS { C7 , C6 , B14, B12, B10, B1 , C4 , A7 , A6 , A5 , A4 , A3 , A2 , C5 , A10, A8 , C9 } #define MATRIX_ROW_PINS { C11, C12, C10, A15, C0 , A1 } diff --git a/keyboards/acheron/austin/config.h b/keyboards/acheron/austin/config.h index 9de87c263e..323d7b3c83 100644 --- a/keyboards/acheron/austin/config.h +++ b/keyboards/acheron/austin/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 6 -#define MATRIX_COLS 19 - #define MATRIX_COL_PINS { B10, B11, B12, B13, B14, B15, A8, A9, A10, A5, A15, B3, B4, B5, B8, A3, C15, C14, F1 } #define MATRIX_ROW_PINS { C13, A4, A7, B0, B1, B2 } #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/acheron/elongate/beta/config.h b/keyboards/acheron/elongate/beta/config.h index ea72c59000..a3b19e7fe6 100644 --- a/keyboards/acheron/elongate/beta/config.h +++ b/keyboards/acheron/elongate/beta/config.h @@ -18,10 +18,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 13 - /* * Keyboard Matrix Assignments * diff --git a/keyboards/acheron/elongate/delta/config.h b/keyboards/acheron/elongate/delta/config.h index 0b875dc2f6..2be4dba3e3 100755 --- a/keyboards/acheron/elongate/delta/config.h +++ b/keyboards/acheron/elongate/delta/config.h @@ -18,9 +18,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_ROWS 5 -#define MATRIX_COLS 15 - #define MATRIX_COL_PINS { A10, A9, A8, B14, B12, B11, B10, B2, B1, A7, A5, B9, B8, B7, B6 } #define MATRIX_ROW_PINS { B3, A15, B0, B4, B5 } diff --git a/keyboards/acheron/keebspcb/config.h b/keyboards/acheron/keebspcb/config.h index 21a05fc181..1a8eab8b80 100644 --- a/keyboards/acheron/keebspcb/config.h +++ b/keyboards/acheron/keebspcb/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 13 - #define MATRIX_COL_PINS { B12, A1, A0, F1, F0, C15, C14, C13, B9, B8, B7, B6, B5} #define MATRIX_ROW_PINS { B4, B3, A2, A3, A4} #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/acheron/lasgweloth/config.h b/keyboards/acheron/lasgweloth/config.h index 59a44a9b9b..e41924d0c6 100644 --- a/keyboards/acheron/lasgweloth/config.h +++ b/keyboards/acheron/lasgweloth/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 - #define MATRIX_COL_PINS { B12, A2 , A1 , A0 , F1 , F0 , C15, C14, C13, A7 , A6 , A5 , A4 , B7} #define MATRIX_ROW_PINS { B9 , B8 , A3 , B0 , B1 } #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/acheron/shark/alpha/config.h b/keyboards/acheron/shark/alpha/config.h index 139b21b0b9..cadd2d825d 100644 --- a/keyboards/acheron/shark/alpha/config.h +++ b/keyboards/acheron/shark/alpha/config.h @@ -18,10 +18,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 4 -#define MATRIX_COLS 12 - /* encoder pads */ #define ENCODERS_PAD_A { B6 } #define ENCODERS_PAD_B { B7 } diff --git a/keyboards/acheron/shark/beta/config.h b/keyboards/acheron/shark/beta/config.h index 7c56f2d258..aab3c78077 100644 --- a/keyboards/acheron/shark/beta/config.h +++ b/keyboards/acheron/shark/beta/config.h @@ -18,9 +18,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_ROWS 4 -#define MATRIX_COLS 12 - #define MATRIX_COL_PINS { A5 , A10, C13, B9 , B8 , B5 , B4 , B3 , A15, A0 , A1 , A2 } #define MATRIX_ROW_PINS { A8 , B14, A4 , A3 } #define DIODE_DIRECTION COL2ROW -- cgit v1.2.3 From 9c0ce80d7e7d266cfd2d8fb0d92889db06ea95ff Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 21 Feb 2023 12:05:40 +1100 Subject: Move backlight config to data driven, part 1 (#19887) --- keyboards/acheron/athena/alpha/config.h | 2 -- keyboards/acheron/athena/alpha/info.json | 4 ++++ keyboards/acheron/athena/beta/config.h | 1 - keyboards/acheron/athena/beta/info.json | 3 +++ keyboards/acheron/austin/config.h | 1 - keyboards/acheron/elongate/delta/config.h | 1 - keyboards/acheron/elongate/delta/info.json | 3 +++ keyboards/acheron/shark/beta/config.h | 2 -- keyboards/acheron/shark/beta/info.json | 3 +++ 9 files changed, 13 insertions(+), 7 deletions(-) (limited to 'keyboards/acheron') diff --git a/keyboards/acheron/athena/alpha/config.h b/keyboards/acheron/athena/alpha/config.h index 08526ea943..fd6f74bf35 100644 --- a/keyboards/acheron/athena/alpha/config.h +++ b/keyboards/acheron/athena/alpha/config.h @@ -32,8 +32,6 @@ along with this program. If not, see . #define BACKLIGHT_PAL_MODE 2 #define BACKLIGHT_LEVELS 20 #define BACKLIGHT_BREATHING -#define BREATHING_PERIOD 5 -#define BACKLIGHT_ON_STATE 0 #define RGB_DI_PIN B15 #define RGBLED_NUM 34 diff --git a/keyboards/acheron/athena/alpha/info.json b/keyboards/acheron/athena/alpha/info.json index cc2a5249d0..f9d74fae2f 100644 --- a/keyboards/acheron/athena/alpha/info.json +++ b/keyboards/acheron/athena/alpha/info.json @@ -4,6 +4,10 @@ "pid": "0x6584", "device_version": "0.0.1" }, + "backlight": { + "on_state": 0, + "breathing_period": 5 + }, "indicators": { "caps_lock": "A10" }, diff --git a/keyboards/acheron/athena/beta/config.h b/keyboards/acheron/athena/beta/config.h index 8be04b3fa1..a3a1a3b25c 100644 --- a/keyboards/acheron/athena/beta/config.h +++ b/keyboards/acheron/athena/beta/config.h @@ -32,7 +32,6 @@ along with this program. If not, see . #define BACKLIGHT_PAL_MODE 2 #define BACKLIGHT_LEVELS 20 #define BACKLIGHT_BREATHING -#define BREATHING_PERIOD 5 #define RGB_DI_PIN B15 #define RGBLED_NUM 34 diff --git a/keyboards/acheron/athena/beta/info.json b/keyboards/acheron/athena/beta/info.json index 51c335a850..aae8d02b41 100644 --- a/keyboards/acheron/athena/beta/info.json +++ b/keyboards/acheron/athena/beta/info.json @@ -4,6 +4,9 @@ "pid": "0x6585", "device_version": "0.0.2" }, + "backlight": { + "breathing_period": 5 + }, "indicators": { "caps_lock": "C8" }, diff --git a/keyboards/acheron/austin/config.h b/keyboards/acheron/austin/config.h index 323d7b3c83..210e4182a5 100644 --- a/keyboards/acheron/austin/config.h +++ b/keyboards/acheron/austin/config.h @@ -27,7 +27,6 @@ along with this program. If not, see . #define BACKLIGHT_PAL_MODE 1 #define BACKLIGHT_LEVELS 6 #define BACKLIGHT_BREATHING -#define BREATHING_PERIOD 6 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/acheron/elongate/delta/config.h b/keyboards/acheron/elongate/delta/config.h index 2be4dba3e3..6766f62ef5 100755 --- a/keyboards/acheron/elongate/delta/config.h +++ b/keyboards/acheron/elongate/delta/config.h @@ -30,7 +30,6 @@ along with this program. If not, see . #define BACKLIGHT_BREATHING #define BACKLIGHT_LEVELS 20 #define BACKLIGHT_DEFAULT_LEVEL 10 -#define BREATHING_PERIOD 3 #define RGB_DI_PIN B15 #define RGBLED_NUM 16 diff --git a/keyboards/acheron/elongate/delta/info.json b/keyboards/acheron/elongate/delta/info.json index d763023926..6a5318b777 100644 --- a/keyboards/acheron/elongate/delta/info.json +++ b/keyboards/acheron/elongate/delta/info.json @@ -8,6 +8,9 @@ "pid": "0x454D", "device_version": "0.0.2" }, + "backlight": { + "breathing_period": 3 + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/acheron/shark/beta/config.h b/keyboards/acheron/shark/beta/config.h index aab3c78077..633f76289f 100644 --- a/keyboards/acheron/shark/beta/config.h +++ b/keyboards/acheron/shark/beta/config.h @@ -31,8 +31,6 @@ along with this program. If not, see . #define BACKLIGHT_PAL_MODE 2 #define BACKLIGHT_LEVELS 20 #define BACKLIGHT_BREATHING -#define BREATHING_PERIOD 5 -#define BACKLIGHT_ON_STATE 1 #define RGB_DI_PIN B15 #define RGBLED_NUM 24 diff --git a/keyboards/acheron/shark/beta/info.json b/keyboards/acheron/shark/beta/info.json index 615e9a91b9..dc4579b445 100644 --- a/keyboards/acheron/shark/beta/info.json +++ b/keyboards/acheron/shark/beta/info.json @@ -4,6 +4,9 @@ "pid": "0x5369", "device_version": "0.0.2" }, + "backlight": { + "breathing_period": 5 + }, "processor": "STM32F411", "bootloader": "stm32-dfu", "community_layouts": ["ortho_4x12"], -- cgit v1.2.3 From 26854f59402f3f4b7ca5cfe0f3dd665a680715f5 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 22 Feb 2023 12:12:42 +1100 Subject: Remove default and unused `BACKLIGHT_LEVELS` (#19898) --- keyboards/acheron/athena/alpha/info.json | 3 +-- keyboards/acheron/athena/beta/info.json | 3 --- keyboards/acheron/shark/beta/info.json | 3 --- 3 files changed, 1 insertion(+), 8 deletions(-) (limited to 'keyboards/acheron') diff --git a/keyboards/acheron/athena/alpha/info.json b/keyboards/acheron/athena/alpha/info.json index f9d74fae2f..bf335285ae 100644 --- a/keyboards/acheron/athena/alpha/info.json +++ b/keyboards/acheron/athena/alpha/info.json @@ -5,8 +5,7 @@ "device_version": "0.0.1" }, "backlight": { - "on_state": 0, - "breathing_period": 5 + "on_state": 0 }, "indicators": { "caps_lock": "A10" diff --git a/keyboards/acheron/athena/beta/info.json b/keyboards/acheron/athena/beta/info.json index aae8d02b41..51c335a850 100644 --- a/keyboards/acheron/athena/beta/info.json +++ b/keyboards/acheron/athena/beta/info.json @@ -4,9 +4,6 @@ "pid": "0x6585", "device_version": "0.0.2" }, - "backlight": { - "breathing_period": 5 - }, "indicators": { "caps_lock": "C8" }, diff --git a/keyboards/acheron/shark/beta/info.json b/keyboards/acheron/shark/beta/info.json index dc4579b445..615e9a91b9 100644 --- a/keyboards/acheron/shark/beta/info.json +++ b/keyboards/acheron/shark/beta/info.json @@ -4,9 +4,6 @@ "pid": "0x5369", "device_version": "0.0.2" }, - "backlight": { - "breathing_period": 5 - }, "processor": "STM32F411", "bootloader": "stm32-dfu", "community_layouts": ["ortho_4x12"], -- cgit v1.2.3 From 7f805cc7799deb0ca75f751cebd32c6640058af9 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Thu, 23 Feb 2023 09:19:00 +1100 Subject: VIA Protocol 12 + fixes (#19916) Co-authored-by: Wilba Co-authored-by: zvecr --- keyboards/acheron/shark/alpha/keymaps/via/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'keyboards/acheron') diff --git a/keyboards/acheron/shark/alpha/keymaps/via/keymap.c b/keyboards/acheron/shark/alpha/keymaps/via/keymap.c index 046e546848..2d3123cccf 100644 --- a/keyboards/acheron/shark/alpha/keymaps/via/keymap.c +++ b/keyboards/acheron/shark/alpha/keymaps/via/keymap.c @@ -22,8 +22,8 @@ enum layers { _ADJUST, }; -#define LOWER FN_MO13 -#define RAISE FN_MO23 +#define LOWER TL_LOWR +#define RAISE TL_UPPR const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Qwerty -- cgit v1.2.3 From 314f6c1ddba09851b33e4f3b4bd43bdbc55f9628 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 26 Feb 2023 08:37:57 +1100 Subject: Move backlight config to data driven (#19910) --- keyboards/acheron/athena/alpha/config.h | 3 --- keyboards/acheron/athena/alpha/info.json | 5 ++++- keyboards/acheron/athena/alpha/rules.mk | 1 - keyboards/acheron/athena/beta/config.h | 3 --- keyboards/acheron/athena/beta/info.json | 5 +++++ keyboards/acheron/athena/beta/rules.mk | 1 - keyboards/acheron/austin/config.h | 3 --- keyboards/acheron/austin/info.json | 5 +++++ keyboards/acheron/elongate/delta/config.h | 4 ---- keyboards/acheron/elongate/delta/info.json | 3 +++ keyboards/acheron/shark/alpha/config.h | 1 - keyboards/acheron/shark/alpha/info.json | 3 +++ keyboards/acheron/shark/beta/config.h | 3 --- keyboards/acheron/shark/beta/info.json | 5 +++++ keyboards/acheron/shark/beta/rules.mk | 1 - 15 files changed, 25 insertions(+), 21 deletions(-) (limited to 'keyboards/acheron') diff --git a/keyboards/acheron/athena/alpha/config.h b/keyboards/acheron/athena/alpha/config.h index fd6f74bf35..e99fb83328 100644 --- a/keyboards/acheron/athena/alpha/config.h +++ b/keyboards/acheron/athena/alpha/config.h @@ -26,12 +26,9 @@ along with this program. If not, see . #define LOCKING_SUPPORT_ENABLE #define LOCKING_RESYNC_ENABLE -#define BACKLIGHT_PIN A6 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 2 -#define BACKLIGHT_LEVELS 20 -#define BACKLIGHT_BREATHING #define RGB_DI_PIN B15 #define RGBLED_NUM 34 diff --git a/keyboards/acheron/athena/alpha/info.json b/keyboards/acheron/athena/alpha/info.json index bf335285ae..2ebf2da8de 100644 --- a/keyboards/acheron/athena/alpha/info.json +++ b/keyboards/acheron/athena/alpha/info.json @@ -5,7 +5,10 @@ "device_version": "0.0.1" }, "backlight": { - "on_state": 0 + "pin": "A6", + "levels": 20, + "on_state": 0, + "breathing": true }, "indicators": { "caps_lock": "A10" diff --git a/keyboards/acheron/athena/alpha/rules.mk b/keyboards/acheron/athena/alpha/rules.mk index 962a27694f..3d622c2216 100644 --- a/keyboards/acheron/athena/alpha/rules.mk +++ b/keyboards/acheron/athena/alpha/rules.mk @@ -8,7 +8,6 @@ CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -BACKLIGHT_DRIVER = pwm RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output LTO_ENABLE = yes diff --git a/keyboards/acheron/athena/beta/config.h b/keyboards/acheron/athena/beta/config.h index a3a1a3b25c..7fbc624522 100644 --- a/keyboards/acheron/athena/beta/config.h +++ b/keyboards/acheron/athena/beta/config.h @@ -26,12 +26,9 @@ along with this program. If not, see . #define LOCKING_SUPPORT_ENABLE #define LOCKING_RESYNC_ENABLE -#define BACKLIGHT_PIN B0 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 3 #define BACKLIGHT_PAL_MODE 2 -#define BACKLIGHT_LEVELS 20 -#define BACKLIGHT_BREATHING #define RGB_DI_PIN B15 #define RGBLED_NUM 34 diff --git a/keyboards/acheron/athena/beta/info.json b/keyboards/acheron/athena/beta/info.json index 51c335a850..dd8e766f90 100644 --- a/keyboards/acheron/athena/beta/info.json +++ b/keyboards/acheron/athena/beta/info.json @@ -4,6 +4,11 @@ "pid": "0x6585", "device_version": "0.0.2" }, + "backlight": { + "pin": "B0", + "levels": 20, + "breathing": true + }, "indicators": { "caps_lock": "C8" }, diff --git a/keyboards/acheron/athena/beta/rules.mk b/keyboards/acheron/athena/beta/rules.mk index 962a27694f..3d622c2216 100644 --- a/keyboards/acheron/athena/beta/rules.mk +++ b/keyboards/acheron/athena/beta/rules.mk @@ -8,7 +8,6 @@ CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -BACKLIGHT_DRIVER = pwm RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output LTO_ENABLE = yes diff --git a/keyboards/acheron/austin/config.h b/keyboards/acheron/austin/config.h index 210e4182a5..ce12edfd33 100644 --- a/keyboards/acheron/austin/config.h +++ b/keyboards/acheron/austin/config.h @@ -21,12 +21,9 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { C13, A4, A7, B0, B1, B2 } #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN A6 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -#define BACKLIGHT_LEVELS 6 -#define BACKLIGHT_BREATHING /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/acheron/austin/info.json b/keyboards/acheron/austin/info.json index 3f76e22f0c..dad488df8f 100755 --- a/keyboards/acheron/austin/info.json +++ b/keyboards/acheron/austin/info.json @@ -8,6 +8,11 @@ "pid": "0x4175", "device_version": "0.0.1" }, + "backlight": { + "pin": "A6", + "levels": 6, + "breathing": true + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/acheron/elongate/delta/config.h b/keyboards/acheron/elongate/delta/config.h index 6766f62ef5..0ceba36100 100755 --- a/keyboards/acheron/elongate/delta/config.h +++ b/keyboards/acheron/elongate/delta/config.h @@ -23,13 +23,9 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN A6 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -#define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 20 -#define BACKLIGHT_DEFAULT_LEVEL 10 #define RGB_DI_PIN B15 #define RGBLED_NUM 16 diff --git a/keyboards/acheron/elongate/delta/info.json b/keyboards/acheron/elongate/delta/info.json index 6a5318b777..f5f87333eb 100644 --- a/keyboards/acheron/elongate/delta/info.json +++ b/keyboards/acheron/elongate/delta/info.json @@ -9,6 +9,9 @@ "device_version": "0.0.2" }, "backlight": { + "pin": "A6", + "levels": 20, + "breathing": true, "breathing_period": 3 }, "processor": "STM32F072", diff --git a/keyboards/acheron/shark/alpha/config.h b/keyboards/acheron/shark/alpha/config.h index cadd2d825d..dba9b3f41d 100644 --- a/keyboards/acheron/shark/alpha/config.h +++ b/keyboards/acheron/shark/alpha/config.h @@ -44,7 +44,6 @@ B0, which is unconnected on the PCB /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B0 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 3 diff --git a/keyboards/acheron/shark/alpha/info.json b/keyboards/acheron/shark/alpha/info.json index 0db6134e0b..5b235cc387 100644 --- a/keyboards/acheron/shark/alpha/info.json +++ b/keyboards/acheron/shark/alpha/info.json @@ -6,6 +6,9 @@ "pid": "0x5368", "device_version": "0.0.1" }, + "backlight": { + "pin": "B0" + }, "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", diff --git a/keyboards/acheron/shark/beta/config.h b/keyboards/acheron/shark/beta/config.h index 633f76289f..161b9b1558 100644 --- a/keyboards/acheron/shark/beta/config.h +++ b/keyboards/acheron/shark/beta/config.h @@ -25,12 +25,9 @@ along with this program. If not, see . #define LOCKING_SUPPORT_ENABLE #define LOCKING_RESYNC_ENABLE -#define BACKLIGHT_PIN A6 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 2 -#define BACKLIGHT_LEVELS 20 -#define BACKLIGHT_BREATHING #define RGB_DI_PIN B15 #define RGBLED_NUM 24 diff --git a/keyboards/acheron/shark/beta/info.json b/keyboards/acheron/shark/beta/info.json index 615e9a91b9..0dcb286e97 100644 --- a/keyboards/acheron/shark/beta/info.json +++ b/keyboards/acheron/shark/beta/info.json @@ -4,6 +4,11 @@ "pid": "0x5369", "device_version": "0.0.2" }, + "backlight": { + "pin": "A6", + "levels": 20, + "breathing": true + }, "processor": "STM32F411", "bootloader": "stm32-dfu", "community_layouts": ["ortho_4x12"], diff --git a/keyboards/acheron/shark/beta/rules.mk b/keyboards/acheron/shark/beta/rules.mk index b4a94395c6..fd436cc258 100644 --- a/keyboards/acheron/shark/beta/rules.mk +++ b/keyboards/acheron/shark/beta/rules.mk @@ -10,7 +10,6 @@ NKRO_ENABLE = yes # Enable N-Key rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -BACKLIGHT_DRIVER = pwm LTO_ENABLE = no ENCODER_ENABLE = yes -- cgit v1.2.3 From 7e0299117b389b1c7fcdfa2f20891ba2287ea771 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 26 Feb 2023 09:45:12 +1100 Subject: Move encoder config to data driven (#19923) Co-authored-by: Nick Brassel --- keyboards/acheron/shark/alpha/config.h | 5 ----- keyboards/acheron/shark/alpha/info.json | 5 +++++ keyboards/acheron/shark/beta/config.h | 3 --- keyboards/acheron/shark/beta/info.json | 5 +++++ 4 files changed, 10 insertions(+), 8 deletions(-) (limited to 'keyboards/acheron') diff --git a/keyboards/acheron/shark/alpha/config.h b/keyboards/acheron/shark/alpha/config.h index dba9b3f41d..9c36ac3a1f 100644 --- a/keyboards/acheron/shark/alpha/config.h +++ b/keyboards/acheron/shark/alpha/config.h @@ -17,11 +17,6 @@ along with this program. If not, see . #pragma once - -/* encoder pads */ -#define ENCODERS_PAD_A { B6 } -#define ENCODERS_PAD_B { B7 } - /* * Keyboard Matrix Assignments * diff --git a/keyboards/acheron/shark/alpha/info.json b/keyboards/acheron/shark/alpha/info.json index 5b235cc387..d6b5dfcd0f 100644 --- a/keyboards/acheron/shark/alpha/info.json +++ b/keyboards/acheron/shark/alpha/info.json @@ -6,6 +6,11 @@ "pid": "0x5368", "device_version": "0.0.1" }, + "encoder": { + "rotary": [ + {"pin_a": "B6", "pin_b": "B7"} + ] + }, "backlight": { "pin": "B0" }, diff --git a/keyboards/acheron/shark/beta/config.h b/keyboards/acheron/shark/beta/config.h index 161b9b1558..8cfc57b9d5 100644 --- a/keyboards/acheron/shark/beta/config.h +++ b/keyboards/acheron/shark/beta/config.h @@ -49,7 +49,4 @@ along with this program. If not, see . #define WS2812_DMA_STREAM STM32_DMA2_STREAM5 #define WS2812_DMA_CHANNEL 6 -#define ENCODERS_PAD_A { C15 } -#define ENCODERS_PAD_B { C14 } - #define EEPROM_I2C_24LC256 diff --git a/keyboards/acheron/shark/beta/info.json b/keyboards/acheron/shark/beta/info.json index 0dcb286e97..73025df6c4 100644 --- a/keyboards/acheron/shark/beta/info.json +++ b/keyboards/acheron/shark/beta/info.json @@ -4,6 +4,11 @@ "pid": "0x5369", "device_version": "0.0.2" }, + "encoder": { + "rotary": [ + {"pin_a": "C15", "pin_b": "C14"} + ] + }, "backlight": { "pin": "A6", "levels": 20, -- cgit v1.2.3