summaryrefslogtreecommitdiff
path: root/keyboards/rgbkb/sol
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/rgbkb/sol')
-rw-r--r--keyboards/rgbkb/sol/config.h3
-rw-r--r--keyboards/rgbkb/sol/keymaps/brianweyer/keymap.c8
-rw-r--r--keyboards/rgbkb/sol/keymaps/danielhklein/keymap.c8
-rw-r--r--keyboards/rgbkb/sol/keymaps/default/keymap.c8
-rw-r--r--keyboards/rgbkb/sol/keymaps/xyverz/config.h26
-rw-r--r--keyboards/rgbkb/sol/keymaps/xyverz/keymap.c8
-rw-r--r--keyboards/rgbkb/sol/keymaps/xyverz/rules.mk1
-rw-r--r--keyboards/rgbkb/sol/rev1/info.json5
-rw-r--r--keyboards/rgbkb/sol/rev2/info.json5
9 files changed, 24 insertions, 48 deletions
diff --git a/keyboards/rgbkb/sol/config.h b/keyboards/rgbkb/sol/config.h
index 5c327fd760..a0a2202afa 100644
--- a/keyboards/rgbkb/sol/config.h
+++ b/keyboards/rgbkb/sol/config.h
@@ -18,9 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-#define TAPPING_TERM 150
-
#define EE_HANDS
#ifdef IOS_DEVICE_ENABLE
diff --git a/keyboards/rgbkb/sol/keymaps/brianweyer/keymap.c b/keyboards/rgbkb/sol/keymaps/brianweyer/keymap.c
index c476f4c2df..194ec4de2f 100644
--- a/keyboards/rgbkb/sol/keymaps/brianweyer/keymap.c
+++ b/keyboards/rgbkb/sol/keymaps/brianweyer/keymap.c
@@ -254,10 +254,10 @@ static void render_status(void) {
}
// Host Keyboard LED Status
- uint8_t led_usb_state = host_keyboard_leds();
- oled_write_P(led_usb_state & (1<<USB_LED_NUM_LOCK) ? PSTR("NUMLOCK ") : PSTR(" "), false);
- oled_write_P(led_usb_state & (1<<USB_LED_CAPS_LOCK) ? PSTR("CAPS ") : PSTR(" "), false);
- oled_write_P(led_usb_state & (1<<USB_LED_SCROLL_LOCK) ? PSTR("SCLK ") : PSTR(" "), false);
+ led_t led_state = host_keyboard_led_state();
+ oled_write_P(led_state.num_lock ? PSTR("NUMLOCK ") : PSTR(" "), false);
+ oled_write_P(led_state.caps_lock ? PSTR("CAPS ") : PSTR(" "), false);
+ oled_write_P(led_state.scroll_lock ? PSTR("SCLK ") : PSTR(" "), false);
}
bool oled_task_user(void) {
diff --git a/keyboards/rgbkb/sol/keymaps/danielhklein/keymap.c b/keyboards/rgbkb/sol/keymaps/danielhklein/keymap.c
index 6f222dcd71..24583f0d17 100644
--- a/keyboards/rgbkb/sol/keymaps/danielhklein/keymap.c
+++ b/keyboards/rgbkb/sol/keymaps/danielhklein/keymap.c
@@ -318,10 +318,10 @@ static void render_status(void) {
}
// Host Keyboard LED Status
- uint8_t led_usb_state = host_keyboard_leds();
- oled_write_P(led_usb_state & (1<<USB_LED_NUM_LOCK) ? PSTR("NUMLOCK ") : PSTR(" "), false);
- oled_write_P(led_usb_state & (1<<USB_LED_CAPS_LOCK) ? PSTR("CAPS ") : PSTR(" "), false);
- oled_write_P(led_usb_state & (1<<USB_LED_SCROLL_LOCK) ? PSTR("SCLK ") : PSTR(" "), false);
+ led_t led_state = host_keyboard_led_state();
+ oled_write_P(led_state.num_lock ? PSTR("NUMLOCK ") : PSTR(" "), false);
+ oled_write_P(led_state.caps_lock ? PSTR("CAPS ") : PSTR(" "), false);
+ oled_write_P(led_state.scroll_lock ? PSTR("SCLK ") : PSTR(" "), false);
}
bool oled_task_user(void) {
diff --git a/keyboards/rgbkb/sol/keymaps/default/keymap.c b/keyboards/rgbkb/sol/keymaps/default/keymap.c
index 60e4873275..4a6511cbfc 100644
--- a/keyboards/rgbkb/sol/keymaps/default/keymap.c
+++ b/keyboards/rgbkb/sol/keymaps/default/keymap.c
@@ -344,11 +344,11 @@ static void render_status(void) {
}
// Host Keyboard LED Status
- uint8_t led_state = host_keyboard_leds();
+ led_t led_state = host_keyboard_led_state();
oled_write_P(PSTR("-----"), false);
- oled_write_P(IS_LED_ON(led_state, USB_LED_NUM_LOCK) ? PSTR("NUMLK") : PSTR(" "), false);
- oled_write_P(IS_LED_ON(led_state, USB_LED_CAPS_LOCK) ? PSTR("CAPLK") : PSTR(" "), false);
- oled_write_P(IS_LED_ON(led_state, USB_LED_SCROLL_LOCK) ? PSTR("SCRLK") : PSTR(" "), false);
+ oled_write_P(led_state.num_lock ? PSTR("NUMLK") : PSTR(" "), false);
+ oled_write_P(led_state.caps_lock ? PSTR("CAPLK") : PSTR(" "), false);
+ oled_write_P(led_state.scroll_lock ? PSTR("SCRLK") : PSTR(" "), false);
#ifdef RGB_OLED_MENU
static char buffer[31] = { 0 };
diff --git a/keyboards/rgbkb/sol/keymaps/xyverz/config.h b/keyboards/rgbkb/sol/keymaps/xyverz/config.h
deleted file mode 100644
index 334eee608c..0000000000
--- a/keyboards/rgbkb/sol/keymaps/xyverz/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-// place overrides here
-
-/* #define SSD1306OLED */
diff --git a/keyboards/rgbkb/sol/keymaps/xyverz/keymap.c b/keyboards/rgbkb/sol/keymaps/xyverz/keymap.c
index a5b62eb1da..0ef9def55d 100644
--- a/keyboards/rgbkb/sol/keymaps/xyverz/keymap.c
+++ b/keyboards/rgbkb/sol/keymaps/xyverz/keymap.c
@@ -334,11 +334,11 @@ static void render_status(void) {
}
// Host Keyboard LED Status
- uint8_t led_state = host_keyboard_leds();
+ led_t led_state = host_keyboard_led_state();
oled_write_P(PSTR("-----"), false);
- oled_write_P(IS_LED_ON(led_state, USB_LED_NUM_LOCK) ? PSTR("NUMLK") : PSTR(" "), false);
- oled_write_P(IS_LED_ON(led_state, USB_LED_CAPS_LOCK) ? PSTR("CAPLK") : PSTR(" "), false);
- oled_write_P(IS_LED_ON(led_state, USB_LED_SCROLL_LOCK) ? PSTR("SCRLK") : PSTR(" "), false);
+ oled_write_P(led_state.num_lock ? PSTR("NUMLK") : PSTR(" "), false);
+ oled_write_P(led_state.caps_lock ? PSTR("CAPLK") : PSTR(" "), false);
+ oled_write_P(led_state.scroll_lock ? PSTR("SCRLK") : PSTR(" "), false);
#ifdef RGB_OLED_MENU
static char buffer[31] = { 0 };
diff --git a/keyboards/rgbkb/sol/keymaps/xyverz/rules.mk b/keyboards/rgbkb/sol/keymaps/xyverz/rules.mk
index 073cb668f0..36416c8dbe 100644
--- a/keyboards/rgbkb/sol/keymaps/xyverz/rules.mk
+++ b/keyboards/rgbkb/sol/keymaps/xyverz/rules.mk
@@ -24,7 +24,6 @@ IOS_DEVICE_ENABLE = no # Limit max brightness to connect to IOS device (iPa
DEFAULT_FOLDER = rgbkb/sol/rev1
ENCODER_ENABLE = no
OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
# Do not edit past here
diff --git a/keyboards/rgbkb/sol/rev1/info.json b/keyboards/rgbkb/sol/rev1/info.json
index b0b8fc12d0..e044c42cfe 100644
--- a/keyboards/rgbkb/sol/rev1/info.json
+++ b/keyboards/rgbkb/sol/rev1/info.json
@@ -9,7 +9,7 @@
"device_version": "0.0.1"
},
"rgb_matrix": {
- "driver": "WS2812"
+ "driver": "ws2812"
},
"matrix_pins": {
"cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7"],
@@ -24,6 +24,9 @@
"split": {
"soft_serial_pin": "D3"
},
+ "tapping": {
+ "term": 150
+ },
"ws2812": {
"pin": "B3"
},
diff --git a/keyboards/rgbkb/sol/rev2/info.json b/keyboards/rgbkb/sol/rev2/info.json
index 1eec8a3930..c852051504 100644
--- a/keyboards/rgbkb/sol/rev2/info.json
+++ b/keyboards/rgbkb/sol/rev2/info.json
@@ -9,7 +9,7 @@
"device_version": "0.0.2"
},
"rgb_matrix": {
- "driver": "WS2812"
+ "driver": "ws2812"
},
"matrix_pins": {
"cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7"],
@@ -19,6 +19,9 @@
"split": {
"soft_serial_pin": "D3"
},
+ "tapping": {
+ "term": 150
+ },
"ws2812": {
"pin": "B7"
},
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 07:50:29 +0000