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/cannonkeys/ortho60/info.json | 1 + keyboards/cannonkeys/ortho60/rules.mk | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'keyboards/cannonkeys/ortho60') diff --git a/keyboards/cannonkeys/ortho60/info.json b/keyboards/cannonkeys/ortho60/info.json index 1a4d036a69..4c8bcdcc3b 100644 --- a/keyboards/cannonkeys/ortho60/info.json +++ b/keyboards/cannonkeys/ortho60/info.json @@ -8,6 +8,7 @@ "pid": "0x4F60", "device_version": "0.0.1" }, + "community_layouts": ["ortho_5x12"], "layouts": { "LAYOUT_ortho_5x12": { "layout": [ diff --git a/keyboards/cannonkeys/ortho60/rules.mk b/keyboards/cannonkeys/ortho60/rules.mk index ee4390309c..a644ef6371 100644 --- a/keyboards/cannonkeys/ortho60/rules.mk +++ b/keyboards/cannonkeys/ortho60/rules.mk @@ -18,8 +18,5 @@ RGBLIGHT_ENABLE = yes SLEEP_LED_ENABLE = yes WS2812_DRIVER = spi -LAYOUTS = ortho_5x12 - - # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -- 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/cannonkeys/ortho60/config.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'keyboards/cannonkeys/ortho60') diff --git a/keyboards/cannonkeys/ortho60/config.h b/keyboards/cannonkeys/ortho60/config.h index e1c2dfb409..8a71c4313f 100644 --- a/keyboards/cannonkeys/ortho60/config.h +++ b/keyboards/cannonkeys/ortho60/config.h @@ -32,9 +32,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 -- 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/cannonkeys/ortho60/config.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'keyboards/cannonkeys/ortho60') diff --git a/keyboards/cannonkeys/ortho60/config.h b/keyboards/cannonkeys/ortho60/config.h index 8a71c4313f..fb7cec1c48 100644 --- a/keyboards/cannonkeys/ortho60/config.h +++ b/keyboards/cannonkeys/ortho60/config.h @@ -32,9 +32,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 */ -- 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/cannonkeys/ortho60/info.json | 2 ++ keyboards/cannonkeys/ortho60/rules.mk | 6 ------ 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'keyboards/cannonkeys/ortho60') diff --git a/keyboards/cannonkeys/ortho60/info.json b/keyboards/cannonkeys/ortho60/info.json index 4c8bcdcc3b..7db3ee9f04 100644 --- a/keyboards/cannonkeys/ortho60/info.json +++ b/keyboards/cannonkeys/ortho60/info.json @@ -8,6 +8,8 @@ "pid": "0x4F60", "device_version": "0.0.1" }, + "processor": "STM32F103", + "bootloader": "stm32duino", "community_layouts": ["ortho_5x12"], "layouts": { "LAYOUT_ortho_5x12": { diff --git a/keyboards/cannonkeys/ortho60/rules.mk b/keyboards/cannonkeys/ortho60/rules.mk index a644ef6371..f7dee7ff20 100644 --- a/keyboards/cannonkeys/ortho60/rules.mk +++ b/keyboards/cannonkeys/ortho60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F103 - -# Bootloader selection -BOOTLOADER = stm32duino - # Build Options # change yes to no to disable # -- 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/cannonkeys/ortho60/config.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'keyboards/cannonkeys/ortho60') diff --git a/keyboards/cannonkeys/ortho60/config.h b/keyboards/cannonkeys/ortho60/config.h index fb7cec1c48..7a7d5c2ed6 100644 --- a/keyboards/cannonkeys/ortho60/config.h +++ b/keyboards/cannonkeys/ortho60/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 12 - #define MATRIX_COL_PINS { B11, B10, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0 } #define MATRIX_ROW_PINS { B3, B4, B5, B6, B7 } #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/cannonkeys/ortho60/config.h | 1 - 1 file changed, 1 deletion(-) (limited to 'keyboards/cannonkeys/ortho60') diff --git a/keyboards/cannonkeys/ortho60/config.h b/keyboards/cannonkeys/ortho60/config.h index 7a7d5c2ed6..0e86aa6851 100644 --- a/keyboards/cannonkeys/ortho60/config.h +++ b/keyboards/cannonkeys/ortho60/config.h @@ -26,7 +26,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_CHANNEL 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 -- 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/cannonkeys/ortho60/config.h | 3 --- keyboards/cannonkeys/ortho60/info.json | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'keyboards/cannonkeys/ortho60') diff --git a/keyboards/cannonkeys/ortho60/config.h b/keyboards/cannonkeys/ortho60/config.h index 0e86aa6851..f9c6596a9f 100644 --- a/keyboards/cannonkeys/ortho60/config.h +++ b/keyboards/cannonkeys/ortho60/config.h @@ -21,11 +21,8 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { B3, B4, B5, B6, B7 } #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN A8 #define BACKLIGHT_PWM_DRIVER PWMD1 #define BACKLIGHT_PWM_CHANNEL 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/cannonkeys/ortho60/info.json b/keyboards/cannonkeys/ortho60/info.json index 7db3ee9f04..8426955dae 100644 --- a/keyboards/cannonkeys/ortho60/info.json +++ b/keyboards/cannonkeys/ortho60/info.json @@ -8,6 +8,11 @@ "pid": "0x4F60", "device_version": "0.0.1" }, + "backlight": { + "pin": "A8", + "levels": 6, + "breathing": true + }, "processor": "STM32F103", "bootloader": "stm32duino", "community_layouts": ["ortho_5x12"], -- cgit v1.2.3