From 3b75c2870cee22bc027c660ab9624d5a3d26ffa1 Mon Sep 17 00:00:00 2001
From: Jay Greco <jayv.greco@gmail.com>
Date: Fri, 1 Sep 2023 05:32:47 +0000
Subject: [PATCH] August 2023 breaking changes updates
---
keyboards/nullbitsco/nibble/rp2040/info.json | 2 +-
.../snap/avr/keymaps/bongo_reactive/keymap.c | 2 +-
.../nullbitsco/snap/avr/keymaps/oled/keymap.c | 2 +-
.../nullbitsco/snap/avr/keymaps/typehud/keymap.c | 2 +-
.../snap/rp2040/keymaps/bongo_reactive/keymap.c | 14 +++++++-------
.../snap/rp2040/keymaps/bongo_reactive/rules.mk | 1 -
.../keymaps/bongo_reactive_single_oled/rules.mk | 1 -
.../nullbitsco/snap/rp2040/keymaps/oled/keymap.c | 14 +++++++-------
.../nullbitsco/snap/rp2040/keymaps/oled/rules.mk | 1 -
.../snap/rp2040/keymaps/typehud/keymap.c | 14 +++++++-------
.../snap/rp2040/keymaps/typehud/rules.mk | 1 -
keyboards/nullbitsco/tidbit/avr/info.json | 7 -------
keyboards/nullbitsco/tidbit/rp2040/info.json | 1 +
13 files changed, 26 insertions(+), 36 deletions(-)
diff --git a/keyboards/nullbitsco/nibble/rp2040/info.json b/keyboards/nullbitsco/nibble/rp2040/info.json
index 7542082f80..cc1ecf2cff 100644
--- a/keyboards/nullbitsco/nibble/rp2040/info.json
+++ b/keyboards/nullbitsco/nibble/rp2040/info.json
@@ -9,4 +9,4 @@
"ws2812": {
"pin": "GP7"
}
-}
\ No newline at end of file
+}
diff --git a/keyboards/nullbitsco/snap/avr/keymaps/bongo_reactive/keymap.c b/keyboards/nullbitsco/snap/avr/keymaps/bongo_reactive/keymap.c
index 4b7b8e98bd..575b8e6e93 100644
--- a/keyboards/nullbitsco/snap/avr/keymaps/bongo_reactive/keymap.c
+++ b/keyboards/nullbitsco/snap/avr/keymaps/bongo_reactive/keymap.c
@@ -92,7 +92,7 @@ static void render_status(void) {
// Only update if the LED state has changed
// Otherwise, the OLED will not turn off if an LED is on.
- if (persistent_led_state != led_state) {
+ if (persistent_led_state.raw != led_state.raw) {
persistent_led_state = led_state;
oled_write_ln_P(PSTR(""), false);
diff --git a/keyboards/nullbitsco/snap/avr/keymaps/oled/keymap.c b/keyboards/nullbitsco/snap/avr/keymaps/oled/keymap.c
index 7edc1020b1..720d30f968 100644
--- a/keyboards/nullbitsco/snap/avr/keymaps/oled/keymap.c
+++ b/keyboards/nullbitsco/snap/avr/keymaps/oled/keymap.c
@@ -119,7 +119,7 @@ static void render_status(void) {
// Only update if the LED state has changed
// Otherwise, the OLED will not turn off if an LED is on.
- if (persistent_led_state != led_state) {
+ if (persistent_led_state.raw != led_state.raw) {
persistent_led_state = led_state;
oled_write_ln_P(PSTR(""), false);
diff --git a/keyboards/nullbitsco/snap/avr/keymaps/typehud/keymap.c b/keyboards/nullbitsco/snap/avr/keymaps/typehud/keymap.c
index c981e378e8..54c01c7333 100644
--- a/keyboards/nullbitsco/snap/avr/keymaps/typehud/keymap.c
+++ b/keyboards/nullbitsco/snap/avr/keymaps/typehud/keymap.c
@@ -99,7 +99,7 @@ static void render_status(void) {
// Only update if the LED state has changed
// Otherwise, the OLED will not turn off if an LED is on.
- if (persistent_led_state != led_state) {
+ if (persistent_led_state.raw != led_state.raw) {
persistent_led_state = led_state;
oled_write_ln_P(PSTR(" "), false);
diff --git a/keyboards/nullbitsco/snap/rp2040/keymaps/bongo_reactive/keymap.c b/keyboards/nullbitsco/snap/rp2040/keymaps/bongo_reactive/keymap.c
index e1e32d1ebe..c500429acb 100644
--- a/keyboards/nullbitsco/snap/rp2040/keymaps/bongo_reactive/keymap.c
+++ b/keyboards/nullbitsco/snap/rp2040/keymaps/bongo_reactive/keymap.c
@@ -101,27 +101,27 @@ static void render_status(void) {
// Host Keyboard LED Status
oled_set_cursor(0, 1);
- static uint8_t persistent_led_state = 0;
- uint8_t led_usb_state = host_keyboard_leds();
+ static led_t persistent_led_state = {0};
+ led_t led_state = host_keyboard_led_state();
// Only update if the LED state has changed
// Otherwise, the OLED will not turn off if an LED is on.
- if (persistent_led_state != led_usb_state) {
- persistent_led_state = led_usb_state;
+ if (persistent_led_state.raw != led_state.raw) {
+ persistent_led_state = led_state;
oled_write_ln_P(PSTR(""), false);
- if (IS_LED_ON(led_usb_state, USB_LED_CAPS_LOCK)) {
+ if (led_state.caps_lock) {
oled_set_cursor(0, 1);
oled_write_P(PSTR("CAPS"), false);
}
- if (IS_LED_ON(led_usb_state, USB_LED_NUM_LOCK)) {
+ if (led_state.num_lock) {
oled_set_cursor(5, 1);
oled_write_P(PSTR("NUM"), true);
}
- if (IS_LED_ON(led_usb_state, USB_LED_SCROLL_LOCK)) {
+ if (led_state.scroll_lock) {
oled_set_cursor(9, 1);
oled_write_P(PSTR("SCR"), false);
}
diff --git a/keyboards/nullbitsco/snap/rp2040/keymaps/bongo_reactive/rules.mk b/keyboards/nullbitsco/snap/rp2040/keymaps/bongo_reactive/rules.mk
index d9301f9e1a..f2387d183a 100644
--- a/keyboards/nullbitsco/snap/rp2040/keymaps/bongo_reactive/rules.mk
+++ b/keyboards/nullbitsco/snap/rp2040/keymaps/bongo_reactive/rules.mk
@@ -1,5 +1,4 @@
OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
VIA_ENABLE = yes
WPM_ENABLE = yes
ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/nullbitsco/snap/rp2040/keymaps/bongo_reactive_single_oled/rules.mk b/keyboards/nullbitsco/snap/rp2040/keymaps/bongo_reactive_single_oled/rules.mk
index d0a184e961..506f77c16d 100644
--- a/keyboards/nullbitsco/snap/rp2040/keymaps/bongo_reactive_single_oled/rules.mk
+++ b/keyboards/nullbitsco/snap/rp2040/keymaps/bongo_reactive_single_oled/rules.mk
@@ -1,5 +1,4 @@
OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
WPM_ENABLE = yes
VIA_ENABLE = yes
ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/nullbitsco/snap/rp2040/keymaps/oled/keymap.c b/keyboards/nullbitsco/snap/rp2040/keymaps/oled/keymap.c
index 8d9c5fa4e4..2d988e6801 100644
--- a/keyboards/nullbitsco/snap/rp2040/keymaps/oled/keymap.c
+++ b/keyboards/nullbitsco/snap/rp2040/keymaps/oled/keymap.c
@@ -126,27 +126,27 @@ static void render_status(void) {
// Host Keyboard LED Status
oled_set_cursor(0, 1);
- static uint8_t persistent_led_state = 0;
- uint8_t led_usb_state = host_keyboard_leds();
+ static led_t persistent_led_state = {0};
+ led_t led_state = host_keyboard_led_state();
// Only update if the LED state has changed
// Otherwise, the OLED will not turn off if an LED is on.
- if (persistent_led_state != led_usb_state) {
- persistent_led_state = led_usb_state;
+ if (persistent_led_state.raw != led_state.raw) {
+ persistent_led_state = led_state;
oled_write_ln_P(PSTR(""), false);
- if (IS_LED_ON(led_usb_state, USB_LED_CAPS_LOCK)) {
+ if (led_state.caps_lock) {
oled_set_cursor(0, 1);
oled_write_P(PSTR("CAPS"), false);
}
- if (IS_LED_ON(led_usb_state, USB_LED_NUM_LOCK)) {
+ if (led_state.num_lock) {
oled_set_cursor(5, 1);
oled_write_P(PSTR("NUM"), true);
}
- if (IS_LED_ON(led_usb_state, USB_LED_SCROLL_LOCK)) {
+ if (led_state.scroll_lock) {
oled_set_cursor(9, 1);
oled_write_P(PSTR("SCR"), false);
}
diff --git a/keyboards/nullbitsco/snap/rp2040/keymaps/oled/rules.mk b/keyboards/nullbitsco/snap/rp2040/keymaps/oled/rules.mk
index d0a184e961..506f77c16d 100644
--- a/keyboards/nullbitsco/snap/rp2040/keymaps/oled/rules.mk
+++ b/keyboards/nullbitsco/snap/rp2040/keymaps/oled/rules.mk
@@ -1,5 +1,4 @@
OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
WPM_ENABLE = yes
VIA_ENABLE = yes
ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/nullbitsco/snap/rp2040/keymaps/typehud/keymap.c b/keyboards/nullbitsco/snap/rp2040/keymaps/typehud/keymap.c
index cc218713bc..7ef5dd7a82 100644
--- a/keyboards/nullbitsco/snap/rp2040/keymaps/typehud/keymap.c
+++ b/keyboards/nullbitsco/snap/rp2040/keymaps/typehud/keymap.c
@@ -107,27 +107,27 @@ static void render_status(void) {
// Host Keyboard LED Status
oled_set_cursor(0, 1);
- static uint8_t persistent_led_state = 0;
- uint8_t led_usb_state = host_keyboard_leds();
+ static led_t persistent_led_state = {0};
+ led_t led_state = host_keyboard_led_state();
// Only update if the LED state has changed
// Otherwise, the OLED will not turn off if an LED is on.
- if (persistent_led_state != led_usb_state) {
- persistent_led_state = led_usb_state;
+ if (persistent_led_state.raw != led_state.raw) {
+ persistent_led_state = led_state;
oled_write_ln_P(PSTR(" "), false);
- if (IS_LED_ON(led_usb_state, USB_LED_CAPS_LOCK)) {
+ if (led_state.caps_lock) {
oled_set_cursor(0, 1);
oled_write_P(PSTR("CAPS"), false);
}
- if (IS_LED_ON(led_usb_state, USB_LED_NUM_LOCK)) {
+ if (led_state.num_lock) {
oled_set_cursor(5, 1);
oled_write_P(PSTR("NUM"), true);
}
- if (IS_LED_ON(led_usb_state, USB_LED_SCROLL_LOCK)) {
+ if (led_state.scroll_lock) {
oled_set_cursor(9, 1);
oled_write_P(PSTR("SCR"), false);
}
diff --git a/keyboards/nullbitsco/snap/rp2040/keymaps/typehud/rules.mk b/keyboards/nullbitsco/snap/rp2040/keymaps/typehud/rules.mk
index 151e44f4aa..16bd6085c0 100644
--- a/keyboards/nullbitsco/snap/rp2040/keymaps/typehud/rules.mk
+++ b/keyboards/nullbitsco/snap/rp2040/keymaps/typehud/rules.mk
@@ -1,5 +1,4 @@
OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
WPM_ENABLE = yes
VIA_ENABLE = yes
ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/nullbitsco/tidbit/avr/info.json b/keyboards/nullbitsco/tidbit/avr/info.json
index 9a04a8b7df..324d2fb5cf 100644
--- a/keyboards/nullbitsco/tidbit/avr/info.json
+++ b/keyboards/nullbitsco/tidbit/avr/info.json
@@ -7,13 +7,6 @@
{"pin_a": "D3", "pin_b": "D2"}
]
},
- "ws2812": {
- "pin": "B6"
- },
- "matrix_pins": {
- "cols": [null, null, "F4", "F5", "F6", "F7"],
- "rows": ["B1", "E6", "D7", "C6", "D4"]
- },
"diode_direction": "ROW2COL",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
diff --git a/keyboards/nullbitsco/tidbit/rp2040/info.json b/keyboards/nullbitsco/tidbit/rp2040/info.json
index 1aa61e7ec4..d03abe1ee1 100644
--- a/keyboards/nullbitsco/tidbit/rp2040/info.json
+++ b/keyboards/nullbitsco/tidbit/rp2040/info.json
@@ -7,6 +7,7 @@
{"pin_a": "GP0", "pin_b": "GP1"}
]
},
+ "diode_direction": "ROW2COL",
"processor": "RP2040",
"bootloader": "rp2040",
"ws2812": {
--
GitLab