diff options
Diffstat (limited to 'keyboards/kingly_keys')
18 files changed, 100 insertions, 123 deletions
diff --git a/keyboards/kingly_keys/ave/ortho/info.json b/keyboards/kingly_keys/ave/ortho/keyboard.json index c17f41dcb4..8c91b27615 100644 --- a/keyboards/kingly_keys/ave/ortho/info.json +++ b/keyboards/kingly_keys/ave/ortho/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x1225", "device_version": "0.1.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], "rows": ["B3", "F4", "F7", "F6", "F5"] diff --git a/keyboards/kingly_keys/ave/ortho/keymaps/default/keymap.c b/keyboards/kingly_keys/ave/ortho/keymaps/default/keymap.c index 7c0dc92812..db0dfe46f6 100644 --- a/keyboards/kingly_keys/ave/ortho/keymaps/default/keymap.c +++ b/keyboards/kingly_keys/ave/ortho/keymaps/default/keymap.c @@ -217,23 +217,23 @@ void keyboard_post_init_user(void) { rgblight_sethsv_noeeprom(50, 255, 100); rgblight_mode_noeeprom(RGBLIGHT_EFFECT_BREATHING + 2); // Init the second LED to a static color: - setrgb(225, 185, 0, (rgb_led_t *)&led[1]); - rgblight_set(); + rgblight_setrgb_at(225, 185, 0, 1); #endif // RGBLIGHT_ENABLE } // RGB Indicator Customization: (cont.) layer_state_t layer_state_set_user(layer_state_t state){ #ifdef RGBLIGHT_ENABLE - uint8_t led1r = 0; uint8_t led1g = 0; uint8_t led1b = 0; - if (layer_state_cmp(state, 1)) { - led1b = 255; - } - if (layer_state_cmp(state, 3)) { - led1r = 200; - } - setrgb(led1r, led1g, led1b, (rgb_led_t *)&led[1]); - rgblight_set(); + uint8_t led1r = 0; + uint8_t led1g = 0; + uint8_t led1b = 0; + if (layer_state_cmp(state, 1)) { + led1b = 255; + } + if (layer_state_cmp(state, 3)) { + led1r = 200; + } + rgblight_setrgb_at(led1r, led1g, led1b, 1); #endif //RGBLIGHT_ENABLE return state; } diff --git a/keyboards/kingly_keys/ave/ortho/rules.mk b/keyboards/kingly_keys/ave/ortho/rules.mk deleted file mode 100644 index 12ee1bcfbd..0000000000 --- a/keyboards/kingly_keys/ave/ortho/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/kingly_keys/ave/staggered/info.json b/keyboards/kingly_keys/ave/staggered/keyboard.json index 66e6bb3a4c..581e86c11b 100644 --- a/keyboards/kingly_keys/ave/staggered/info.json +++ b/keyboards/kingly_keys/ave/staggered/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x1225", "device_version": "0.1.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], "rows": ["B3", "F4", "F7", "F6", "F5"] diff --git a/keyboards/kingly_keys/ave/staggered/keymaps/default/keymap.c b/keyboards/kingly_keys/ave/staggered/keymaps/default/keymap.c index 8c5033302c..b5631ad436 100644 --- a/keyboards/kingly_keys/ave/staggered/keymaps/default/keymap.c +++ b/keyboards/kingly_keys/ave/staggered/keymaps/default/keymap.c @@ -217,23 +217,24 @@ void keyboard_post_init_user(void) { rgblight_sethsv_noeeprom(50, 255, 100); rgblight_mode_noeeprom(RGBLIGHT_EFFECT_BREATHING + 2); // Init the second LED to a static color: - setrgb(225, 185, 0, (rgb_led_t *)&led[1]); - rgblight_set(); + rgblight_setrgb_at(225, 185, 0, 1); #endif // RGBLIGHT_ENABLE } // RGB Indicator Customization: (cont.) layer_state_t layer_state_set_user(layer_state_t state){ #ifdef RGBLIGHT_ENABLE - uint8_t led1r = 0; uint8_t led1g = 0; uint8_t led1b = 0; - if (layer_state_cmp(state, 1)) { - led1b = 255; - } - if (layer_state_cmp(state, 3)) { - led1r = 200; - } - setrgb(led1r, led1g, led1b, (rgb_led_t *)&led[1]); - rgblight_set(); + uint8_t led1r = 0; + uint8_t led1g = 0; + uint8_t led1b = 0; + + if (layer_state_cmp(state, 1)) { + led1b = 255; + } + if (layer_state_cmp(state, 3)) { + led1r = 200; + } + rgblight_setrgb_at(led1r, led1g, led1b, 1); #endif //RGBLIGHT_ENABLE return state; } diff --git a/keyboards/kingly_keys/ave/staggered/rules.mk b/keyboards/kingly_keys/ave/staggered/rules.mk deleted file mode 100644 index 12ee1bcfbd..0000000000 --- a/keyboards/kingly_keys/ave/staggered/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/kingly_keys/little_foot/info.json b/keyboards/kingly_keys/little_foot/keyboard.json index 314693d561..19e6a0f547 100644 --- a/keyboards/kingly_keys/little_foot/info.json +++ b/keyboards/kingly_keys/little_foot/keyboard.json @@ -30,6 +30,15 @@ "ws2812": { "pin": "F4" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F5", "F7", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1"], "rows": ["F6", "B6", "B2", "B3", "B1"] diff --git a/keyboards/kingly_keys/little_foot/rules.mk b/keyboards/kingly_keys/little_foot/rules.mk deleted file mode 100644 index 53b742083f..0000000000 --- a/keyboards/kingly_keys/little_foot/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no -RGBLIGHT_ENABLE = yes diff --git a/keyboards/kingly_keys/romac/info.json b/keyboards/kingly_keys/romac/keyboard.json index a6a8a4b8eb..4c5e929848 100644 --- a/keyboards/kingly_keys/romac/info.json +++ b/keyboards/kingly_keys/romac/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["F7", "B1", "B3"], "rows": ["D4", "C6", "D7", "E6"] diff --git a/keyboards/kingly_keys/romac/rules.mk b/keyboards/kingly_keys/romac/rules.mk deleted file mode 100644 index 5e7b5aadb5..0000000000 --- a/keyboards/kingly_keys/romac/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no -RGBLIGHT_ENABLE = no - diff --git a/keyboards/kingly_keys/romac_plus/info.json b/keyboards/kingly_keys/romac_plus/keyboard.json index 5808d7fe58..bc4ad616e1 100644 --- a/keyboards/kingly_keys/romac_plus/info.json +++ b/keyboards/kingly_keys/romac_plus/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "oled": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F6", "F5", "F4"], "rows": ["C6", "D4", "D2", "D3"] diff --git a/keyboards/kingly_keys/romac_plus/rules.mk b/keyboards/kingly_keys/romac_plus/rules.mk deleted file mode 100644 index 3eef56841c..0000000000 --- a/keyboards/kingly_keys/romac_plus/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Enable support for EC11 Rotary Encoder -OLED_ENABLE = yes diff --git a/keyboards/kingly_keys/ropro/info.json b/keyboards/kingly_keys/ropro/keyboard.json index 8026d5c764..ed0bba5366 100644 --- a/keyboards/kingly_keys/ropro/info.json +++ b/keyboards/kingly_keys/ropro/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B3", "B2", "B6", "D2", "C7"], "rows": ["F4", "F5", "F6", "F7", "B1", "F1", null] diff --git a/keyboards/kingly_keys/ropro/rules.mk b/keyboards/kingly_keys/ropro/rules.mk deleted file mode 100644 index 2fde11543f..0000000000 --- a/keyboards/kingly_keys/ropro/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -RGBLIGHT_ENABLE = yes diff --git a/keyboards/kingly_keys/smd_milk/info.json b/keyboards/kingly_keys/smd_milk/keyboard.json index 84174ac248..e510ea80b4 100644 --- a/keyboards/kingly_keys/smd_milk/info.json +++ b/keyboards/kingly_keys/smd_milk/keyboard.json @@ -30,6 +30,15 @@ "ws2812": { "pin": "B3" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": false, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D3"], "rows": ["C5", "D2"] diff --git a/keyboards/kingly_keys/smd_milk/rules.mk b/keyboards/kingly_keys/smd_milk/rules.mk deleted file mode 100644 index 5d1006936d..0000000000 --- a/keyboards/kingly_keys/smd_milk/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Custom backlighting code is used, so this should not be enabled -AUDIO_ENABLE = no # This can be enabled if a speaker is connected to the expansion port. Not compatible with RGBLIGHT below -RGBLIGHT_ENABLE = yes # This can be enabled if a ws2812 strip is connected to the expansion port. diff --git a/keyboards/kingly_keys/soap/info.json b/keyboards/kingly_keys/soap/keyboard.json index e6d2cee421..b4f8fb9e86 100644 --- a/keyboards/kingly_keys/soap/info.json +++ b/keyboards/kingly_keys/soap/keyboard.json @@ -26,6 +26,16 @@ "ws2812": { "pin": "B6" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F1", "F0", "D5"], "rows": ["C7", "C6"] diff --git a/keyboards/kingly_keys/soap/rules.mk b/keyboards/kingly_keys/soap/rules.mk deleted file mode 100644 index 2fde11543f..0000000000 --- a/keyboards/kingly_keys/soap/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -RGBLIGHT_ENABLE = yes |