diff options
Diffstat (limited to 'keyboards/keebio')
43 files changed, 224 insertions, 264 deletions
diff --git a/keyboards/keebio/bamfk1/config.h b/keyboards/keebio/bamfk1/config.h index 6fd93072f5..46fd4d7316 100644 --- a/keyboards/keebio/bamfk1/config.h +++ b/keyboards/keebio/bamfk1/config.h @@ -8,25 +8,3 @@ # define STARTUP_SONG SONG(STARTUP_SOUND) #endif -#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2) - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/keebio/bamfk1/info.json b/keyboards/keebio/bamfk1/info.json deleted file mode 100644 index 4fa563f0e8..0000000000 --- a/keyboards/keebio/bamfk1/info.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "keyboard_name": "BAMFK-1", - "manufacturer": "Keebio", - "url": "https://keeb.io", - "maintainer": "nooges", - "usb": { - "vid": "0xCB10", - "pid": "0x1111", - "device_version": "0.0.1" - }, - "rgblight": { - "saturation_steps": 8, - "brightness_steps": 8, - "led_count": 16, - "sleep": true, - "animations": { - "breathing": true, - "rainbow_mood": true, - "rainbow_swirl": true, - "snake": true, - "knight": true, - "christmas": true, - "static_gradient": true, - "rgb_test": true, - "alternating": true - } - }, - "ws2812": { - "pin": "D3" - }, - "encoder": { - "rotary": [ - {"pin_a": "C7", "pin_b": "B5"}, - {"pin_a": "D7", "pin_b": "D4"} - ] - }, - "processor": "atmega32u4", - "bootloader": "atmel-dfu", - "matrix_pins": { - "direct": [ - ["E6", "B6", "D6"] - ] - }, - "layouts": { - "LAYOUT": { - "layout": [ - {"x": 1, "y": 0, "h": 2, "w": 2, "matrix": [0, 0]}, - {"x": 0, "y": 2.25, "matrix": [0, 1]}, - {"x": 3, "y": 2.25, "matrix": [0, 2]} - ] - } - } -} diff --git a/keyboards/keebio/bamfk1/keyboard.json b/keyboards/keebio/bamfk1/keyboard.json new file mode 100644 index 0000000000..09e7edbd18 --- /dev/null +++ b/keyboards/keebio/bamfk1/keyboard.json @@ -0,0 +1,113 @@ +{ + "manufacturer": "Keebio", + "keyboard_name": "BAMFK-1", + "maintainer": "nooges", + "bootloader": "atmel-dfu", + "encoder": { + "rotary": [ + {"pin_a": "C7", "pin_b": "B5"}, + {"pin_a": "D7", "pin_b": "D4"} + ] + }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "rgb_matrix": true + }, + "matrix_pins": { + "direct": [ + ["E6", "B6", "D6"] + ] + }, + "processor": "atmega32u4", + "rgb_matrix": { + "animations": { + "alphas_mods": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_sat": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "band_val": true, + "breathing": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "cycle_up_down": true, + "digital_rain": true, + "dual_beacon": true, + "gradient_left_right": true, + "gradient_up_down": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "jellybean_raindrops": true, + "multisplash": true, + "pixel_flow": true, + "pixel_fractal": true, + "pixel_rain": true, + "rainbow_beacon": true, + "rainbow_moving_chevron": true, + "rainbow_pinwheels": true, + "raindrops": true, + "solid_multisplash": true, + "solid_reactive": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_multinexus": true, + "solid_reactive_multiwide": true, + "solid_reactive_nexus": true, + "solid_reactive_simple": true, + "solid_reactive_wide": true, + "solid_splash": true, + "splash": true, + "typing_heatmap": true + }, + "default": { + "animation": "cycle_pinwheel", + "speed": 48 + }, + "driver": "ws2812", + "layout": [ + {"x": 56, "y": 0, "flags": 4}, + {"x": 168, "y": 0, "flags": 4}, + {"x": 224, "y": 16, "flags": 4}, + {"x": 224, "y": 48, "flags": 4}, + {"matrix": [0, 2], "x": 168, "y": 64, "flags": 4}, + {"matrix": [0, 1], "x": 56, "y": 64, "flags": 4}, + {"x": 0, "y": 48, "flags": 4}, + {"x": 0, "y": 16, "flags": 4}, + {"x": 0, "y": 0, "flags": 2}, + {"x": 112, "y": 0, "flags": 2}, + {"x": 224, "y": 0, "flags": 2}, + {"x": 224, "y": 32, "flags": 2}, + {"x": 224, "y": 64, "flags": 2}, + {"x": 112, "y": 64, "flags": 2}, + {"x": 224, "y": 64, "flags": 2}, + {"matrix": [0, 0], "x": 112, "y": 32, "flags": 2} + ], + "sleep": true + }, + "url": "https://keeb.io", + "usb": { + "device_version": "0.0.1", + "pid": "0x1211", + "vid": "0xCB10" + }, + "ws2812": { + "pin": "D3" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 1, "y": 0, "w": 2, "h": 2}, + {"matrix": [0, 1], "x": 0, "y": 2.25}, + {"matrix": [0, 2], "x": 3, "y": 2.25} + ] + } + } +} diff --git a/keyboards/keebio/bamfk1/rules.mk b/keyboards/keebio/bamfk1/rules.mk deleted file mode 100644 index 21df40039e..0000000000 --- a/keyboards/keebio/bamfk1/rules.mk +++ /dev/null @@ -1,14 +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 = yes # Audio output -ENCODER_ENABLE = yes -LTO_ENABLE = yes diff --git a/keyboards/keebio/bamfk4/info.json b/keyboards/keebio/bamfk4/keyboard.json index 769f288c51..a132a4bd46 100644 --- a/keyboards/keebio/bamfk4/info.json +++ b/keyboards/keebio/bamfk4/keyboard.json @@ -75,6 +75,18 @@ "val": 120 } }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["E6", "D5", "B6", "B7"], "rows": ["F0"] diff --git a/keyboards/keebio/bamfk4/rules.mk b/keyboards/keebio/bamfk4/rules.mk deleted file mode 100644 index 73f76344df..0000000000 --- a/keyboards/keebio/bamfk4/rules.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = no -RGB_MATRIX_ENABLE = yes - -LTO_ENABLE = yes diff --git a/keyboards/keebio/bigswitchseat/info.json b/keyboards/keebio/bigswitchseat/keyboard.json index f2fe9771ed..b1acf6c1b3 100644 --- a/keyboards/keebio/bigswitchseat/info.json +++ b/keyboards/keebio/bigswitchseat/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x1011", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["F0"], "rows": ["E6"] diff --git a/keyboards/keebio/bigswitchseat/rules.mk b/keyboards/keebio/bigswitchseat/rules.mk deleted file mode 100644 index 3f6eff7f55..0000000000 --- a/keyboards/keebio/bigswitchseat/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/keebio/choconum/info.json b/keyboards/keebio/choconum/keyboard.json index b5f50cc486..0315a9f3dc 100644 --- a/keyboards/keebio/choconum/info.json +++ b/keyboards/keebio/choconum/keyboard.json @@ -10,6 +10,14 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "direct": [ ["B2", "B10", "B3", "B4"], diff --git a/keyboards/keebio/choconum/rules.mk b/keyboards/keebio/choconum/rules.mk deleted file mode 100644 index 67d4dee2c7..0000000000 --- a/keyboards/keebio/choconum/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 = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - diff --git a/keyboards/keebio/chocopad/rev1/info.json b/keyboards/keebio/chocopad/rev1/keyboard.json index fafea9dce0..fafea9dce0 100644 --- a/keyboards/keebio/chocopad/rev1/info.json +++ b/keyboards/keebio/chocopad/rev1/keyboard.json diff --git a/keyboards/keebio/chocopad/rev1/rules.mk b/keyboards/keebio/chocopad/rev1/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/keebio/chocopad/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keebio/chocopad/rev2/info.json b/keyboards/keebio/chocopad/rev2/keyboard.json index 7cc5ef518f..7cc5ef518f 100644 --- a/keyboards/keebio/chocopad/rev2/info.json +++ b/keyboards/keebio/chocopad/rev2/keyboard.json diff --git a/keyboards/keebio/chocopad/rev2/rules.mk b/keyboards/keebio/chocopad/rev2/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/keebio/chocopad/rev2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keebio/convolution/info.json b/keyboards/keebio/convolution/info.json index 5e05d70ace..9ea761c1a9 100644 --- a/keyboards/keebio/convolution/info.json +++ b/keyboards/keebio/convolution/info.json @@ -10,9 +10,7 @@ "console": true, "extrakey": true, "mousekey": false, - "nkro": false, - "unicode": false, - "backlight": false + "nkro": false }, "layout_aliases": {"LAYOUT": "LAYOUT_all"} } diff --git a/keyboards/keebio/convolution/rev1/info.json b/keyboards/keebio/convolution/rev1/keyboard.json index 5ff7c1f8f0..68ac532620 100644 --- a/keyboards/keebio/convolution/rev1/info.json +++ b/keyboards/keebio/convolution/rev1/keyboard.json @@ -9,8 +9,6 @@ "diode_direction": "COL2ROW", "features": { "console": true, - "rgblight": false, - "backlight": false, "rgb_matrix": true }, "matrix_pins": { diff --git a/keyboards/keebio/convolution/rev1/rules.mk b/keyboards/keebio/convolution/rev1/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/keebio/convolution/rev1/rules.mk +++ /dev/null diff --git a/keyboards/keebio/dilly/info.json b/keyboards/keebio/dilly/keyboard.json index b229ca021f..4566594054 100644 --- a/keyboards/keebio/dilly/info.json +++ b/keyboards/keebio/dilly/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x113A", "device_version": "1.0.0" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D2", "D4", "C6", "F6", "F5"], "rows": ["D7", "E6", "B4", "B1", "B3", "B2"] diff --git a/keyboards/keebio/dilly/rules.mk b/keyboards/keebio/dilly/rules.mk deleted file mode 100644 index 32e82925cc..0000000000 --- a/keyboards/keebio/dilly/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 = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no -RGBLIGHT_ENABLE = yes diff --git a/keyboards/keebio/ergodicity/info.json b/keyboards/keebio/ergodicity/keyboard.json index 94c94193ed..1305a4359f 100644 --- a/keyboards/keebio/ergodicity/info.json +++ b/keyboards/keebio/ergodicity/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x125F", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D7", "D6", "D4", "D3", "D2", "D1", "D0", "B7", "B3"], "rows": ["B0", "B1", "C7", "B6", "B4"] diff --git a/keyboards/keebio/ergodicity/rules.mk b/keyboards/keebio/ergodicity/rules.mk deleted file mode 100644 index c358b798e4..0000000000 --- a/keyboards/keebio/ergodicity/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/keebio/laplace/info.json b/keyboards/keebio/laplace/keyboard.json index 6a81a6e899..22cced0ee3 100644 --- a/keyboards/keebio/laplace/info.json +++ b/keyboards/keebio/laplace/keyboard.json @@ -26,6 +26,15 @@ "ws2812": { "pin": "D4" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D1", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D3", "F4", "D2", "F5", "D7", "B4", "C6", "E6"] diff --git a/keyboards/keebio/laplace/rules.mk b/keyboards/keebio/laplace/rules.mk deleted file mode 100644 index fb930c2a92..0000000000 --- a/keyboards/keebio/laplace/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # 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 -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. diff --git a/keyboards/keebio/levinson/keymaps/default/keymap.c b/keyboards/keebio/levinson/keymaps/default/keymap.c index 72da4addc3..bdc4a50827 100644 --- a/keyboards/keebio/levinson/keymaps/default/keymap.c +++ b/keyboards/keebio/levinson/keymaps/default/keymap.c @@ -142,11 +142,6 @@ float tone_dvorak[][2] = SONG(DVORAK_SOUND); float tone_colemak[][2] = SONG(COLEMAK_SOUND); #endif -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case QWERTY: @@ -154,7 +149,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_qwerty); #endif - persistent_default_layer_set(1UL<<_QWERTY); + set_single_persistent_default_layer(_QWERTY); } return false; break; @@ -163,7 +158,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_colemak); #endif - persistent_default_layer_set(1UL<<_COLEMAK); + set_single_persistent_default_layer(_COLEMAK); } return false; break; @@ -172,7 +167,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_dvorak); #endif - persistent_default_layer_set(1UL<<_DVORAK); + set_single_persistent_default_layer(_DVORAK); } return false; break; diff --git a/keyboards/keebio/nyquist/keymaps/default/keymap.c b/keyboards/keebio/nyquist/keymaps/default/keymap.c index 8bf16240fb..df399d355f 100644 --- a/keyboards/keebio/nyquist/keymaps/default/keymap.c +++ b/keyboards/keebio/nyquist/keymaps/default/keymap.c @@ -162,11 +162,6 @@ float tone_dvorak[][2] = SONG(DVORAK_SOUND); float tone_colemak[][2] = SONG(COLEMAK_SOUND); #endif -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case QWERTY: @@ -174,7 +169,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_qwerty); #endif - persistent_default_layer_set(1UL<<_QWERTY); + set_single_persistent_default_layer(_QWERTY); } return false; break; @@ -183,7 +178,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_colemak); #endif - persistent_default_layer_set(1UL<<_COLEMAK); + set_single_persistent_default_layer(_COLEMAK); } return false; break; @@ -192,7 +187,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_dvorak); #endif - persistent_default_layer_set(1UL<<_DVORAK); + set_single_persistent_default_layer(_DVORAK); } return false; break; diff --git a/keyboards/keebio/nyquist/keymaps/tester/keymap.c b/keyboards/keebio/nyquist/keymaps/tester/keymap.c index 6109661ffd..7ed85044ca 100644 --- a/keyboards/keebio/nyquist/keymaps/tester/keymap.c +++ b/keyboards/keebio/nyquist/keymaps/tester/keymap.c @@ -11,7 +11,7 @@ extern keymap_config_t keymap_config; #define _DVORAK 2 #define _LOWER 3 #define _RAISE 4 -#define _ADJUST 16 +#define _ADJUST 5 enum custom_keycodes { QWERTY = SAFE_RANGE, @@ -159,11 +159,6 @@ float tone_dvorak[][2] = SONG(DVORAK_SOUND); float tone_colemak[][2] = SONG(COLEMAK_SOUND); #endif -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case QWERTY: @@ -171,7 +166,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_qwerty); #endif - persistent_default_layer_set(1UL<<_QWERTY); + set_single_persistent_default_layer(_QWERTY); } return false; break; @@ -180,7 +175,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_colemak); #endif - persistent_default_layer_set(1UL<<_COLEMAK); + set_single_persistent_default_layer(_COLEMAK); } return false; break; @@ -189,7 +184,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_dvorak); #endif - persistent_default_layer_set(1UL<<_DVORAK); + set_single_persistent_default_layer(_DVORAK); } return false; break; diff --git a/keyboards/keebio/nyquistpad/info.json b/keyboards/keebio/nyquistpad/keyboard.json index 1999e9eaa8..1999e9eaa8 100644 --- a/keyboards/keebio/nyquistpad/info.json +++ b/keyboards/keebio/nyquistpad/keyboard.json diff --git a/keyboards/keebio/nyquistpad/rules.mk b/keyboards/keebio/nyquistpad/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/keebio/nyquistpad/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keebio/sinc/info.json b/keyboards/keebio/sinc/info.json index a55f42649e..aa1e08f39d 100644 --- a/keyboards/keebio/sinc/info.json +++ b/keyboards/keebio/sinc/info.json @@ -6,14 +6,12 @@ "vid": "0xCB10" }, "features": { - "audio": false, "bootmagic": true, "command": false, "console": false, "extrakey": true, "mousekey": false, - "nkro": false, - "unicode": false + "nkro": false }, "split": { "enabled": true diff --git a/keyboards/keebio/sinc/rev1/info.json b/keyboards/keebio/sinc/rev1/keyboard.json index b7774fa0ed..b7774fa0ed 100644 --- a/keyboards/keebio/sinc/rev1/info.json +++ b/keyboards/keebio/sinc/rev1/keyboard.json diff --git a/keyboards/keebio/sinc/rev1/rules.mk b/keyboards/keebio/sinc/rev1/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/keebio/sinc/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keebio/sinc/rev2/info.json b/keyboards/keebio/sinc/rev2/keyboard.json index ff5ef2667a..ff5ef2667a 100644 --- a/keyboards/keebio/sinc/rev2/info.json +++ b/keyboards/keebio/sinc/rev2/keyboard.json diff --git a/keyboards/keebio/sinc/rev2/rules.mk b/keyboards/keebio/sinc/rev2/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/keebio/sinc/rev2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keebio/sinc/rev3/info.json b/keyboards/keebio/sinc/rev3/info.json index e20cd24f19..da828dbb35 100644 --- a/keyboards/keebio/sinc/rev3/info.json +++ b/keyboards/keebio/sinc/rev3/info.json @@ -9,8 +9,6 @@ "diode_direction": "COL2ROW", "features": { "console": true, - "rgblight": false, - "backlight": false, "rgb_matrix": true }, "split": { diff --git a/keyboards/keebio/stick/info.json b/keyboards/keebio/stick/keyboard.json index b24d4d6430..2e2b3539ab 100644 --- a/keyboards/keebio/stick/info.json +++ b/keyboards/keebio/stick/keyboard.json @@ -85,6 +85,16 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgb_matrix": true + }, "matrix_pins": { "direct": [ ["F4", "B6", "B5", "B4", "E6", "D7", "F6", "F7", "B1", "B3", "B2", "F5"] diff --git a/keyboards/keebio/stick/rules.mk b/keyboards/keebio/stick/rules.mk deleted file mode 100644 index 0f932779f5..0000000000 --- a/keyboards/keebio/stick/rules.mk +++ /dev/null @@ -1,14 +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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/keebio/tragicforce68/info.json b/keyboards/keebio/tragicforce68/keyboard.json index 07d292728b..49ada60863 100644 --- a/keyboards/keebio/tragicforce68/info.json +++ b/keyboards/keebio/tragicforce68/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0510", "device_version": "1.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D3", "D2", "D1", "D0", "B4", "E6", "C6", "D7", "D4"] diff --git a/keyboards/keebio/tragicforce68/rules.mk b/keyboards/keebio/tragicforce68/rules.mk deleted file mode 100644 index 86bb2554d8..0000000000 --- a/keyboards/keebio/tragicforce68/rules.mk +++ /dev/null @@ -1,11 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # 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 = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/keebio/tukey/info.json b/keyboards/keebio/tukey/keyboard.json index 9df46b0c1e..5d8bd37a28 100644 --- a/keyboards/keebio/tukey/info.json +++ b/keyboards/keebio/tukey/keyboard.json @@ -30,6 +30,15 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "direct": [ ["D4", "F6"] diff --git a/keyboards/keebio/tukey/rules.mk b/keyboards/keebio/tukey/rules.mk deleted file mode 100644 index 4465ace172..0000000000 --- a/keyboards/keebio/tukey/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 = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # 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 diff --git a/keyboards/keebio/wavelet/keymaps/default/keymap.c b/keyboards/keebio/wavelet/keymaps/default/keymap.c index 72da4addc3..bdc4a50827 100644 --- a/keyboards/keebio/wavelet/keymaps/default/keymap.c +++ b/keyboards/keebio/wavelet/keymaps/default/keymap.c @@ -142,11 +142,6 @@ float tone_dvorak[][2] = SONG(DVORAK_SOUND); float tone_colemak[][2] = SONG(COLEMAK_SOUND); #endif -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case QWERTY: @@ -154,7 +149,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_qwerty); #endif - persistent_default_layer_set(1UL<<_QWERTY); + set_single_persistent_default_layer(_QWERTY); } return false; break; @@ -163,7 +158,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_colemak); #endif - persistent_default_layer_set(1UL<<_COLEMAK); + set_single_persistent_default_layer(_COLEMAK); } return false; break; @@ -172,7 +167,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_dvorak); #endif - persistent_default_layer_set(1UL<<_DVORAK); + set_single_persistent_default_layer(_DVORAK); } return false; break; diff --git a/keyboards/keebio/wtf60/info.json b/keyboards/keebio/wtf60/keyboard.json index 1542c478b2..5ce22cc42e 100644 --- a/keyboards/keebio/wtf60/info.json +++ b/keyboards/keebio/wtf60/keyboard.json @@ -29,6 +29,17 @@ "ws2812": { "pin": "E6" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["B4", "B5", "B6", "C7", "F7", "B1", "B2", "B3", "D2", "D3", "D5", "D4", "D6", "D7"], "rows": ["F0", "F1", "F4", "F5", "F6"] diff --git a/keyboards/keebio/wtf60/rules.mk b/keyboards/keebio/wtf60/rules.mk deleted file mode 100644 index d34a5e4685..0000000000 --- a/keyboards/keebio/wtf60/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes |