From 50661ab65cc04c6400cd20037181dabba1872c86 Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Thu, 1 Dec 2022 13:06:45 -0800 Subject: Remove RGBLIGHT_ANIMATIONS from core (+cleanup) (#19216) --- keyboards/bioi/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/bioi') diff --git a/keyboards/bioi/main.c b/keyboards/bioi/main.c index bba54dfab1..eb149eb7cd 100644 --- a/keyboards/bioi/main.c +++ b/keyboards/bioi/main.c @@ -56,7 +56,7 @@ extern keymap_config_t keymap_config; #include "virtser.h" #endif -#if (defined(RGB_MIDI) | defined(RGBLIGHT_ANIMATIONS)) & defined(RGBLIGHT_ENABLE) +#if defined(RGBLIGHT_ENABLE) #include "rgblight.h" #endif -- cgit v1.2.3 From c6e291c4162bae29266cdf980657eb6a5738dfda Mon Sep 17 00:00:00 2001 From: Wolf Van Herreweghe Date: Thu, 8 Dec 2022 17:12:49 +0100 Subject: Revert RESET-> QK_BOOT in Read Me files where applicable (#19262) --- keyboards/bioi/f60/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/bioi') diff --git a/keyboards/bioi/f60/readme.md b/keyboards/bioi/f60/readme.md index 9b5c8e8591..8c32c7e7f9 100644 --- a/keyboards/bioi/f60/readme.md +++ b/keyboards/bioi/f60/readme.md @@ -21,5 +21,5 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to ## Bootloader * **Bootmagic reset**: Hold down the top left key (ESC) and plug in the keyboard -* **Physical reset button**: Short the two small pads labeled "QK_BOOT" the back of the PCB +* **Physical reset button**: Short the two small pads labeled `RESET` the back of the PCB * **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available -- cgit v1.2.3 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/bioi/f60/info.json | 1 + keyboards/bioi/f60/rules.mk | 2 -- keyboards/bioi/g60ble/info.json | 1 + keyboards/bioi/g60ble/rules.mk | 2 -- 4 files changed, 2 insertions(+), 4 deletions(-) (limited to 'keyboards/bioi') diff --git a/keyboards/bioi/f60/info.json b/keyboards/bioi/f60/info.json index 06b0176bee..62f610fd7e 100644 --- a/keyboards/bioi/f60/info.json +++ b/keyboards/bioi/f60/info.json @@ -8,6 +8,7 @@ "pid": "0x4660", "device_version": "0.0.1" }, + "community_layouts": ["60_ansi", "60_ansi_tsangan", "60_ansi_split_bs_rshift", "60_hhkb", "60_tsangan_hhkb", "60_ansi_arrow", "60_iso", "60_iso_split_bs_rshift", "60_iso_tsangan"], "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/bioi/f60/rules.mk b/keyboards/bioi/f60/rules.mk index 32e5d0de3a..3b061c1108 100644 --- a/keyboards/bioi/f60/rules.mk +++ b/keyboards/bioi/f60/rules.mk @@ -16,5 +16,3 @@ NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output - -LAYOUTS = 60_ansi 60_ansi_tsangan 60_ansi_split_bs_rshift 60_hhkb 60_tsangan_hhkb 60_ansi_arrow 60_iso 60_iso_split_bs_rshift 60_iso_tsangan diff --git a/keyboards/bioi/g60ble/info.json b/keyboards/bioi/g60ble/info.json index f47a09d3f2..01736b37f0 100644 --- a/keyboards/bioi/g60ble/info.json +++ b/keyboards/bioi/g60ble/info.json @@ -8,6 +8,7 @@ "pid": "0x6080", "device_version": "0.0.1" }, + "community_layouts": ["60_ansi", "60_iso", "60_hhkb", "60_ansi_split_bs_rshift", "60_tsangan_hhkb"], "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/bioi/g60ble/rules.mk b/keyboards/bioi/g60ble/rules.mk index f610ca3b39..7aabe3c7cf 100644 --- a/keyboards/bioi/g60ble/rules.mk +++ b/keyboards/bioi/g60ble/rules.mk @@ -19,5 +19,3 @@ NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes LTO_ENABLE = yes - -LAYOUTS = 60_ansi 60_iso 60_hhkb 60_ansi_split_bs_rshift 60_tsangan_hhkb -- 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/bioi/g60ble/config.h | 1 - 1 file changed, 1 deletion(-) (limited to 'keyboards/bioi') diff --git a/keyboards/bioi/g60ble/config.h b/keyboards/bioi/g60ble/config.h index aa77a43587..1701bce7a1 100644 --- a/keyboards/bioi/g60ble/config.h +++ b/keyboards/bioi/g60ble/config.h @@ -15,7 +15,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* number of backlight levels */ #define BACKLIGHT_PIN B7 #ifdef BACKLIGHT_PIN # define BACKLIGHT_LEVELS 8 -- 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/bioi/f60/config.h | 1 - keyboards/bioi/g60/config.h | 1 - keyboards/bioi/g60ble/config.h | 1 - keyboards/bioi/morgan65/config.h | 1 - keyboards/bioi/s65/config.h | 1 - 5 files changed, 5 deletions(-) (limited to 'keyboards/bioi') diff --git a/keyboards/bioi/f60/config.h b/keyboards/bioi/f60/config.h index e2b6fca5a4..5b8e194fd0 100644 --- a/keyboards/bioi/f60/config.h +++ b/keyboards/bioi/f60/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/bioi/g60/config.h b/keyboards/bioi/g60/config.h index 344df37fca..77a2060c20 100644 --- a/keyboards/bioi/g60/config.h +++ b/keyboards/bioi/g60/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/bioi/g60ble/config.h b/keyboards/bioi/g60ble/config.h index 1701bce7a1..96e80002d8 100644 --- a/keyboards/bioi/g60ble/config.h +++ b/keyboards/bioi/g60ble/config.h @@ -1,6 +1,5 @@ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 5 diff --git a/keyboards/bioi/morgan65/config.h b/keyboards/bioi/morgan65/config.h index 7109881593..fa2e898c8a 100644 --- a/keyboards/bioi/morgan65/config.h +++ b/keyboards/bioi/morgan65/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/bioi/s65/config.h b/keyboards/bioi/s65/config.h index a1aca31310..8e92f81c77 100644 --- a/keyboards/bioi/s65/config.h +++ b/keyboards/bioi/s65/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 -- 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/bioi/f60/config.h | 3 --- keyboards/bioi/g60/config.h | 3 --- keyboards/bioi/g60ble/config.h | 3 --- keyboards/bioi/morgan65/config.h | 3 --- keyboards/bioi/s65/config.h | 3 --- 5 files changed, 15 deletions(-) (limited to 'keyboards/bioi') diff --git a/keyboards/bioi/f60/config.h b/keyboards/bioi/f60/config.h index 5b8e194fd0..840a2604fd 100644 --- a/keyboards/bioi/f60/config.h +++ b/keyboards/bioi/f60/config.h @@ -55,6 +55,3 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_ALTERNATING # define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB #endif - -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 diff --git a/keyboards/bioi/g60/config.h b/keyboards/bioi/g60/config.h index 77a2060c20..2df0ee3961 100644 --- a/keyboards/bioi/g60/config.h +++ b/keyboards/bioi/g60/config.h @@ -43,9 +43,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - /* RGB Underglow */ #define RGB_DI_PIN B1 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/bioi/g60ble/config.h b/keyboards/bioi/g60ble/config.h index 96e80002d8..98547ca141 100644 --- a/keyboards/bioi/g60ble/config.h +++ b/keyboards/bioi/g60ble/config.h @@ -19,9 +19,6 @@ # define BACKLIGHT_LEVELS 8 #endif -/* 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 diff --git a/keyboards/bioi/morgan65/config.h b/keyboards/bioi/morgan65/config.h index fa2e898c8a..8409f49b21 100644 --- a/keyboards/bioi/morgan65/config.h +++ b/keyboards/bioi/morgan65/config.h @@ -43,9 +43,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - /* RGB Underglow */ #define RGB_DI_PIN B1 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/bioi/s65/config.h b/keyboards/bioi/s65/config.h index 8e92f81c77..31ce38a2bc 100644 --- a/keyboards/bioi/s65/config.h +++ b/keyboards/bioi/s65/config.h @@ -44,9 +44,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - /* RGB Underglow */ #define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING -- 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/bioi/f60/info.json | 2 ++ keyboards/bioi/f60/rules.mk | 6 ------ keyboards/bioi/g60/info.json | 2 ++ keyboards/bioi/g60/rules.mk | 6 ------ keyboards/bioi/g60ble/info.json | 2 ++ keyboards/bioi/g60ble/rules.mk | 6 ------ keyboards/bioi/morgan65/info.json | 2 ++ keyboards/bioi/morgan65/rules.mk | 6 ------ keyboards/bioi/s65/info.json | 2 ++ keyboards/bioi/s65/rules.mk | 6 ------ 10 files changed, 10 insertions(+), 30 deletions(-) (limited to 'keyboards/bioi') diff --git a/keyboards/bioi/f60/info.json b/keyboards/bioi/f60/info.json index 62f610fd7e..09513eedb3 100644 --- a/keyboards/bioi/f60/info.json +++ b/keyboards/bioi/f60/info.json @@ -8,6 +8,8 @@ "pid": "0x4660", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_ansi_tsangan", "60_ansi_split_bs_rshift", "60_hhkb", "60_tsangan_hhkb", "60_ansi_arrow", "60_iso", "60_iso_split_bs_rshift", "60_iso_tsangan"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/bioi/f60/rules.mk b/keyboards/bioi/f60/rules.mk index 3b061c1108..85830d3115 100644 --- a/keyboards/bioi/f60/rules.mk +++ b/keyboards/bioi/f60/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/bioi/g60/info.json b/keyboards/bioi/g60/info.json index a171f68c13..bdc8e9b596 100644 --- a/keyboards/bioi/g60/info.json +++ b/keyboards/bioi/g60/info.json @@ -8,6 +8,8 @@ "pid": "0x6080", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/bioi/g60/rules.mk b/keyboards/bioi/g60/rules.mk index 3cbf7621f2..d6c97aa974 100644 --- a/keyboards/bioi/g60/rules.mk +++ b/keyboards/bioi/g60/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = qmk-dfu - SRC += usart.c \ ble.c \ main.c diff --git a/keyboards/bioi/g60ble/info.json b/keyboards/bioi/g60ble/info.json index 01736b37f0..d8ef72cbb8 100644 --- a/keyboards/bioi/g60ble/info.json +++ b/keyboards/bioi/g60ble/info.json @@ -8,6 +8,8 @@ "pid": "0x6080", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "community_layouts": ["60_ansi", "60_iso", "60_hhkb", "60_ansi_split_bs_rshift", "60_tsangan_hhkb"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/bioi/g60ble/rules.mk b/keyboards/bioi/g60ble/rules.mk index 7aabe3c7cf..e3420b4a28 100644 --- a/keyboards/bioi/g60ble/rules.mk +++ b/keyboards/bioi/g60ble/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/bioi/morgan65/info.json b/keyboards/bioi/morgan65/info.json index 8ed769c616..c71f000e2f 100644 --- a/keyboards/bioi/morgan65/info.json +++ b/keyboards/bioi/morgan65/info.json @@ -8,6 +8,8 @@ "pid": "0x6581", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/bioi/morgan65/rules.mk b/keyboards/bioi/morgan65/rules.mk index 3cbf7621f2..d6c97aa974 100644 --- a/keyboards/bioi/morgan65/rules.mk +++ b/keyboards/bioi/morgan65/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = qmk-dfu - SRC += usart.c \ ble.c \ main.c diff --git a/keyboards/bioi/s65/info.json b/keyboards/bioi/s65/info.json index fba9940ffb..8de355ee4b 100644 --- a/keyboards/bioi/s65/info.json +++ b/keyboards/bioi/s65/info.json @@ -8,6 +8,8 @@ "pid": "0x5365", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/bioi/s65/rules.mk b/keyboards/bioi/s65/rules.mk index aaead314e9..332501b774 100644 --- a/keyboards/bioi/s65/rules.mk +++ b/keyboards/bioi/s65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # -- 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/bioi/f60/config.h | 3 --- keyboards/bioi/f60/info.json | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'keyboards/bioi') diff --git a/keyboards/bioi/f60/config.h b/keyboards/bioi/f60/config.h index 840a2604fd..17b8ceaf1b 100644 --- a/keyboards/bioi/f60/config.h +++ b/keyboards/bioi/f60/config.h @@ -29,9 +29,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* Indicator LEDs */ -#define LED_CAPS_LOCK_PIN F0 - #define BACKLIGHT_PIN B7 #define BACKLIGHT_LEVELS 8 #define BACKLIGHT_BREATHING diff --git a/keyboards/bioi/f60/info.json b/keyboards/bioi/f60/info.json index 09513eedb3..1e95671f5d 100644 --- a/keyboards/bioi/f60/info.json +++ b/keyboards/bioi/f60/info.json @@ -8,6 +8,9 @@ "pid": "0x4660", "device_version": "0.0.1" }, + "indicators": { + "caps_lock": "F0" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_ansi_tsangan", "60_ansi_split_bs_rshift", "60_hhkb", "60_tsangan_hhkb", "60_ansi_arrow", "60_iso", "60_iso_split_bs_rshift", "60_iso_tsangan"], -- 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/bioi/f60/config.h | 4 ---- keyboards/bioi/g60/config.h | 4 ---- keyboards/bioi/g60ble/config.h | 4 ---- keyboards/bioi/morgan65/config.h | 4 ---- keyboards/bioi/s65/config.h | 4 ---- 5 files changed, 20 deletions(-) (limited to 'keyboards/bioi') diff --git a/keyboards/bioi/f60/config.h b/keyboards/bioi/f60/config.h index 17b8ceaf1b..3cfee0a389 100644 --- a/keyboards/bioi/f60/config.h +++ b/keyboards/bioi/f60/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 14 - /* Keyboard Matrix Assignments */ #define MATRIX_ROW_PINS { B0, E6, F1, F5, F4 } #define MATRIX_COL_PINS { F6, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D0, D1 } diff --git a/keyboards/bioi/g60/config.h b/keyboards/bioi/g60/config.h index 2df0ee3961..f6bffcf14f 100644 --- a/keyboards/bioi/g60/config.h +++ b/keyboards/bioi/g60/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 14 - /* * Keyboard Matrix Assignments * diff --git a/keyboards/bioi/g60ble/config.h b/keyboards/bioi/g60ble/config.h index 98547ca141..e642b04c7c 100644 --- a/keyboards/bioi/g60ble/config.h +++ b/keyboards/bioi/g60ble/config.h @@ -1,10 +1,6 @@ #pragma once -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 14 - /* key matrix pins */ #define MATRIX_ROW_PINS \ { E6, B0, F1, F5, F4 } diff --git a/keyboards/bioi/morgan65/config.h b/keyboards/bioi/morgan65/config.h index 8409f49b21..1fb1d149c0 100644 --- a/keyboards/bioi/morgan65/config.h +++ b/keyboards/bioi/morgan65/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 14 - /* * Keyboard Matrix Assignments * diff --git a/keyboards/bioi/s65/config.h b/keyboards/bioi/s65/config.h index 31ce38a2bc..4a98749258 100644 --- a/keyboards/bioi/s65/config.h +++ b/keyboards/bioi/s65/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 16 - /* * Keyboard Matrix Assignments * -- 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/bioi/f60/config.h | 4 ---- keyboards/bioi/f60/info.json | 5 +++++ keyboards/bioi/g60/config.h | 4 ---- keyboards/bioi/g60/info.json | 4 ++++ keyboards/bioi/g60ble/config.h | 5 ----- keyboards/bioi/g60ble/info.json | 4 ++++ keyboards/bioi/morgan65/config.h | 4 ---- keyboards/bioi/morgan65/info.json | 4 ++++ keyboards/bioi/s65/config.h | 5 ----- keyboards/bioi/s65/info.json | 4 ++++ 10 files changed, 21 insertions(+), 22 deletions(-) (limited to 'keyboards/bioi') diff --git a/keyboards/bioi/f60/config.h b/keyboards/bioi/f60/config.h index 3cfee0a389..32e179e918 100644 --- a/keyboards/bioi/f60/config.h +++ b/keyboards/bioi/f60/config.h @@ -25,10 +25,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_LEVELS 8 -#define BACKLIGHT_BREATHING - #define RGB_DI_PIN B1 #ifdef RGB_DI_PIN # define RGBLED_NUM 5 diff --git a/keyboards/bioi/f60/info.json b/keyboards/bioi/f60/info.json index 1e95671f5d..65c59db2b4 100644 --- a/keyboards/bioi/f60/info.json +++ b/keyboards/bioi/f60/info.json @@ -8,6 +8,11 @@ "pid": "0x4660", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 8, + "breathing": true + }, "indicators": { "caps_lock": "F0" }, diff --git a/keyboards/bioi/g60/config.h b/keyboards/bioi/g60/config.h index f6bffcf14f..d3172d1812 100644 --- a/keyboards/bioi/g60/config.h +++ b/keyboards/bioi/g60/config.h @@ -32,10 +32,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { E6, B0, F1, F5, F4 } #define MATRIX_COL_PINS { F6, F7, B3, C7, C6, B6, B5, D5, B4, D7, D6, D4, D1, D0 } -/* Backlight Setup */ -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_LEVELS 12 - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/bioi/g60/info.json b/keyboards/bioi/g60/info.json index bdc8e9b596..16b09ca00c 100644 --- a/keyboards/bioi/g60/info.json +++ b/keyboards/bioi/g60/info.json @@ -8,6 +8,10 @@ "pid": "0x6080", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 12 + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "layouts": { diff --git a/keyboards/bioi/g60ble/config.h b/keyboards/bioi/g60ble/config.h index e642b04c7c..eb20ed7515 100644 --- a/keyboards/bioi/g60ble/config.h +++ b/keyboards/bioi/g60ble/config.h @@ -10,11 +10,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#ifdef BACKLIGHT_PIN -# define BACKLIGHT_LEVELS 8 -#endif - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/bioi/g60ble/info.json b/keyboards/bioi/g60ble/info.json index d8ef72cbb8..cca5ed456f 100644 --- a/keyboards/bioi/g60ble/info.json +++ b/keyboards/bioi/g60ble/info.json @@ -8,6 +8,10 @@ "pid": "0x6080", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 8 + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "community_layouts": ["60_ansi", "60_iso", "60_hhkb", "60_ansi_split_bs_rshift", "60_tsangan_hhkb"], diff --git a/keyboards/bioi/morgan65/config.h b/keyboards/bioi/morgan65/config.h index 1fb1d149c0..6d609e0185 100644 --- a/keyboards/bioi/morgan65/config.h +++ b/keyboards/bioi/morgan65/config.h @@ -32,10 +32,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { E6, C6, F4, B2, D4 } #define MATRIX_COL_PINS { F5, F6, F7, C7, B0, B7, B5, D5, B4, D7, D6, D1, D0, B3 } -/* Backlight Setup */ -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_LEVELS 12 - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/bioi/morgan65/info.json b/keyboards/bioi/morgan65/info.json index c71f000e2f..1a822b2113 100644 --- a/keyboards/bioi/morgan65/info.json +++ b/keyboards/bioi/morgan65/info.json @@ -8,6 +8,10 @@ "pid": "0x6581", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "levels": 12 + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "layouts": { diff --git a/keyboards/bioi/s65/config.h b/keyboards/bioi/s65/config.h index 4a98749258..6556560112 100644 --- a/keyboards/bioi/s65/config.h +++ b/keyboards/bioi/s65/config.h @@ -32,11 +32,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { D2, D0, D1, F7, D6 } #define MATRIX_COL_PINS { F1, B3, F4, F5, F6, E6, C7, B2, B1, C6, B6, B5, B4, D7, D4, D5 } - -/* Backlight Setup */ -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_LEVELS 12 - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/bioi/s65/info.json b/keyboards/bioi/s65/info.json index 8de355ee4b..b80b37b2ea 100644 --- a/keyboards/bioi/s65/info.json +++ b/keyboards/bioi/s65/info.json @@ -8,6 +8,10 @@ "pid": "0x5365", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "levels": 12 + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "layouts": { -- cgit v1.2.3