aboutsummaryrefslogtreecommitdiff
path: root/keyboards/woodkeys
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/woodkeys')
-rw-r--r--keyboards/woodkeys/bigseries/1key/keyboard.json (renamed from keyboards/woodkeys/bigseries/1key/info.json)9
-rwxr-xr-xkeyboards/woodkeys/bigseries/1key/rules.mk12
-rw-r--r--keyboards/woodkeys/bigseries/2key/keyboard.json (renamed from keyboards/woodkeys/bigseries/2key/info.json)9
-rwxr-xr-xkeyboards/woodkeys/bigseries/2key/rules.mk12
-rw-r--r--keyboards/woodkeys/bigseries/3key/keyboard.json (renamed from keyboards/woodkeys/bigseries/3key/info.json)9
-rwxr-xr-xkeyboards/woodkeys/bigseries/3key/rules.mk12
-rw-r--r--keyboards/woodkeys/bigseries/4key/keyboard.json (renamed from keyboards/woodkeys/bigseries/4key/info.json)9
-rwxr-xr-xkeyboards/woodkeys/bigseries/4key/rules.mk12
-rw-r--r--keyboards/woodkeys/meira/featherble/info.json5
-rw-r--r--keyboards/woodkeys/meira/featherble/keyboard.json10
-rw-r--r--keyboards/woodkeys/meira/featherble/rules.mk2
-rw-r--r--keyboards/woodkeys/meira/info.json5
-rw-r--r--keyboards/woodkeys/meira/keymaps/default/keymap.c3
-rw-r--r--keyboards/woodkeys/meira/keymaps/takmiya/keymap.c14
-rw-r--r--keyboards/woodkeys/meira/promicro/keyboard.json3
-rw-r--r--keyboards/woodkeys/meira/rules.mk13
-rw-r--r--keyboards/woodkeys/scarletbandana/keyboard.json (renamed from keyboards/woodkeys/scarletbandana/info.json)13
-rw-r--r--keyboards/woodkeys/scarletbandana/rules.mk13
18 files changed, 67 insertions, 98 deletions
diff --git a/keyboards/woodkeys/bigseries/1key/info.json b/keyboards/woodkeys/bigseries/1key/keyboard.json
index 43d7b0f536..2440b1974b 100644
--- a/keyboards/woodkeys/bigseries/1key/info.json
+++ b/keyboards/woodkeys/bigseries/1key/keyboard.json
@@ -27,6 +27,15 @@
"twinkle": true
}
},
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["B4"],
"rows": ["B0"]
diff --git a/keyboards/woodkeys/bigseries/1key/rules.mk b/keyboards/woodkeys/bigseries/1key/rules.mk
deleted file mode 100755
index 4465ace172..0000000000
--- a/keyboards/woodkeys/bigseries/1key/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/woodkeys/bigseries/2key/info.json b/keyboards/woodkeys/bigseries/2key/keyboard.json
index 98cbeab77d..9c8c34914a 100644
--- a/keyboards/woodkeys/bigseries/2key/info.json
+++ b/keyboards/woodkeys/bigseries/2key/keyboard.json
@@ -27,6 +27,15 @@
"twinkle": true
}
},
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["B4", "B3"],
"rows": ["B0"]
diff --git a/keyboards/woodkeys/bigseries/2key/rules.mk b/keyboards/woodkeys/bigseries/2key/rules.mk
deleted file mode 100755
index 4465ace172..0000000000
--- a/keyboards/woodkeys/bigseries/2key/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/woodkeys/bigseries/3key/info.json b/keyboards/woodkeys/bigseries/3key/keyboard.json
index 8c24efb09d..17870d98ad 100644
--- a/keyboards/woodkeys/bigseries/3key/info.json
+++ b/keyboards/woodkeys/bigseries/3key/keyboard.json
@@ -27,6 +27,15 @@
"twinkle": true
}
},
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["B4", "B3", "B5"],
"rows": ["B0"]
diff --git a/keyboards/woodkeys/bigseries/3key/rules.mk b/keyboards/woodkeys/bigseries/3key/rules.mk
deleted file mode 100755
index 4465ace172..0000000000
--- a/keyboards/woodkeys/bigseries/3key/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/woodkeys/bigseries/4key/info.json b/keyboards/woodkeys/bigseries/4key/keyboard.json
index 789eb9ecbb..1e44fc2375 100644
--- a/keyboards/woodkeys/bigseries/4key/info.json
+++ b/keyboards/woodkeys/bigseries/4key/keyboard.json
@@ -27,6 +27,15 @@
"twinkle": true
}
},
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["B4", "B3"],
"rows": ["B0", "B5"]
diff --git a/keyboards/woodkeys/bigseries/4key/rules.mk b/keyboards/woodkeys/bigseries/4key/rules.mk
deleted file mode 100755
index 4465ace172..0000000000
--- a/keyboards/woodkeys/bigseries/4key/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/woodkeys/meira/featherble/info.json b/keyboards/woodkeys/meira/featherble/info.json
deleted file mode 100644
index 2ce28918df..0000000000
--- a/keyboards/woodkeys/meira/featherble/info.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "bluetooth": {
- "driver": "bluefruit_le"
- }
-}
diff --git a/keyboards/woodkeys/meira/featherble/keyboard.json b/keyboards/woodkeys/meira/featherble/keyboard.json
new file mode 100644
index 0000000000..416b788c90
--- /dev/null
+++ b/keyboards/woodkeys/meira/featherble/keyboard.json
@@ -0,0 +1,10 @@
+{
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "bluetooth": {
+ "driver": "bluefruit_le"
+ },
+ "features": {
+ "bluetooth": true
+ }
+}
diff --git a/keyboards/woodkeys/meira/featherble/rules.mk b/keyboards/woodkeys/meira/featherble/rules.mk
index 174947ff39..3437a35bdf 100644
--- a/keyboards/woodkeys/meira/featherble/rules.mk
+++ b/keyboards/woodkeys/meira/featherble/rules.mk
@@ -1,4 +1,2 @@
# Processor frequency
F_CPU = 8000000
-
-BLUETOOTH_ENABLE = yes
diff --git a/keyboards/woodkeys/meira/info.json b/keyboards/woodkeys/meira/info.json
index 5fbcc9deaf..3ad2918d8e 100644
--- a/keyboards/woodkeys/meira/info.json
+++ b/keyboards/woodkeys/meira/info.json
@@ -8,8 +8,9 @@
"pid": "0x6061",
"device_version": "0.0.1"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "features": {
+ "extrakey": true
+ },
"layout_aliases": {
"LAYOUT": "LAYOUT_ortho_4x12"
},
diff --git a/keyboards/woodkeys/meira/keymaps/default/keymap.c b/keyboards/woodkeys/meira/keymaps/default/keymap.c
index 8aedffc675..72f465e44a 100644
--- a/keyboards/woodkeys/meira/keymaps/default/keymap.c
+++ b/keyboards/woodkeys/meira/keymaps/default/keymap.c
@@ -182,7 +182,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
#ifdef AUDIO_ENABLE
PLAY_SONG(tone_qwerty);
#endif
- // persistent_default_layer_set(1UL<<_QWERTY);
}
return false;
break;
@@ -191,7 +190,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
#ifdef AUDIO_ENABLE
PLAY_SONG(tone_colemak);
#endif
- // persistent_default_layer_set(1UL<<_COLEMAK);
}
return false;
break;
@@ -200,7 +198,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
#ifdef AUDIO_ENABLE
PLAY_SONG(tone_dvorak);
#endif
- // persistent_default_layer_set(1UL<<_DVORAK);
}
return false;
break;
diff --git a/keyboards/woodkeys/meira/keymaps/takmiya/keymap.c b/keyboards/woodkeys/meira/keymaps/takmiya/keymap.c
index cf1b2b8ce6..bba1b5583e 100644
--- a/keyboards/woodkeys/meira/keymaps/takmiya/keymap.c
+++ b/keyboards/woodkeys/meira/keymaps/takmiya/keymap.c
@@ -26,8 +26,7 @@ extern rgblight_config_t rgblight_config;
#define _ADJUST 3
enum custom_keycodes {
- QWERTY = SAFE_RANGE,
- LOWER,
+ LOWER = SAFE_RANGE,
RAISE,
ADJUST,
};
@@ -104,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[_ADJUST] = LAYOUT(
BL_TOGG, QK_BOOT, _______, KC_MRWD, KC_MPLY, KC_MFFD, KC_PSCR, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL,
- BL_STEP, RGB_MOD, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, _______, _______, _______, _______,
+ BL_STEP, RGB_MOD, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, KC_PSCR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
)
@@ -124,15 +123,6 @@ void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
- case QWERTY:
- if (record->event.pressed) {
- #ifdef AUDIO_ENABLE
- PLAY_SONG(tone_qwerty);
- #endif
-// persistent_default_layer_set(1UL<<_QWERTY);
- }
- return false;
- break;
case LOWER:
if (record->event.pressed) {
//not sure how to have keyboard check mode and set it to a variable, so my work around
diff --git a/keyboards/woodkeys/meira/promicro/keyboard.json b/keyboards/woodkeys/meira/promicro/keyboard.json
new file mode 100644
index 0000000000..4c44b1c5bf
--- /dev/null
+++ b/keyboards/woodkeys/meira/promicro/keyboard.json
@@ -0,0 +1,3 @@
+{
+ "development_board": "promicro"
+}
diff --git a/keyboards/woodkeys/meira/rules.mk b/keyboards/woodkeys/meira/rules.mk
index bad7949ec0..423c14cfb7 100644
--- a/keyboards/woodkeys/meira/rules.mk
+++ b/keyboards/woodkeys/meira/rules.mk
@@ -1,16 +1,3 @@
-# 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 = 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
-
CUSTOM_MATRIX = yes
SRC += matrix.c
diff --git a/keyboards/woodkeys/scarletbandana/info.json b/keyboards/woodkeys/scarletbandana/keyboard.json
index b3197a7c1b..f6c4342efa 100644
--- a/keyboards/woodkeys/scarletbandana/info.json
+++ b/keyboards/woodkeys/scarletbandana/keyboard.json
@@ -26,6 +26,19 @@
"ws2812": {
"pin": "D3"
},
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "audio": true,
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["B2", "B3", "B7", "B1", "F5", "F4", "F6", "F7", "B0", "F0", "F1", "D0", "D1", "D2", "D5", "B6", "C7"],
"rows": ["D4", "D6", "D7", "B4", "B5"]
diff --git a/keyboards/woodkeys/scarletbandana/rules.mk b/keyboards/woodkeys/scarletbandana/rules.mk
deleted file mode 100644
index 3e736b56e5..0000000000
--- a/keyboards/woodkeys/scarletbandana/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
-AUDIO_ENABLE = yes # Audio output
-RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-LTO_ENABLE = yes