summaryrefslogtreecommitdiff
path: root/keyboards/crkbd
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/crkbd')
-rw-r--r--keyboards/crkbd/keymaps/crkqwes/config.h2
-rw-r--r--keyboards/crkbd/keymaps/hvp/keymap.c4
-rw-r--r--keyboards/crkbd/keymaps/markstos/config.h3
-rw-r--r--keyboards/crkbd/keymaps/oled_sample/keymap.c10
-rw-r--r--keyboards/crkbd/keymaps/rpbaptist/keymap.c6
-rw-r--r--keyboards/crkbd/lib/host_led_state_reader.c8
-rw-r--r--keyboards/crkbd/r2g/config.h7
-rw-r--r--keyboards/crkbd/r2g/info.json4
-rw-r--r--keyboards/crkbd/rev1/config.h10
-rw-r--r--keyboards/crkbd/rev1/info.json4
10 files changed, 22 insertions, 36 deletions
diff --git a/keyboards/crkbd/keymaps/crkqwes/config.h b/keyboards/crkbd/keymaps/crkqwes/config.h
index 5be6a0449b..b2209c7e6d 100644
--- a/keyboards/crkbd/keymaps/crkqwes/config.h
+++ b/keyboards/crkbd/keymaps/crkqwes/config.h
@@ -28,9 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// #define MASTER_RIGHT
// #define EE_HANDS
-// #define SSD1306OLED
#undef USE_I2C
-#undef SSD1306OLED
#define QUICK_TAP_TERM 0
#define TAPPING_TERM 200
diff --git a/keyboards/crkbd/keymaps/hvp/keymap.c b/keyboards/crkbd/keymaps/hvp/keymap.c
index 7e1953e34d..fc57fc1bb0 100644
--- a/keyboards/crkbd/keymaps/hvp/keymap.c
+++ b/keyboards/crkbd/keymaps/hvp/keymap.c
@@ -1,9 +1,5 @@
#include QMK_KEYBOARD_H
#include "hvp.c"
-#ifdef SSD1306OLED
-# include "ssd1306.h"
-# include <string.h>
-#endif
#ifdef RGBLIGHT_ENABLE
//Following line allows macro to read current RGB settings
diff --git a/keyboards/crkbd/keymaps/markstos/config.h b/keyboards/crkbd/keymaps/markstos/config.h
index 24101724de..0a3d7a360c 100644
--- a/keyboards/crkbd/keymaps/markstos/config.h
+++ b/keyboards/crkbd/keymaps/markstos/config.h
@@ -16,9 +16,6 @@ This is the C configuration file for the keymap
#define MASTER_RIGHT
// #define EE_HANDS
-//#define SSD1306OLED
-
-
// By default, when holding a dual-function key shortly after tapping it, the
// tapped key will begin repeating. This is handy for fast typists when typing
// words with double letters, such as "happy". If you turn this setting ON, it
diff --git a/keyboards/crkbd/keymaps/oled_sample/keymap.c b/keyboards/crkbd/keymaps/oled_sample/keymap.c
index 1a48165e3f..84a4f9204f 100644
--- a/keyboards/crkbd/keymaps/oled_sample/keymap.c
+++ b/keyboards/crkbd/keymaps/oled_sample/keymap.c
@@ -147,12 +147,12 @@ void render_layer_state(void) {
oled_write_P(PSTR("Raise"), layer_state_is(_RAISE));
}
-void render_keylock_status(uint8_t led_usb_state) {
+void render_keylock_status(led_t led_state) {
oled_write_P(PSTR("Lock:"), false);
oled_write_P(PSTR(" "), false);
- oled_write_P(PSTR("N"), led_usb_state & (1 << USB_LED_NUM_LOCK));
- oled_write_P(PSTR("C"), led_usb_state & (1 << USB_LED_CAPS_LOCK));
- oled_write_ln_P(PSTR("S"), led_usb_state & (1 << USB_LED_SCROLL_LOCK));
+ oled_write_P(PSTR("N"), led_state.num_lock);
+ oled_write_P(PSTR("C"), led_state.caps_lock);
+ oled_write_ln_P(PSTR("S"), led_state.scroll_lock);
}
void render_mod_status(uint8_t modifiers) {
@@ -183,7 +183,7 @@ void render_bootmagic_status(void) {
void render_status_main(void) {
/* Show Keyboard Layout */
render_default_layer_state();
- render_keylock_status(host_keyboard_leds());
+ render_keylock_status(host_keyboard_led_state());
render_mod_status(get_mods());
render_bootmagic_status();
diff --git a/keyboards/crkbd/keymaps/rpbaptist/keymap.c b/keyboards/crkbd/keymaps/rpbaptist/keymap.c
index aeeae2cbd8..0fc110b12e 100644
--- a/keyboards/crkbd/keymaps/rpbaptist/keymap.c
+++ b/keyboards/crkbd/keymaps/rpbaptist/keymap.c
@@ -266,10 +266,10 @@ void render_status(void) {
oled_write_P(PSTR("\n"), false);
- uint8_t led_usb_state = host_keyboard_leds();
+ led_t led_state = host_keyboard_led_state();
oled_write_P(PSTR("Mode:"), false);
- oled_write_P(IS_LED_ON(led_usb_state, USB_LED_NUM_LOCK) ? PSTR(" NUM ") : PSTR("\n"), false);
- oled_write_P(IS_LED_ON(led_usb_state, USB_LED_CAPS_LOCK) ? PSTR(" CAPS") : PSTR("\n"), false);
+ oled_write_P(led_state.num_lock ? PSTR(" NUM ") : PSTR("\n"), false);
+ oled_write_P(led_state.caps_lock ? PSTR(" CAPS") : PSTR("\n"), false);
# ifdef RGB_MATRIX_ENABLE
oled_write_P(PSTR("\n"), false);
diff --git a/keyboards/crkbd/lib/host_led_state_reader.c b/keyboards/crkbd/lib/host_led_state_reader.c
index a0684e4a27..2593ac5f8b 100644
--- a/keyboards/crkbd/lib/host_led_state_reader.c
+++ b/keyboards/crkbd/lib/host_led_state_reader.c
@@ -5,11 +5,11 @@ char host_led_state_str[24];
const char *read_host_led_state(void)
{
- uint8_t leds = host_keyboard_leds();
+ led_t led_state = host_keyboard_led_state();
snprintf(host_led_state_str, sizeof(host_led_state_str), "NL:%s CL:%s SL:%s",
- (leds & (1 << USB_LED_NUM_LOCK)) ? "on" : "- ",
- (leds & (1 << USB_LED_CAPS_LOCK)) ? "on" : "- ",
- (leds & (1 << USB_LED_SCROLL_LOCK)) ? "on" : "- ");
+ (led_state.num_lock) ? "on" : "- ",
+ (led_state.caps_lock) ? "on" : "- ",
+ (led_state.scroll_lock) ? "on" : "- ");
return host_led_state_str;
}
diff --git a/keyboards/crkbd/r2g/config.h b/keyboards/crkbd/r2g/config.h
index e44626739d..46db11318f 100644
--- a/keyboards/crkbd/r2g/config.h
+++ b/keyboards/crkbd/r2g/config.h
@@ -31,15 +31,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-
-# define RGBLED_NUM 54
-# define RGBLED_SPLIT \
- { 27, 27 }
#endif
#ifdef RGB_MATRIX_ENABLE
-# define RGBLED_NUM 54 // Number of LEDs
-# define RGB_MATRIX_LED_COUNT RGBLED_NUM
+# define RGB_MATRIX_LED_COUNT 54
# define RGB_MATRIX_SPLIT \
{ 27, 27 }
# define SPLIT_TRANSPORT_MIRROR
diff --git a/keyboards/crkbd/r2g/info.json b/keyboards/crkbd/r2g/info.json
index cfd29368e6..3b269a5051 100644
--- a/keyboards/crkbd/r2g/info.json
+++ b/keyboards/crkbd/r2g/info.json
@@ -5,6 +5,10 @@
"split": {
"soft_serial_pin": "D2"
},
+ "rgblight": {
+ "led_count": 54,
+ "split_count": [27, 27]
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/crkbd/rev1/config.h b/keyboards/crkbd/rev1/config.h
index 2378a8637f..60a49100e3 100644
--- a/keyboards/crkbd/rev1/config.h
+++ b/keyboards/crkbd/rev1/config.h
@@ -18,16 +18,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#ifdef RGBLIGHT_ENABLE
-# define RGBLED_NUM 54 // Number of LEDs
-# define RGBLED_SPLIT \
- { 27, 27 }
-# define RGBLIGHT_SPLIT
-#endif
-
#ifdef RGB_MATRIX_ENABLE
-# define RGBLED_NUM 54 // Number of LEDs
-# define RGB_MATRIX_LED_COUNT RGBLED_NUM
+# define RGB_MATRIX_LED_COUNT 54
# define RGB_MATRIX_SPLIT \
{ 27, 27 }
# define SPLIT_TRANSPORT_MIRROR
diff --git a/keyboards/crkbd/rev1/info.json b/keyboards/crkbd/rev1/info.json
index 4f63c95170..48a27d11f3 100644
--- a/keyboards/crkbd/rev1/info.json
+++ b/keyboards/crkbd/rev1/info.json
@@ -5,6 +5,10 @@
"split": {
"soft_serial_pin": "D2"
},
+ "rgblight": {
+ "led_count": 54,
+ "split_count": [27, 27]
+ },
"ws2812": {
"pin": "D3"
},
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-28 02:08:57 +0000