aboutsummaryrefslogtreecommitdiff
path: root/keyboards/bpiphany/frosty_flake
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/bpiphany/frosty_flake')
-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
8 files changed, 38 insertions, 77 deletions
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": {