aboutsummaryrefslogtreecommitdiff
path: root/keyboards/bpiphany
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/bpiphany')
-rw-r--r--keyboards/bpiphany/four_banger/config.h7
-rw-r--r--keyboards/bpiphany/four_banger/keyboard.json (renamed from keyboards/bpiphany/four_banger/info.json)15
-rw-r--r--keyboards/bpiphany/four_banger/rules.mk12
-rw-r--r--keyboards/bpiphany/frosty_flake/20130602/20130602.c24
-rw-r--r--keyboards/bpiphany/frosty_flake/20130602/keyboard.json16
-rw-r--r--keyboards/bpiphany/frosty_flake/20130602/rules.mk12
-rw-r--r--keyboards/bpiphany/frosty_flake/20140521/20140521.c24
-rw-r--r--keyboards/bpiphany/frosty_flake/20140521/keyboard.json16
-rw-r--r--keyboards/bpiphany/frosty_flake/20140521/rules.mk12
-rw-r--r--keyboards/bpiphany/frosty_flake/config.h5
-rw-r--r--keyboards/bpiphany/frosty_flake/info.json6
-rw-r--r--keyboards/bpiphany/ghost_squid/keyboard.json (renamed from keyboards/bpiphany/ghost_squid/info.json)5
-rw-r--r--keyboards/bpiphany/ghost_squid/keymaps/default/keymap.c2
-rw-r--r--keyboards/bpiphany/ghost_squid/matrix.c1
-rw-r--r--keyboards/bpiphany/ghost_squid/rules.mk12
-rwxr-xr-xkeyboards/bpiphany/hid_liber/config.h5
-rw-r--r--keyboards/bpiphany/hid_liber/keyboard.json (renamed from keyboards/bpiphany/hid_liber/info.json)14
-rwxr-xr-xkeyboards/bpiphany/hid_liber/rules.mk16
-rw-r--r--keyboards/bpiphany/kitten_paw/config.h5
-rw-r--r--keyboards/bpiphany/kitten_paw/keyboard.json (renamed from keyboards/bpiphany/kitten_paw/info.json)13
-rw-r--r--keyboards/bpiphany/kitten_paw/rules.mk12
-rw-r--r--keyboards/bpiphany/pegasushoof/2013/keyboard.json (renamed from keyboards/bpiphany/pegasushoof/2013/info.json)0
-rw-r--r--keyboards/bpiphany/pegasushoof/2015/keyboard.json (renamed from keyboards/bpiphany/pegasushoof/2015/info.json)0
-rw-r--r--keyboards/bpiphany/pegasushoof/info.json8
-rw-r--r--keyboards/bpiphany/pegasushoof/rules.mk13
-rw-r--r--keyboards/bpiphany/sixshooter/keyboard.json (renamed from keyboards/bpiphany/sixshooter/info.json)8
-rw-r--r--keyboards/bpiphany/sixshooter/rules.mk11
-rw-r--r--keyboards/bpiphany/tiger_lily/config.h5
-rw-r--r--keyboards/bpiphany/tiger_lily/keyboard.json (renamed from keyboards/bpiphany/tiger_lily/info.json)13
-rw-r--r--keyboards/bpiphany/tiger_lily/rules.mk12
-rw-r--r--keyboards/bpiphany/unloved_bastard/config.h5
-rw-r--r--keyboards/bpiphany/unloved_bastard/keyboard.json (renamed from keyboards/bpiphany/unloved_bastard/info.json)14
-rw-r--r--keyboards/bpiphany/unloved_bastard/rules.mk13
33 files changed, 130 insertions, 206 deletions
diff --git a/keyboards/bpiphany/four_banger/config.h b/keyboards/bpiphany/four_banger/config.h
deleted file mode 100644
index 5f36081323..0000000000
--- a/keyboards/bpiphany/four_banger/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-/* 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
diff --git a/keyboards/bpiphany/four_banger/info.json b/keyboards/bpiphany/four_banger/keyboard.json
index e267922ab8..a368fbfe61 100644
--- a/keyboards/bpiphany/four_banger/info.json
+++ b/keyboards/bpiphany/four_banger/keyboard.json
@@ -28,6 +28,21 @@
"ws2812": {
"pin": "E6"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["B5", "B4"],
"rows": ["B2", "B6"]
diff --git a/keyboards/bpiphany/four_banger/rules.mk b/keyboards/bpiphany/four_banger/rules.mk
deleted file mode 100644
index 21fd8f40ee..0000000000
--- a/keyboards/bpiphany/four_banger/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/bpiphany/frosty_flake/20130602/20130602.c b/keyboards/bpiphany/frosty_flake/20130602/20130602.c
deleted file mode 100644
index 05abbb567e..0000000000
--- a/keyboards/bpiphany/frosty_flake/20130602/20130602.c
+++ /dev/null
@@ -1,24 +0,0 @@
-#include "quantum.h"
-
-void keyboard_pre_init_kb(void) {
- setPinOutput(B7); // caps lock
- writePinHigh(B7);
- setPinOutput(C5); // num lock
- writePinHigh(C7);
- setPinOutput(C6); // scroll lock
- writePinHigh(C6);
-
- keyboard_pre_init_user();
-}
-
-bool led_update_kb(led_t usb_led) {
- // user requests no further processing
- if (!led_update_user(usb_led))
- return true;
-
- writePin(C5, !usb_led.num_lock);
- writePin(B7, !usb_led.caps_lock);
- writePin(C6, !usb_led.scroll_lock);
-
- return true;
-}
diff --git a/keyboards/bpiphany/frosty_flake/20130602/keyboard.json b/keyboards/bpiphany/frosty_flake/20130602/keyboard.json
new file mode 100644
index 0000000000..142010c9c4
--- /dev/null
+++ b/keyboards/bpiphany/frosty_flake/20130602/keyboard.json
@@ -0,0 +1,16 @@
+{
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
+ "indicators": {
+ "caps_lock": "B7",
+ "num_lock": "C5",
+ "scroll_lock": "C6",
+ "on_state": 0
+ }
+}
diff --git a/keyboards/bpiphany/frosty_flake/20130602/rules.mk b/keyboards/bpiphany/frosty_flake/20130602/rules.mk
index 0e2690e65e..e891eb1dc0 100644
--- a/keyboards/bpiphany/frosty_flake/20130602/rules.mk
+++ b/keyboards/bpiphany/frosty_flake/20130602/rules.mk
@@ -1,14 +1,2 @@
-# 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 = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-
CUSTOM_MATRIX = lite
SRC += 20130602/matrix.c
diff --git a/keyboards/bpiphany/frosty_flake/20140521/20140521.c b/keyboards/bpiphany/frosty_flake/20140521/20140521.c
deleted file mode 100644
index 3c8bf3bd79..0000000000
--- a/keyboards/bpiphany/frosty_flake/20140521/20140521.c
+++ /dev/null
@@ -1,24 +0,0 @@
-#include "quantum.h"
-
-void keyboard_pre_init_kb(void) {
- setPinOutput(B7); // num lock
- writePinHigh(B7);
- setPinOutput(C5); // caps lock
- writePinHigh(C7);
- setPinOutput(C6); // scroll lock
- writePinHigh(C6);
-
- keyboard_pre_init_user();
-}
-
-bool led_update_kb(led_t usb_led) {
- // user requests no further processing
- if (!led_update_user(usb_led))
- return true;
-
- writePin(C5, !usb_led.caps_lock);
- writePin(B7, !usb_led.num_lock);
- writePin(C6, !usb_led.scroll_lock);
-
- return true;
-}
diff --git a/keyboards/bpiphany/frosty_flake/20140521/keyboard.json b/keyboards/bpiphany/frosty_flake/20140521/keyboard.json
new file mode 100644
index 0000000000..2ca004c24d
--- /dev/null
+++ b/keyboards/bpiphany/frosty_flake/20140521/keyboard.json
@@ -0,0 +1,16 @@
+{
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
+ "indicators": {
+ "caps_lock": "C5",
+ "num_lock": "B7",
+ "scroll_lock": "C6",
+ "on_state": 0
+ }
+}
diff --git a/keyboards/bpiphany/frosty_flake/20140521/rules.mk b/keyboards/bpiphany/frosty_flake/20140521/rules.mk
index 6b5ffd3fc8..2b2d976fc6 100644
--- a/keyboards/bpiphany/frosty_flake/20140521/rules.mk
+++ b/keyboards/bpiphany/frosty_flake/20140521/rules.mk
@@ -1,14 +1,2 @@
-# 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 = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-
CUSTOM_MATRIX = lite
SRC += 20140521/matrix.c
diff --git a/keyboards/bpiphany/frosty_flake/config.h b/keyboards/bpiphany/frosty_flake/config.h
index 8a895c3e50..37c868b47f 100644
--- a/keyboards/bpiphany/frosty_flake/config.h
+++ b/keyboards/bpiphany/frosty_flake/config.h
@@ -38,11 +38,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_COL_PINS { B0, B3, B2, B1, B6, B4, B5, C7 }
#define MATRIX_ROW_PINS { NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
-/* 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.
diff --git a/keyboards/bpiphany/frosty_flake/info.json b/keyboards/bpiphany/frosty_flake/info.json
index 95fbd477eb..33a2f792d9 100644
--- a/keyboards/bpiphany/frosty_flake/info.json
+++ b/keyboards/bpiphany/frosty_flake/info.json
@@ -8,6 +8,12 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"processor": "atmega32u2",
"bootloader": "atmel-dfu",
"dynamic_keymap": {
diff --git a/keyboards/bpiphany/ghost_squid/info.json b/keyboards/bpiphany/ghost_squid/keyboard.json
index 49b6e10309..85f6f0fa8e 100644
--- a/keyboards/bpiphany/ghost_squid/info.json
+++ b/keyboards/bpiphany/ghost_squid/keyboard.json
@@ -8,6 +8,11 @@
"pid": "0x6050",
"device_version": "1.0.4"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true
+ },
"indicators": {
"caps_lock": "C6",
"num_lock": "C5",
diff --git a/keyboards/bpiphany/ghost_squid/keymaps/default/keymap.c b/keyboards/bpiphany/ghost_squid/keymaps/default/keymap.c
index f53bdd8337..52305bba74 100644
--- a/keyboards/bpiphany/ghost_squid/keymaps/default/keymap.c
+++ b/keyboards/bpiphany/ghost_squid/keymaps/default/keymap.c
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Layer 1: Function layer */
[_MD] = LAYOUT_fullsize_iso(
- _______, _______, _______, _______, _______, KC_MPLY, KC_MSTP, KC_MPRV, KC_MNXT, GUI_TOG, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, QK_BOOT,
+ _______, _______, _______, _______, _______, KC_MPLY, KC_MSTP, KC_MPRV, KC_MNXT, GU_TOGG, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, QK_BOOT,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/bpiphany/ghost_squid/matrix.c b/keyboards/bpiphany/ghost_squid/matrix.c
index b0ad607555..802d365cb8 100644
--- a/keyboards/bpiphany/ghost_squid/matrix.c
+++ b/keyboards/bpiphany/ghost_squid/matrix.c
@@ -17,7 +17,6 @@
*/
#include "matrix.h"
-#include "quantum.h"
matrix_row_t read_rows(void) {
return
diff --git a/keyboards/bpiphany/ghost_squid/rules.mk b/keyboards/bpiphany/ghost_squid/rules.mk
index 2f6a5a7346..30ce5d293b 100644
--- a/keyboards/bpiphany/ghost_squid/rules.mk
+++ b/keyboards/bpiphany/ghost_squid/rules.mk
@@ -1,14 +1,2 @@
-# 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
CUSTOM_MATRIX = lite
SRC += matrix.c
diff --git a/keyboards/bpiphany/hid_liber/config.h b/keyboards/bpiphany/hid_liber/config.h
index 2e41e1f700..8ba4e7c73b 100755
--- a/keyboards/bpiphany/hid_liber/config.h
+++ b/keyboards/bpiphany/hid_liber/config.h
@@ -24,11 +24,6 @@
// HID Liberation Device uses custom matrix code to accomodate a 74HC238 3 to 8 decoder on pins B1, B2 and B3.
-/* 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.
diff --git a/keyboards/bpiphany/hid_liber/info.json b/keyboards/bpiphany/hid_liber/keyboard.json
index 82fd77781a..67c8416849 100644
--- a/keyboards/bpiphany/hid_liber/info.json
+++ b/keyboards/bpiphany/hid_liber/keyboard.json
@@ -8,6 +8,20 @@
"pid": "0xB919",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "nkro": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"indicators": {
"caps_lock": "B5",
"scroll_lock": "B6",
diff --git a/keyboards/bpiphany/hid_liber/rules.mk b/keyboards/bpiphany/hid_liber/rules.mk
index fc98be5c12..3215e3588a 100755
--- a/keyboards/bpiphany/hid_liber/rules.mk
+++ b/keyboards/bpiphany/hid_liber/rules.mk
@@ -1,16 +1,2 @@
-# 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
-CUSTOM_MATRIX = yes # Custom matrix file
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
-AUDIO_ENABLE = no # Audio output
-
-# Project specific files
+CUSTOM_MATRIX = yes
SRC = matrix.c
diff --git a/keyboards/bpiphany/kitten_paw/config.h b/keyboards/bpiphany/kitten_paw/config.h
index 0d23223dc9..3b934626f3 100644
--- a/keyboards/bpiphany/kitten_paw/config.h
+++ b/keyboards/bpiphany/kitten_paw/config.h
@@ -22,11 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROWS 8
#define MATRIX_COLS 18
-/* 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.
diff --git a/keyboards/bpiphany/kitten_paw/info.json b/keyboards/bpiphany/kitten_paw/keyboard.json
index 64a38a6e56..829129d406 100644
--- a/keyboards/bpiphany/kitten_paw/info.json
+++ b/keyboards/bpiphany/kitten_paw/keyboard.json
@@ -8,6 +8,19 @@
"pid": "0x6050",
"device_version": "1.0.4"
},
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"indicators": {
"caps_lock": "C6",
"num_lock": "B7",
diff --git a/keyboards/bpiphany/kitten_paw/rules.mk b/keyboards/bpiphany/kitten_paw/rules.mk
index 43ebddd357..8784813b33 100644
--- a/keyboards/bpiphany/kitten_paw/rules.mk
+++ b/keyboards/bpiphany/kitten_paw/rules.mk
@@ -1,14 +1,2 @@
-# 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 = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-
CUSTOM_MATRIX = yes
SRC += matrix.c
diff --git a/keyboards/bpiphany/pegasushoof/2013/info.json b/keyboards/bpiphany/pegasushoof/2013/keyboard.json
index c7b120fd05..c7b120fd05 100644
--- a/keyboards/bpiphany/pegasushoof/2013/info.json
+++ b/keyboards/bpiphany/pegasushoof/2013/keyboard.json
diff --git a/keyboards/bpiphany/pegasushoof/2015/info.json b/keyboards/bpiphany/pegasushoof/2015/keyboard.json
index 5c4f8d6f91..5c4f8d6f91 100644
--- a/keyboards/bpiphany/pegasushoof/2015/info.json
+++ b/keyboards/bpiphany/pegasushoof/2015/keyboard.json
diff --git a/keyboards/bpiphany/pegasushoof/info.json b/keyboards/bpiphany/pegasushoof/info.json
index 5e096015cb..1e9e9db306 100644
--- a/keyboards/bpiphany/pegasushoof/info.json
+++ b/keyboards/bpiphany/pegasushoof/info.json
@@ -2,6 +2,14 @@
"manufacturer": "Filco",
"url": "",
"maintainer": "qmk",
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"usb": {
"vid": "0x4245",
"pid": "0x6050",
diff --git a/keyboards/bpiphany/pegasushoof/rules.mk b/keyboards/bpiphany/pegasushoof/rules.mk
index df85bc0375..20adecaa08 100644
--- a/keyboards/bpiphany/pegasushoof/rules.mk
+++ b/keyboards/bpiphany/pegasushoof/rules.mk
@@ -1,14 +1 @@
-# 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
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
-
DEFAULT_FOLDER=bpiphany/pegasushoof/2013
diff --git a/keyboards/bpiphany/sixshooter/info.json b/keyboards/bpiphany/sixshooter/keyboard.json
index 9705eb2f18..21e52f3629 100644
--- a/keyboards/bpiphany/sixshooter/info.json
+++ b/keyboards/bpiphany/sixshooter/keyboard.json
@@ -10,6 +10,14 @@
},
"processor": "atmega32u4",
"bootloader": "halfkay",
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"direct": [
["F7", "F6", "F1"],
diff --git a/keyboards/bpiphany/sixshooter/rules.mk b/keyboards/bpiphany/sixshooter/rules.mk
deleted file mode 100644
index 315dc5de53..0000000000
--- a/keyboards/bpiphany/sixshooter/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 = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/bpiphany/tiger_lily/config.h b/keyboards/bpiphany/tiger_lily/config.h
index cb63e867fc..c6817a8944 100644
--- a/keyboards/bpiphany/tiger_lily/config.h
+++ b/keyboards/bpiphany/tiger_lily/config.h
@@ -38,11 +38,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROW_PINS { C2, B3, B4, B2, B1, C7, B6, B5 }
#define MATRIX_COL_PINS { NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
-/* 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.
diff --git a/keyboards/bpiphany/tiger_lily/info.json b/keyboards/bpiphany/tiger_lily/keyboard.json
index 659c6f3267..118f89f39d 100644
--- a/keyboards/bpiphany/tiger_lily/info.json
+++ b/keyboards/bpiphany/tiger_lily/keyboard.json
@@ -8,6 +8,19 @@
"pid": "0x544C",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"indicators": {
"caps_lock": "C6",
"num_lock": "C5",
diff --git a/keyboards/bpiphany/tiger_lily/rules.mk b/keyboards/bpiphany/tiger_lily/rules.mk
index 43ebddd357..8784813b33 100644
--- a/keyboards/bpiphany/tiger_lily/rules.mk
+++ b/keyboards/bpiphany/tiger_lily/rules.mk
@@ -1,14 +1,2 @@
-# 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 = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-
CUSTOM_MATRIX = yes
SRC += matrix.c
diff --git a/keyboards/bpiphany/unloved_bastard/config.h b/keyboards/bpiphany/unloved_bastard/config.h
index af21267357..55322288ac 100644
--- a/keyboards/bpiphany/unloved_bastard/config.h
+++ b/keyboards/bpiphany/unloved_bastard/config.h
@@ -22,11 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROWS 8
#define MATRIX_COLS 18
-/* 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.
diff --git a/keyboards/bpiphany/unloved_bastard/info.json b/keyboards/bpiphany/unloved_bastard/keyboard.json
index 4ca48fee99..4748057175 100644
--- a/keyboards/bpiphany/unloved_bastard/info.json
+++ b/keyboards/bpiphany/unloved_bastard/keyboard.json
@@ -7,6 +7,20 @@
"pid": "0x1337",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "sleep_led": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"indicators": {
"caps_lock": "C5",
"num_lock": "B7",
diff --git a/keyboards/bpiphany/unloved_bastard/rules.mk b/keyboards/bpiphany/unloved_bastard/rules.mk
index 7a32c86032..8784813b33 100644
--- a/keyboards/bpiphany/unloved_bastard/rules.mk
+++ b/keyboards/bpiphany/unloved_bastard/rules.mk
@@ -1,15 +1,2 @@
-# 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
-AUDIO_ENABLE = no # Audio output
-SLEEP_LED_ENABLE = yes
-
CUSTOM_MATRIX = yes
SRC += matrix.c