summaryrefslogtreecommitdiff
path: root/keyboards/skyloong
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/skyloong')
-rw-r--r--keyboards/skyloong/dt40/config.h8
-rw-r--r--keyboards/skyloong/dt40/info.json6
-rw-r--r--keyboards/skyloong/gk61/pro/config.h11
-rw-r--r--keyboards/skyloong/gk61/pro/pro.c2
-rw-r--r--keyboards/skyloong/gk61/pro_48/config.h7
-rw-r--r--keyboards/skyloong/gk61/pro_48/info.json3
-rw-r--r--keyboards/skyloong/gk61/pro_48/pro_48.c2
-rw-r--r--keyboards/skyloong/gk61/v1/config.h5
-rw-r--r--keyboards/skyloong/gk61/v1/info.json3
-rw-r--r--keyboards/skyloong/gk61/v1/v1.c2
-rw-r--r--keyboards/skyloong/qk21/v1/config.h5
-rw-r--r--keyboards/skyloong/qk21/v1/info.json3
12 files changed, 18 insertions, 39 deletions
diff --git a/keyboards/skyloong/dt40/config.h b/keyboards/skyloong/dt40/config.h
index e67b7ae0a9..b0aa978063 100644
--- a/keyboards/skyloong/dt40/config.h
+++ b/keyboards/skyloong/dt40/config.h
@@ -15,13 +15,7 @@
*/
#pragma once
-#define RGB_MATRIX_LED_COUNT 44 //The number of LEDs connected
-#define RGB_MATRIX_KEYPRESSES //Reacts to keypress
-#define RGB_DISABLE_WHEN_USB_SUSPENDED //turn off effects when suspended
-
-#define RGB_MATRIX_DEFAULT_VAL 150 //Sets the default mode, if none has been set
#define RGB_TRIGGER_ON_KEYDOWN //Triggers RGB keypress events on key down
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS // enable framebuffer effects
#define RGB_MATRIX_TYPING_HEATMAP_DECREASE_DELAY_MS 1
//Set WS2812 driver
@@ -32,5 +26,3 @@
#define WS2812_PWM_PAL_MODE 2
#define WS2812_DMA_STREAM STM32_DMA1_STREAM3
#define WS2812_DMA_CHANNEL 3
-
-
diff --git a/keyboards/skyloong/dt40/info.json b/keyboards/skyloong/dt40/info.json
index b6172465e6..a79b48289a 100644
--- a/keyboards/skyloong/dt40/info.json
+++ b/keyboards/skyloong/dt40/info.json
@@ -48,6 +48,9 @@
"raindrops": true,
"ranbow_beacon": true
},
+ "default": {
+ "val": 150
+ },
"driver": "ws2812",
"hue_steps": 20,
"layout": [
@@ -99,7 +102,8 @@
"max_brightness": 180,
"sat_steps": 20,
"speed_steps": 20,
- "val_steps": 20
+ "val_steps": 20,
+ "sleep": true
},
"url": "https://github.com/JZ-Skyloong",
"usb": {
diff --git a/keyboards/skyloong/gk61/pro/config.h b/keyboards/skyloong/gk61/pro/config.h
index 8e9b5f9258..5e6d6d0e6a 100644
--- a/keyboards/skyloong/gk61/pro/config.h
+++ b/keyboards/skyloong/gk61/pro/config.h
@@ -3,17 +3,10 @@
#pragma once
-#define RGB_MATRIX_LED_COUNT 64
+#define IS31FL3743A_I2C_ADDRESS_1 IS31FL3743A_I2C_ADDRESS_GND_GND
+
#define CAPS_LOCK_INDEX 28
#define WIN_MOD_INDEX 16
#define MAC_MOD_INDEX 17
#define WIN_LOCK_INDEX 54
#define SDB C1 //RGB matrix Power control PIN
-
-/* RGB Matrix Animation modes. Explicitly enabled
- * For full list of effects, see:
- * https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
- */
-
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/skyloong/gk61/pro/pro.c b/keyboards/skyloong/gk61/pro/pro.c
index 1936964b32..6240d9cead 100644
--- a/keyboards/skyloong/gk61/pro/pro.c
+++ b/keyboards/skyloong/gk61/pro/pro.c
@@ -6,7 +6,7 @@ int FN_MAC = 0;
int L_WIN = 0;
int L_MAC = 0;
-const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3743a_led_t PROGMEM g_is31fl3743a_leds[IS31FL3743A_LED_COUNT] = {
/* Refer to IS31 manual for these locations
* driver
* | R location
diff --git a/keyboards/skyloong/gk61/pro_48/config.h b/keyboards/skyloong/gk61/pro_48/config.h
index df94455a9e..18f3ef3e72 100644
--- a/keyboards/skyloong/gk61/pro_48/config.h
+++ b/keyboards/skyloong/gk61/pro_48/config.h
@@ -3,14 +3,11 @@
#pragma once
-#define RGB_MATRIX_LED_COUNT 64
+#define IS31FL3743A_I2C_ADDRESS_1 IS31FL3743A_I2C_ADDRESS_GND_GND
+
#define CAPS_LOCK_INDEX 28
#define WIN_MOD_INDEX 16
#define MAC_MOD_INDEX 17
#define SDB A4
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-
#define g_suspend_state rgb_matrix_get_suspend_state()
diff --git a/keyboards/skyloong/gk61/pro_48/info.json b/keyboards/skyloong/gk61/pro_48/info.json
index 0e49e005aa..10a663f3c7 100644
--- a/keyboards/skyloong/gk61/pro_48/info.json
+++ b/keyboards/skyloong/gk61/pro_48/info.json
@@ -123,7 +123,8 @@
"hue_steps": 20,
"sat_steps": 20,
"speed_steps": 20,
- "val_steps": 20
+ "val_steps": 20,
+ "sleep": true
},
"url": "https://github.com/JZ-Skyloong",
"usb": {
diff --git a/keyboards/skyloong/gk61/pro_48/pro_48.c b/keyboards/skyloong/gk61/pro_48/pro_48.c
index e4f64c022f..dc1058a08b 100644
--- a/keyboards/skyloong/gk61/pro_48/pro_48.c
+++ b/keyboards/skyloong/gk61/pro_48/pro_48.c
@@ -7,7 +7,7 @@ _Bool L_WIN = 0;
_Bool L_MAC = 0;
#if defined(RGB_MATRIX_ENABLE) /*&& defined(CAPS_LOCK_INDEX)*/
-const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3743a_led_t PROGMEM g_is31fl3743a_leds[IS31FL3743A_LED_COUNT] = {
/* Refer to IS31 manual for these locations
* driver
* | R location
diff --git a/keyboards/skyloong/gk61/v1/config.h b/keyboards/skyloong/gk61/v1/config.h
index bd9cab743f..146a19e6fd 100644
--- a/keyboards/skyloong/gk61/v1/config.h
+++ b/keyboards/skyloong/gk61/v1/config.h
@@ -17,9 +17,4 @@
#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
-#define RGB_MATRIX_LED_COUNT 64
-
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS //Enable frame effects
-#define RGB_MATRIX_KEYPRESSES //Reacts to keypress
-#define RGB_DISABLE_WHEN_USB_SUSPENDED //turn off effects when suspended
#define SDB C1
diff --git a/keyboards/skyloong/gk61/v1/info.json b/keyboards/skyloong/gk61/v1/info.json
index 6015efa12c..d5320fa765 100644
--- a/keyboards/skyloong/gk61/v1/info.json
+++ b/keyboards/skyloong/gk61/v1/info.json
@@ -113,7 +113,8 @@
"max_brightness": 200,
"sat_steps": 20,
"speed_steps": 20,
- "val_steps": 20
+ "val_steps": 20,
+ "sleep": true
},
"url": "https://github.com/JZ-Skyloong",
"usb": {
diff --git a/keyboards/skyloong/gk61/v1/v1.c b/keyboards/skyloong/gk61/v1/v1.c
index cb3772f6b4..1ee3522b50 100644
--- a/keyboards/skyloong/gk61/v1/v1.c
+++ b/keyboards/skyloong/gk61/v1/v1.c
@@ -17,7 +17,7 @@
#ifdef RGB_MATRIX_ENABLE
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
/* Refer to SNLED27351 manual for these locations
* driver
* | R location
diff --git a/keyboards/skyloong/qk21/v1/config.h b/keyboards/skyloong/qk21/v1/config.h
index c74d5cce78..4410f06c6a 100644
--- a/keyboards/skyloong/qk21/v1/config.h
+++ b/keyboards/skyloong/qk21/v1/config.h
@@ -5,8 +5,3 @@
/* Enable num-lock LED */
#define NUM_LOCK_INDEX 13
-
-#define RGB_MATRIX_LED_COUNT 21
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS //Enable frame effects
-#define RGB_MATRIX_KEYPRESSES //Reacts to keypress
-#define RGB_DISABLE_WHEN_USB_SUSPENDED //turn off effects when suspended
diff --git a/keyboards/skyloong/qk21/v1/info.json b/keyboards/skyloong/qk21/v1/info.json
index d5aa5e8be9..3f22fc0ccb 100644
--- a/keyboards/skyloong/qk21/v1/info.json
+++ b/keyboards/skyloong/qk21/v1/info.json
@@ -89,7 +89,8 @@
"max_brightness": 200,
"sat_steps": 20,
"speed_steps": 20,
- "val_steps": 20
+ "val_steps": 20,
+ "sleep": true
},
"url": "https://github.com/JZ-Skyloong",
"usb": {