aboutsummaryrefslogtreecommitdiff
path: root/keyboards/bpiphany
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/bpiphany')
-rw-r--r--keyboards/bpiphany/four_banger/keyboard.json (renamed from keyboards/bpiphany/four_banger/info.json)9
-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/ghost_squid/matrix.c1
-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
13 files changed, 57 insertions, 109 deletions
diff --git a/keyboards/bpiphany/four_banger/info.json b/keyboards/bpiphany/four_banger/keyboard.json
index e267922ab8..2462050684 100644
--- a/keyboards/bpiphany/four_banger/info.json
+++ b/keyboards/bpiphany/four_banger/keyboard.json
@@ -28,6 +28,15 @@
"ws2812": {
"pin": "E6"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": 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/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/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