From 8e16920530b810510885f5f77a1c0731c463d8bf Mon Sep 17 00:00:00 2001 From: Dean Scarff <15805+p00ya@users.noreply.github.com> Date: Wed, 18 Jan 2023 07:54:16 +1100 Subject: [Keyboard] keebio/iris document LED matrix (#19588) --- keyboards/keebio/iris/rev6b/rev6b.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/keebio/iris/rev6b') diff --git a/keyboards/keebio/iris/rev6b/rev6b.c b/keyboards/keebio/iris/rev6b/rev6b.c index f4d9a6830b..883154c5c3 100644 --- a/keyboards/keebio/iris/rev6b/rev6b.c +++ b/keyboards/keebio/iris/rev6b/rev6b.c @@ -22,7 +22,7 @@ led_config_t g_led_config = { { { 12, 13, 14, 15, 16, 17 }, { 23, 22, 21, 20, 19, 18 }, { NO_LED, NO_LED, 24, 25, 26, 27 }, - // Right Half + // Right Half (mirrored, i.e. LEDs 39 and 40 are the leftmost column). { 34, 35, 36, 37, 38, 39 }, { 45, 44, 43, 42, 41, 40 }, { 46, 47, 48, 49, 50, 51 }, -- 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/keebio/iris/rev6b/config.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'keyboards/keebio/iris/rev6b') diff --git a/keyboards/keebio/iris/rev6b/config.h b/keyboards/keebio/iris/rev6b/config.h index 69ea7556fe..ad4c6323a3 100644 --- a/keyboards/keebio/iris/rev6b/config.h +++ b/keyboards/keebio/iris/rev6b/config.h @@ -40,9 +40,6 @@ along with this program. If not, see . /* define if matrix has ghost */ //#define MATRIX_HAS_GHOST -/* number of backlight levels */ -// #define BACKLIGHT_LEVELS 3 - /* Set 0 if debouncing isn't needed */ #define DEBOUNCE 5 -- 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/keebio/iris/rev6b/config.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'keyboards/keebio/iris/rev6b') diff --git a/keyboards/keebio/iris/rev6b/config.h b/keyboards/keebio/iris/rev6b/config.h index ad4c6323a3..95113a8a6f 100644 --- a/keyboards/keebio/iris/rev6b/config.h +++ b/keyboards/keebio/iris/rev6b/config.h @@ -37,9 +37,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* 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/keebio/iris/rev6b/config.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'keyboards/keebio/iris/rev6b') diff --git a/keyboards/keebio/iris/rev6b/config.h b/keyboards/keebio/iris/rev6b/config.h index 95113a8a6f..5793e50d19 100644 --- a/keyboards/keebio/iris/rev6b/config.h +++ b/keyboards/keebio/iris/rev6b/config.h @@ -37,9 +37,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - /* serial.c configuration for split keyboard */ #define SOFT_SERIAL_PIN D0 -- 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/keebio/iris/rev6b/info.json | 4 +++- keyboards/keebio/iris/rev6b/rules.mk | 6 ------ 2 files changed, 3 insertions(+), 7 deletions(-) (limited to 'keyboards/keebio/iris/rev6b') diff --git a/keyboards/keebio/iris/rev6b/info.json b/keyboards/keebio/iris/rev6b/info.json index eafae19202..38a90c7b86 100644 --- a/keyboards/keebio/iris/rev6b/info.json +++ b/keyboards/keebio/iris/rev6b/info.json @@ -3,5 +3,7 @@ "usb": { "pid": "0x6456", "device_version": "6.2.0" - } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/keebio/iris/rev6b/rules.mk b/keyboards/keebio/iris/rev6b/rules.mk index 87f19b5fc1..5dcf2c2b7c 100644 --- a/keyboards/keebio/iris/rev6b/rules.mk +++ b/keyboards/keebio/iris/rev6b/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # 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/keebio/iris/rev6b/config.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'keyboards/keebio/iris/rev6b') diff --git a/keyboards/keebio/iris/rev6b/config.h b/keyboards/keebio/iris/rev6b/config.h index 5793e50d19..34899032e7 100644 --- a/keyboards/keebio/iris/rev6b/config.h +++ b/keyboards/keebio/iris/rev6b/config.h @@ -17,11 +17,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -// Rows are doubled-up -#define MATRIX_ROWS 10 -#define MATRIX_COLS 6 - // wiring of each half #define MATRIX_ROW_PINS { B1, F0, F5, B4, D7 } #define MATRIX_COL_PINS { F1, F4, B5, C7, D4, D6 } -- cgit v1.2.3 From 8f6c228adbfec98828f0411f62bab07f96e5c020 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Feb 2023 16:40:49 +1100 Subject: Move `SOFT_SERIAL_PIN` to data driven (#19863) --- keyboards/keebio/iris/rev6b/config.h | 3 --- keyboards/keebio/iris/rev6b/info.json | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'keyboards/keebio/iris/rev6b') diff --git a/keyboards/keebio/iris/rev6b/config.h b/keyboards/keebio/iris/rev6b/config.h index 34899032e7..b78a757344 100644 --- a/keyboards/keebio/iris/rev6b/config.h +++ b/keyboards/keebio/iris/rev6b/config.h @@ -32,9 +32,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* serial.c configuration for split keyboard */ -#define SOFT_SERIAL_PIN D0 - /* ws2812 RGB LED */ #define RGB_DI_PIN E6 #ifdef RGB_DI_PIN diff --git a/keyboards/keebio/iris/rev6b/info.json b/keyboards/keebio/iris/rev6b/info.json index 38a90c7b86..2fef279eb3 100644 --- a/keyboards/keebio/iris/rev6b/info.json +++ b/keyboards/keebio/iris/rev6b/info.json @@ -4,6 +4,9 @@ "pid": "0x6456", "device_version": "6.2.0" }, + "split": { + "soft_serial_pin": "D0" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu" } -- 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/keebio/iris/rev6b/config.h | 5 ----- keyboards/keebio/iris/rev6b/info.json | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'keyboards/keebio/iris/rev6b') diff --git a/keyboards/keebio/iris/rev6b/config.h b/keyboards/keebio/iris/rev6b/config.h index b78a757344..dd05a6ec3b 100644 --- a/keyboards/keebio/iris/rev6b/config.h +++ b/keyboards/keebio/iris/rev6b/config.h @@ -24,11 +24,6 @@ along with this program. If not, see . #define MATRIX_COL_PINS_RIGHT { D4, D6, D7, C7, F1, F4 } #define SPLIT_HAND_PIN D5 -#define ENCODERS_PAD_A { B3 } -#define ENCODERS_PAD_B { B2 } -#define ENCODERS_PAD_A_RIGHT { B3 } -#define ENCODERS_PAD_B_RIGHT { B2 } - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/keebio/iris/rev6b/info.json b/keyboards/keebio/iris/rev6b/info.json index 2fef279eb3..b8d1f076a4 100644 --- a/keyboards/keebio/iris/rev6b/info.json +++ b/keyboards/keebio/iris/rev6b/info.json @@ -4,6 +4,11 @@ "pid": "0x6456", "device_version": "6.2.0" }, + "encoder": { + "rotary": [ + {"pin_a": "B3", "pin_b": "B2"} + ] + }, "split": { "soft_serial_pin": "D0" }, -- cgit v1.2.3