summaryrefslogtreecommitdiff
path: root/keyboards/marksard
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/marksard')
-rw-r--r--keyboards/marksard/leftover30/config.h5
-rw-r--r--keyboards/marksard/leftover30/info.json6
-rw-r--r--keyboards/marksard/rhymestone/rev1/config.h13
-rw-r--r--keyboards/marksard/rhymestone/rev1/info.json12
-rw-r--r--keyboards/marksard/treadstone32/lite/config.h4
-rw-r--r--keyboards/marksard/treadstone32/lite/info.json5
-rw-r--r--keyboards/marksard/treadstone32/rev1/config.h4
-rw-r--r--keyboards/marksard/treadstone32/rev1/info.json5
-rw-r--r--keyboards/marksard/treadstone48/common/oled_helper.c8
-rw-r--r--keyboards/marksard/treadstone48/rev1/config.h4
-rw-r--r--keyboards/marksard/treadstone48/rev1/info.json5
-rw-r--r--keyboards/marksard/treadstone48/rev2/config.h5
-rw-r--r--keyboards/marksard/treadstone48/rev2/info.json6
13 files changed, 40 insertions, 42 deletions
diff --git a/keyboards/marksard/leftover30/config.h b/keyboards/marksard/leftover30/config.h
index 8f87bd4f1a..0b0263f296 100644
--- a/keyboards/marksard/leftover30/config.h
+++ b/keyboards/marksard/leftover30/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
- #define RGBLED_NUM 6
- #define RGBLIGHT_HUE_STEP 8
- #define RGBLIGHT_SAT_STEP 8
- #define RGBLIGHT_VAL_STEP 8
- #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/marksard/leftover30/info.json b/keyboards/marksard/leftover30/info.json
index 44e8b9bca5..cc11b5ba60 100644
--- a/keyboards/marksard/leftover30/info.json
+++ b/keyboards/marksard/leftover30/info.json
@@ -18,6 +18,12 @@
{"pin_a": "F4", "pin_b": "F5"}
]
},
+ "rgblight": {
+ "saturation_steps": 8,
+ "brightness_steps": 8,
+ "led_count": 6,
+ "sleep": true
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/marksard/rhymestone/rev1/config.h b/keyboards/marksard/rhymestone/rev1/config.h
index d3250461b2..76fd9095fc 100644
--- a/keyboards/marksard/rhymestone/rev1/config.h
+++ b/keyboards/marksard/rhymestone/rev1/config.h
@@ -18,12 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#ifdef RGBLIGHT_ENABLE
- #define RGBLED_NUM 40
- #define RGBLED_SPLIT {20, 20}
- #define RGBLIGHT_HUE_STEP 8
- #define RGBLIGHT_SAT_STEP 8
- #define RGBLIGHT_VAL_STEP 8
- #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
// #define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -36,18 +30,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#endif
#ifdef RGB_MATRIX_ENABLE
- #define RGBLED_NUM 40 // Number of LEDs
- #define RGB_MATRIX_LED_COUNT RGBLED_NUM
+ #define RGB_MATRIX_LED_COUNT 40
#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
// #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
// #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
// #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
- #define RGB_MATRIX_HUE_STEP 8
- #define RGB_MATRIX_SAT_STEP 8
- #define RGB_MATRIX_VAL_STEP 8
- #define RGB_MATRIX_SPD_STEP 10
// #undef ENABLE_RGB_MATRIX_ALPHAS_MODS
// #undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
diff --git a/keyboards/marksard/rhymestone/rev1/info.json b/keyboards/marksard/rhymestone/rev1/info.json
index fc4ee548d1..ba13c35b88 100644
--- a/keyboards/marksard/rhymestone/rev1/info.json
+++ b/keyboards/marksard/rhymestone/rev1/info.json
@@ -9,7 +9,10 @@
"device_version": "0.2.0"
},
"rgb_matrix": {
- "driver": "WS2812"
+ "driver": "WS2812",
+ "sat_steps": 8,
+ "val_steps": 8,
+ "speed_steps": 10
},
"matrix_pins": {
"cols": ["D4", "C6", "D7", "E6", "B4"],
@@ -23,7 +26,12 @@
"pin": "D3"
},
"rgblight": {
- "max_brightness": 150
+ "saturation_steps": 8,
+ "brightness_steps": 8,
+ "led_count": 40,
+ "max_brightness": 150,
+ "sleep": true,
+ "split_count": [20, 20]
},
"processor": "atmega32u4",
"bootloader": "caterina",
diff --git a/keyboards/marksard/treadstone32/lite/config.h b/keyboards/marksard/treadstone32/lite/config.h
index 22435108df..a9f15c0db9 100644
--- a/keyboards/marksard/treadstone32/lite/config.h
+++ b/keyboards/marksard/treadstone32/lite/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
- #define RGBLED_NUM 6
#ifndef IOS_DEVICE_ENABLE
#define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
#define RGBLIGHT_VAL_STEP 8
@@ -25,9 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_LIMIT_VAL 50
#define RGBLIGHT_VAL_STEP 4
#endif
- #define RGBLIGHT_HUE_STEP 8
- #define RGBLIGHT_SAT_STEP 8
- #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
// #define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/marksard/treadstone32/lite/info.json b/keyboards/marksard/treadstone32/lite/info.json
index 878b4db2ac..07df01674a 100644
--- a/keyboards/marksard/treadstone32/lite/info.json
+++ b/keyboards/marksard/treadstone32/lite/info.json
@@ -3,6 +3,11 @@
"usb": {
"device_version": "0.1.5"
},
+ "rgblight": {
+ "saturation_steps": 8,
+ "led_count": 6,
+ "sleep": true
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/marksard/treadstone32/rev1/config.h b/keyboards/marksard/treadstone32/rev1/config.h
index 1f3a9ec168..0a6c395aa5 100644
--- a/keyboards/marksard/treadstone32/rev1/config.h
+++ b/keyboards/marksard/treadstone32/rev1/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
- #define RGBLED_NUM 6
#ifndef IOS_DEVICE_ENABLE
#define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
#define RGBLIGHT_VAL_STEP 8
@@ -25,9 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_LIMIT_VAL 50
#define RGBLIGHT_VAL_STEP 4
#endif
- #define RGBLIGHT_HUE_STEP 8
- #define RGBLIGHT_SAT_STEP 8
- #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
// #define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/marksard/treadstone32/rev1/info.json b/keyboards/marksard/treadstone32/rev1/info.json
index 00538f7e8a..17f9580af4 100644
--- a/keyboards/marksard/treadstone32/rev1/info.json
+++ b/keyboards/marksard/treadstone32/rev1/info.json
@@ -3,6 +3,11 @@
"usb": {
"device_version": "0.1.0"
},
+ "rgblight": {
+ "saturation_steps": 8,
+ "led_count": 6,
+ "sleep": true
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/marksard/treadstone48/common/oled_helper.c b/keyboards/marksard/treadstone48/common/oled_helper.c
index c3c8f23cbc..e9a8cf564a 100644
--- a/keyboards/marksard/treadstone48/common/oled_helper.c
+++ b/keyboards/marksard/treadstone48/common/oled_helper.c
@@ -43,10 +43,10 @@ void render_key_status(void) {
static char lock_buf[24] = "Lock state ready.\n";
void update_lock_status(void) {
- uint8_t leds = host_keyboard_leds();
- char *num_lock = (leds & (1<<USB_LED_NUM_LOCK)) ? "Num" : "";
- char *caps_lock = (leds & (1<<USB_LED_CAPS_LOCK)) ? "Caps" : "";
- char *scrl_lock = (leds & (1<<USB_LED_SCROLL_LOCK)) ? "Scrn" : "";
+ led_t led_state = host_keyboard_led_state();
+ char *num_lock = led_state.num_lock ? "Num" : "";
+ char *caps_lock = led_state.caps_lock ? "Caps" : "";
+ char *scrl_lock = led_state.scroll_lock ? "Scrn" : "";
snprintf(lock_buf, sizeof(lock_buf) - 1, "Lock:%s %s %s\n",
num_lock, caps_lock, scrl_lock);
}
diff --git a/keyboards/marksard/treadstone48/rev1/config.h b/keyboards/marksard/treadstone48/rev1/config.h
index 63ec196632..be5e67cad6 100644
--- a/keyboards/marksard/treadstone48/rev1/config.h
+++ b/keyboards/marksard/treadstone48/rev1/config.h
@@ -24,10 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLED_NUM 32
#define RGBLED_SPLIT {12, 20}
#endif
- #define RGBLIGHT_HUE_STEP 8
- #define RGBLIGHT_SAT_STEP 8
- #define RGBLIGHT_VAL_STEP 8
- #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
// #define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/marksard/treadstone48/rev1/info.json b/keyboards/marksard/treadstone48/rev1/info.json
index f4dfc35ec1..ed9e4f8414 100644
--- a/keyboards/marksard/treadstone48/rev1/info.json
+++ b/keyboards/marksard/treadstone48/rev1/info.json
@@ -20,7 +20,10 @@
"pin": "D3"
},
"rgblight": {
- "max_brightness": 180
+ "saturation_steps": 8,
+ "brightness_steps": 8,
+ "max_brightness": 180,
+ "sleep": true
},
"processor": "atmega32u4",
"bootloader": "caterina",
diff --git a/keyboards/marksard/treadstone48/rev2/config.h b/keyboards/marksard/treadstone48/rev2/config.h
index 4335ea0670..7dba6c39c1 100644
--- a/keyboards/marksard/treadstone48/rev2/config.h
+++ b/keyboards/marksard/treadstone48/rev2/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
- #define RGBLED_NUM 12
- #define RGBLIGHT_HUE_STEP 8
- #define RGBLIGHT_SAT_STEP 8
- #define RGBLIGHT_VAL_STEP 8
- #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
// #define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/marksard/treadstone48/rev2/info.json b/keyboards/marksard/treadstone48/rev2/info.json
index 6e39235dc1..e4e4a3920f 100644
--- a/keyboards/marksard/treadstone48/rev2/info.json
+++ b/keyboards/marksard/treadstone48/rev2/info.json
@@ -12,7 +12,11 @@
"pin": "D3"
},
"rgblight": {
- "max_brightness": 220
+ "saturation_steps": 8,
+ "brightness_steps": 8,
+ "led_count": 12,
+ "max_brightness": 220,
+ "sleep": true
},
"matrix_pins": {
"cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 02:38:57 +0000