summaryrefslogtreecommitdiff
path: root/keyboards/novelkeys
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/novelkeys')
-rw-r--r--keyboards/novelkeys/nk1/config.h5
-rwxr-xr-xkeyboards/novelkeys/nk1/info.json6
-rw-r--r--keyboards/novelkeys/nk20/config.h1
-rw-r--r--keyboards/novelkeys/nk20/info.json2
-rw-r--r--keyboards/novelkeys/nk20/rules.mk5
-rwxr-xr-xkeyboards/novelkeys/nk65/nk65.c6
-rwxr-xr-xkeyboards/novelkeys/nk65b/config.h1
-rwxr-xr-xkeyboards/novelkeys/nk65b/info.json2
-rw-r--r--[-rwxr-xr-x]keyboards/novelkeys/nk65b/rules.mk5
-rwxr-xr-xkeyboards/novelkeys/nk87/nk87.c4
-rw-r--r--keyboards/novelkeys/nk87b/config.h1
-rwxr-xr-xkeyboards/novelkeys/nk87b/info.json2
-rw-r--r--keyboards/novelkeys/nk87b/rules.mk5
-rwxr-xr-xkeyboards/novelkeys/nk_plus/info.json2
-rw-r--r--keyboards/novelkeys/nk_plus/rules.mk5
-rwxr-xr-xkeyboards/novelkeys/novelpad/config.h5
-rw-r--r--keyboards/novelkeys/novelpad/info.json3
-rwxr-xr-xkeyboards/novelkeys/novelpad/keymaps/0xdec/keymap.c5
18 files changed, 21 insertions, 44 deletions
diff --git a/keyboards/novelkeys/nk1/config.h b/keyboards/novelkeys/nk1/config.h
index c4cc79e624..a92c3b7211 100644
--- a/keyboards/novelkeys/nk1/config.h
+++ b/keyboards/novelkeys/nk1/config.h
@@ -17,11 +17,6 @@
#pragma once
- #define RGBLED_NUM 9
- #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/novelkeys/nk1/info.json b/keyboards/novelkeys/nk1/info.json
index b72492a6aa..f9c8e690cb 100755
--- a/keyboards/novelkeys/nk1/info.json
+++ b/keyboards/novelkeys/nk1/info.json
@@ -8,6 +8,12 @@
"pid": "0x4E4D",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "saturation_steps": 8,
+ "brightness_steps": 8,
+ "led_count": 9,
+ "sleep": true
+ },
"ws2812": {
"pin": "F0"
},
diff --git a/keyboards/novelkeys/nk20/config.h b/keyboards/novelkeys/nk20/config.h
index 23b8d2915a..55d8b53e83 100644
--- a/keyboards/novelkeys/nk20/config.h
+++ b/keyboards/novelkeys/nk20/config.h
@@ -25,7 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define WS2812_DMA_STREAM STM32_DMA1_STREAM3
#define WS2812_DMA_CHANNEL 3
-#define RGBLED_NUM 20
#define RGB_MATRIX_LED_COUNT 20
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 210
#define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/novelkeys/nk20/info.json b/keyboards/novelkeys/nk20/info.json
index 2befadb5d0..3ad31f8a33 100644
--- a/keyboards/novelkeys/nk20/info.json
+++ b/keyboards/novelkeys/nk20/info.json
@@ -13,7 +13,7 @@
"driver": "pwm"
},
"rgb_matrix": {
- "driver": "WS2812"
+ "driver": "ws2812"
},
"matrix_pins": {
"cols": ["B13", "B14", "B15", "A4"],
diff --git a/keyboards/novelkeys/nk20/rules.mk b/keyboards/novelkeys/nk20/rules.mk
index 131bc94a44..9470fce1ba 100644
--- a/keyboards/novelkeys/nk20/rules.mk
+++ b/keyboards/novelkeys/nk20/rules.mk
@@ -1,11 +1,6 @@
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-# Do not put the microcontroller into power saving mode
-# when we get USB suspend event. We want it to keep updating
-# backlight effects.
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/novelkeys/nk65/nk65.c b/keyboards/novelkeys/nk65/nk65.c
index 0e6fe08b5c..2c325e453a 100755
--- a/keyboards/novelkeys/nk65/nk65.c
+++ b/keyboards/novelkeys/nk65/nk65.c
@@ -27,9 +27,9 @@
*/
void led_update_ports(led_t led_state) {
if (led_state.caps_lock) {
- IS31FL3733_set_color( 7+64-1, 0, 255, 0 );
+ is31fl3733_set_color( 7+64-1, 0, 255, 0 );
} else {
- IS31FL3733_set_color( 7+64-1, 0, 0, 0 );
+ is31fl3733_set_color( 7+64-1, 0, 0, 0 );
}
}
@@ -45,6 +45,6 @@ __attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) {
G = 255;
}
- IS31FL3733_set_color( 6+64-1, R, G, B );
+ is31fl3733_set_color( 6+64-1, R, G, B );
return state;
}
diff --git a/keyboards/novelkeys/nk65b/config.h b/keyboards/novelkeys/nk65b/config.h
index a22f9b1685..e236351344 100755
--- a/keyboards/novelkeys/nk65b/config.h
+++ b/keyboards/novelkeys/nk65b/config.h
@@ -25,7 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define WS2812_DMA_STREAM STM32_DMA1_STREAM3
#define WS2812_DMA_CHANNEL 3
-#define RGBLED_NUM 68
#define RGB_MATRIX_LED_COUNT 68
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 130
#define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/novelkeys/nk65b/info.json b/keyboards/novelkeys/nk65b/info.json
index 93700e6851..eb6565aea6 100755
--- a/keyboards/novelkeys/nk65b/info.json
+++ b/keyboards/novelkeys/nk65b/info.json
@@ -13,7 +13,7 @@
"driver": "pwm"
},
"rgb_matrix": {
- "driver": "WS2812"
+ "driver": "ws2812"
},
"matrix_pins": {
"cols": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B12", "B13", "B14", "B15", "A8", "A9"],
diff --git a/keyboards/novelkeys/nk65b/rules.mk b/keyboards/novelkeys/nk65b/rules.mk
index 131bc94a44..9470fce1ba 100755..100644
--- a/keyboards/novelkeys/nk65b/rules.mk
+++ b/keyboards/novelkeys/nk65b/rules.mk
@@ -1,11 +1,6 @@
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-# Do not put the microcontroller into power saving mode
-# when we get USB suspend event. We want it to keep updating
-# backlight effects.
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/novelkeys/nk87/nk87.c b/keyboards/novelkeys/nk87/nk87.c
index c90ba02ea4..c75fff450b 100755
--- a/keyboards/novelkeys/nk87/nk87.c
+++ b/keyboards/novelkeys/nk87/nk87.c
@@ -38,8 +38,8 @@ bool led_update_kb(led_t led_state) {
CAPS = 0;
}
}
- IS31FL3733_set_color( 63+64-1, FN1, FN1, CAPS );
- IS31FL3733_set_color( 48+64-1, 0, 0, FN2 );
+ is31fl3733_set_color( 63+64-1, FN1, FN1, CAPS );
+ is31fl3733_set_color( 48+64-1, 0, 0, FN2 );
return res;
}
diff --git a/keyboards/novelkeys/nk87b/config.h b/keyboards/novelkeys/nk87b/config.h
index 49d3104c45..a0bbb315d4 100644
--- a/keyboards/novelkeys/nk87b/config.h
+++ b/keyboards/novelkeys/nk87b/config.h
@@ -25,7 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define WS2812_DMA_STREAM STM32_DMA1_STREAM3
#define WS2812_DMA_CHANNEL 3
-#define RGBLED_NUM 87
#define RGB_MATRIX_LED_COUNT 87
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 114
#define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/novelkeys/nk87b/info.json b/keyboards/novelkeys/nk87b/info.json
index 965c2f8b04..269db89ed3 100755
--- a/keyboards/novelkeys/nk87b/info.json
+++ b/keyboards/novelkeys/nk87b/info.json
@@ -13,7 +13,7 @@
"driver": "pwm"
},
"rgb_matrix": {
- "driver": "WS2812"
+ "driver": "ws2812"
},
"matrix_pins": {
"cols": ["B12", "B13", "B14", "B15", "A8", "A10", "A14", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "A0", "A1"],
diff --git a/keyboards/novelkeys/nk87b/rules.mk b/keyboards/novelkeys/nk87b/rules.mk
index 131bc94a44..9470fce1ba 100644
--- a/keyboards/novelkeys/nk87b/rules.mk
+++ b/keyboards/novelkeys/nk87b/rules.mk
@@ -1,11 +1,6 @@
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-# Do not put the microcontroller into power saving mode
-# when we get USB suspend event. We want it to keep updating
-# backlight effects.
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/novelkeys/nk_plus/info.json b/keyboards/novelkeys/nk_plus/info.json
index 4fdbf80f5c..f6fad60b01 100755
--- a/keyboards/novelkeys/nk_plus/info.json
+++ b/keyboards/novelkeys/nk_plus/info.json
@@ -27,7 +27,7 @@
"processor": "STM32F072",
"bootloader": "stm32-dfu",
"rgb_matrix": {
- "driver": "WS2812",
+ "driver": "ws2812",
"layout": [
{"flags": 1, "matrix": [0, 0], "x": 0, "y": 0},
{"flags": 1, "matrix": [0, 1], "x": 13, "y": 0},
diff --git a/keyboards/novelkeys/nk_plus/rules.mk b/keyboards/novelkeys/nk_plus/rules.mk
index a68122281a..928a45cfae 100644
--- a/keyboards/novelkeys/nk_plus/rules.mk
+++ b/keyboards/novelkeys/nk_plus/rules.mk
@@ -1,11 +1,6 @@
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-# Do not put the microcontroller into power saving mode
-# when we get USB suspend event. We want it to keep updating
-# backlight effects.
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/novelkeys/novelpad/config.h b/keyboards/novelkeys/novelpad/config.h
index 413efb67b0..95db869fcd 100755
--- a/keyboards/novelkeys/novelpad/config.h
+++ b/keyboards/novelkeys/novelpad/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
- #define RGBLED_NUM 4
-// #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/novelkeys/novelpad/info.json b/keyboards/novelkeys/novelpad/info.json
index e98746ab29..a7dad32996 100644
--- a/keyboards/novelkeys/novelpad/info.json
+++ b/keyboards/novelkeys/novelpad/info.json
@@ -17,6 +17,9 @@
"pin": "B7",
"levels": 10
},
+ "rgblight": {
+ "led_count": 4
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/novelkeys/novelpad/keymaps/0xdec/keymap.c b/keyboards/novelkeys/novelpad/keymaps/0xdec/keymap.c
index 5380de9648..79a3e2fdbf 100755
--- a/keyboards/novelkeys/novelpad/keymaps/0xdec/keymap.c
+++ b/keyboards/novelkeys/novelpad/keymaps/0xdec/keymap.c
@@ -36,11 +36,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
-void led_set_user(uint8_t usb_led) {
- if (usb_led & (1 << USB_LED_NUM_LOCK)) {
+bool led_update_user(led_t led_state) {
+ if (led_state.num_lock) {
// Illuminate the LED under the Num Lock key
rgblight_sethsv_at(0, 0, 127, 1);
} else {
rgblight_sethsv_at(0, 0, 0, 1);
}
+ return false;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-04 12:50:04 +0000