aboutsummaryrefslogtreecommitdiff
path: root/keyboards/lfkeyboards
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/lfkeyboards')
-rw-r--r--keyboards/lfkeyboards/lfk65_hs/keyboard.json (renamed from keyboards/lfkeyboards/lfk65_hs/info.json)0
-rw-r--r--keyboards/lfkeyboards/lfk65_hs/rules.mk0
-rw-r--r--keyboards/lfkeyboards/lfk78/keymaps/default/keymap.c8
-rw-r--r--keyboards/lfkeyboards/lfk78/keymaps/iso/keymap.c8
-rw-r--r--keyboards/lfkeyboards/lfk78/keymaps/split_bs_osx/keymap.c8
-rw-r--r--keyboards/lfkeyboards/lfk78/keymaps/via/keymap.c8
-rw-r--r--keyboards/lfkeyboards/lfk78/lfk78.c4
-rw-r--r--keyboards/lfkeyboards/lfk78/revb/keyboard.json (renamed from keyboards/lfkeyboards/lfk78/revb/info.json)6
-rw-r--r--keyboards/lfkeyboards/lfk78/revb/rules.mk0
-rw-r--r--keyboards/lfkeyboards/lfk78/revc/keyboard.json (renamed from keyboards/lfkeyboards/lfk78/revc/info.json)6
-rw-r--r--keyboards/lfkeyboards/lfk78/revc/rules.mk0
-rw-r--r--keyboards/lfkeyboards/lfk78/revj/keyboard.json (renamed from keyboards/lfkeyboards/lfk78/revj/info.json)7
-rw-r--r--keyboards/lfkeyboards/lfk78/revj/rules.mk1
-rw-r--r--keyboards/lfkeyboards/lfk78/rules.mk12
-rw-r--r--keyboards/lfkeyboards/lfk87/info.json9
-rw-r--r--keyboards/lfkeyboards/lfk87/keymaps/default/keymap.c8
-rw-r--r--keyboards/lfkeyboards/lfk87/keymaps/iso/keymap.c8
-rw-r--r--keyboards/lfkeyboards/lfk87/lfk87.c4
-rw-r--r--keyboards/lfkeyboards/lfk87/reva/keyboard.json (renamed from keyboards/lfkeyboards/lfk87/reva/info.json)0
-rw-r--r--keyboards/lfkeyboards/lfk87/reva/rules.mk0
-rw-r--r--keyboards/lfkeyboards/lfk87/revc/keyboard.json (renamed from keyboards/lfkeyboards/lfk87/revc/info.json)0
-rw-r--r--keyboards/lfkeyboards/lfk87/revc/rules.mk0
-rw-r--r--keyboards/lfkeyboards/lfk87/rules.mk13
-rw-r--r--keyboards/lfkeyboards/lfkpad/keyboard.json (renamed from keyboards/lfkeyboards/lfkpad/info.json)8
-rw-r--r--keyboards/lfkeyboards/lfkpad/keymaps/default/keymap.c8
-rw-r--r--keyboards/lfkeyboards/lfkpad/rules.mk11
-rw-r--r--keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c8
-rw-r--r--keyboards/lfkeyboards/mini1800/mini1800.c4
-rw-r--r--keyboards/lfkeyboards/mini1800/reva/info.json4
-rw-r--r--keyboards/lfkeyboards/mini1800/reva/keyboard.json12
-rw-r--r--keyboards/lfkeyboards/mini1800/reva/rules.mk11
-rw-r--r--keyboards/lfkeyboards/mini1800/revc/info.json4
-rw-r--r--keyboards/lfkeyboards/mini1800/revc/keyboard.json12
-rw-r--r--keyboards/lfkeyboards/mini1800/revc/rules.mk11
-rw-r--r--keyboards/lfkeyboards/smk65/info.json8
-rw-r--r--keyboards/lfkeyboards/smk65/revb/keyboard.json (renamed from keyboards/lfkeyboards/smk65/revb/info.json)0
-rw-r--r--keyboards/lfkeyboards/smk65/revb/revb.c8
-rw-r--r--keyboards/lfkeyboards/smk65/revb/rules.mk0
-rw-r--r--keyboards/lfkeyboards/smk65/revf/keyboard.json (renamed from keyboards/lfkeyboards/smk65/revf/info.json)0
-rw-r--r--keyboards/lfkeyboards/smk65/revf/keymaps/via/keymap.c2
-rw-r--r--keyboards/lfkeyboards/smk65/revf/rules.mk0
-rw-r--r--keyboards/lfkeyboards/smk65/rules.mk13
42 files changed, 79 insertions, 155 deletions
diff --git a/keyboards/lfkeyboards/lfk65_hs/info.json b/keyboards/lfkeyboards/lfk65_hs/keyboard.json
index 0034fced4a..0034fced4a 100644
--- a/keyboards/lfkeyboards/lfk65_hs/info.json
+++ b/keyboards/lfkeyboards/lfk65_hs/keyboard.json
diff --git a/keyboards/lfkeyboards/lfk65_hs/rules.mk b/keyboards/lfkeyboards/lfk65_hs/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/lfkeyboards/lfk65_hs/rules.mk
+++ /dev/null
diff --git a/keyboards/lfkeyboards/lfk78/keymaps/default/keymap.c b/keyboards/lfkeyboards/lfk78/keymaps/default/keymap.c
index d81ed91814..c149ea04b4 100644
--- a/keyboards/lfkeyboards/lfk78/keymaps/default/keymap.c
+++ b/keyboards/lfkeyboards/lfk78/keymaps/default/keymap.c
@@ -70,11 +70,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_SAD, RGB_HUD, RGB_SAI
)
};
-
-void matrix_init_user(void) {
- // This keymap only has a single base layer, so reset the default if needed
- if (eeconfig_read_default_layer() > 1) {
- eeconfig_update_default_layer(1);
- default_layer_set(1);
- }
-}
diff --git a/keyboards/lfkeyboards/lfk78/keymaps/iso/keymap.c b/keyboards/lfkeyboards/lfk78/keymaps/iso/keymap.c
index 1f3ef6fc8e..d07d7de4e6 100644
--- a/keyboards/lfkeyboards/lfk78/keymaps/iso/keymap.c
+++ b/keyboards/lfkeyboards/lfk78/keymaps/iso/keymap.c
@@ -70,11 +70,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_SAD, RGB_HUD, RGB_SAI
)
};
-
-void matrix_init_user(void) {
- // This keymap only has a single base layer, so reset the default if needed
- if (eeconfig_read_default_layer() > 1) {
- eeconfig_update_default_layer(1);
- default_layer_set(1);
- }
-}
diff --git a/keyboards/lfkeyboards/lfk78/keymaps/split_bs_osx/keymap.c b/keyboards/lfkeyboards/lfk78/keymaps/split_bs_osx/keymap.c
index 041c3cdfd0..3073c47bf7 100644
--- a/keyboards/lfkeyboards/lfk78/keymaps/split_bs_osx/keymap.c
+++ b/keyboards/lfkeyboards/lfk78/keymaps/split_bs_osx/keymap.c
@@ -70,11 +70,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_SAD, RGB_HUD, RGB_SAI
)
};
-
-void matrix_init_user(void) {
- // This keymap only has a single base layer, so reset the default if needed
- if (eeconfig_read_default_layer() > 1) {
- eeconfig_update_default_layer(1);
- default_layer_set(1);
- }
-}
diff --git a/keyboards/lfkeyboards/lfk78/keymaps/via/keymap.c b/keyboards/lfkeyboards/lfk78/keymaps/via/keymap.c
index 88aa97da70..7ed2e71a7f 100644
--- a/keyboards/lfkeyboards/lfk78/keymaps/via/keymap.c
+++ b/keyboards/lfkeyboards/lfk78/keymaps/via/keymap.c
@@ -62,11 +62,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAD, RGB_HUD, RGB_SAI
)
};
-
-void matrix_init_user(void) {
- // This keymap only has a single base layer, so reset the default if needed
- if (eeconfig_read_default_layer() > 1) {
- eeconfig_update_default_layer(1);
- default_layer_set(1);
- }
-}
diff --git a/keyboards/lfkeyboards/lfk78/lfk78.c b/keyboards/lfkeyboards/lfk78/lfk78.c
index 50f1505050..3bf7c40d15 100644
--- a/keyboards/lfkeyboards/lfk78/lfk78.c
+++ b/keyboards/lfkeyboards/lfk78/lfk78.c
@@ -10,8 +10,8 @@ void matrix_init_kb(void) {
#ifndef AUDIO_ENABLE
// If we're not using the audio pin, drive it low
- setPinOutput(C6);
- writePinLow(C6);
+ gpio_set_pin_output(C6);
+ gpio_write_pin_low(C6);
#endif
#ifdef WATCHDOG_ENABLE
diff --git a/keyboards/lfkeyboards/lfk78/revb/info.json b/keyboards/lfkeyboards/lfk78/revb/keyboard.json
index ac98455afa..7a4d881692 100644
--- a/keyboards/lfkeyboards/lfk78/revb/info.json
+++ b/keyboards/lfkeyboards/lfk78/revb/keyboard.json
@@ -15,6 +15,12 @@
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": true,
+ "nkro": true
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/lfkeyboards/lfk78/revb/rules.mk b/keyboards/lfkeyboards/lfk78/revb/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/lfkeyboards/lfk78/revb/rules.mk
+++ /dev/null
diff --git a/keyboards/lfkeyboards/lfk78/revc/info.json b/keyboards/lfkeyboards/lfk78/revc/keyboard.json
index 7bfaf8cac6..e1788b6856 100644
--- a/keyboards/lfkeyboards/lfk78/revc/info.json
+++ b/keyboards/lfkeyboards/lfk78/revc/keyboard.json
@@ -15,6 +15,12 @@
"diode_direction": "COL2ROW",
"processor": "at90usb1286",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": true,
+ "nkro": true
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/lfkeyboards/lfk78/revc/rules.mk b/keyboards/lfkeyboards/lfk78/revc/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/lfkeyboards/lfk78/revc/rules.mk
+++ /dev/null
diff --git a/keyboards/lfkeyboards/lfk78/revj/info.json b/keyboards/lfkeyboards/lfk78/revj/keyboard.json
index f99df02ed9..725425f012 100644
--- a/keyboards/lfkeyboards/lfk78/revj/info.json
+++ b/keyboards/lfkeyboards/lfk78/revj/keyboard.json
@@ -15,6 +15,13 @@
"diode_direction": "COL2ROW",
"processor": "at90usb646",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": true,
+ "nkro": true,
+ "audio": true
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/lfkeyboards/lfk78/revj/rules.mk b/keyboards/lfkeyboards/lfk78/revj/rules.mk
deleted file mode 100644
index ef72559a0c..0000000000
--- a/keyboards/lfkeyboards/lfk78/revj/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-AUDIO_ENABLE = yes
diff --git a/keyboards/lfkeyboards/lfk78/rules.mk b/keyboards/lfkeyboards/lfk78/rules.mk
index 82ffed96f5..5ebd387c83 100644
--- a/keyboards/lfkeyboards/lfk78/rules.mk
+++ b/keyboards/lfkeyboards/lfk78/rules.mk
@@ -1,13 +1 @@
-# 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 = yes # Enable N-Key Rollover
-AUDIO_ENABLE = no # Audio output
-WATCHDOG_ENABLE = no # Resets keyboard if matrix_scan isn't run every 250ms
-
DEFAULT_FOLDER = lfkeyboards/lfk78/revj
diff --git a/keyboards/lfkeyboards/lfk87/info.json b/keyboards/lfkeyboards/lfk87/info.json
index 0b53928421..9b10936df8 100644
--- a/keyboards/lfkeyboards/lfk87/info.json
+++ b/keyboards/lfkeyboards/lfk87/info.json
@@ -3,6 +3,15 @@
"manufacturer": "LFKeyboards",
"url": "",
"maintainer": "qmk",
+ "features": {
+ "audio": true,
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true
+ },
"usb": {
"vid": "0xFEED",
"pid": "0x6060",
diff --git a/keyboards/lfkeyboards/lfk87/keymaps/default/keymap.c b/keyboards/lfkeyboards/lfk87/keymaps/default/keymap.c
index b9057e9047..84e4fbb59f 100644
--- a/keyboards/lfkeyboards/lfk87/keymaps/default/keymap.c
+++ b/keyboards/lfkeyboards/lfk87/keymaps/default/keymap.c
@@ -79,11 +79,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, RGB_SAD, RGB_HUD, RGB_SAI
)
};
-
-void matrix_init_user(void) {
- // This keymap only has a single base layer, so reset the default if needed
- if (eeconfig_read_default_layer() > 1) {
- eeconfig_update_default_layer(1);
- default_layer_set(1);
- }
-}
diff --git a/keyboards/lfkeyboards/lfk87/keymaps/iso/keymap.c b/keyboards/lfkeyboards/lfk87/keymaps/iso/keymap.c
index 510aa6730f..46286c3f32 100644
--- a/keyboards/lfkeyboards/lfk87/keymaps/iso/keymap.c
+++ b/keyboards/lfkeyboards/lfk87/keymaps/iso/keymap.c
@@ -79,11 +79,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_SAD, RGB_HUD, RGB_SAI
)
};
-
-void matrix_init_user(void) {
- // This keymap only has a single base layer, so reset the default if needed
- if (eeconfig_read_default_layer() > 1) {
- eeconfig_update_default_layer(1);
- default_layer_set(1);
- }
-}
diff --git a/keyboards/lfkeyboards/lfk87/lfk87.c b/keyboards/lfkeyboards/lfk87/lfk87.c
index 849f0ebcc5..480a44ea84 100644
--- a/keyboards/lfkeyboards/lfk87/lfk87.c
+++ b/keyboards/lfkeyboards/lfk87/lfk87.c
@@ -12,8 +12,8 @@ void matrix_init_kb(void)
matrix_init_user();
#ifndef AUDIO_ENABLE
// If we're not using the audio pin, drive it low
- setPinOutput(C6);
- writePinLow(C6);
+ gpio_set_pin_output(C6);
+ gpio_write_pin_low(C6);
#endif
#ifdef WATCHDOG_ENABLE
// This is done after turning the layer LED red, if we're caught in a loop
diff --git a/keyboards/lfkeyboards/lfk87/reva/info.json b/keyboards/lfkeyboards/lfk87/reva/keyboard.json
index 95b5ff81b7..95b5ff81b7 100644
--- a/keyboards/lfkeyboards/lfk87/reva/info.json
+++ b/keyboards/lfkeyboards/lfk87/reva/keyboard.json
diff --git a/keyboards/lfkeyboards/lfk87/reva/rules.mk b/keyboards/lfkeyboards/lfk87/reva/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/lfkeyboards/lfk87/reva/rules.mk
+++ /dev/null
diff --git a/keyboards/lfkeyboards/lfk87/revc/info.json b/keyboards/lfkeyboards/lfk87/revc/keyboard.json
index cf8c74397f..cf8c74397f 100644
--- a/keyboards/lfkeyboards/lfk87/revc/info.json
+++ b/keyboards/lfkeyboards/lfk87/revc/keyboard.json
diff --git a/keyboards/lfkeyboards/lfk87/revc/rules.mk b/keyboards/lfkeyboards/lfk87/revc/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/lfkeyboards/lfk87/revc/rules.mk
+++ /dev/null
diff --git a/keyboards/lfkeyboards/lfk87/rules.mk b/keyboards/lfkeyboards/lfk87/rules.mk
index 3a1399d693..05b80ac74a 100644
--- a/keyboards/lfkeyboards/lfk87/rules.mk
+++ b/keyboards/lfkeyboards/lfk87/rules.mk
@@ -1,14 +1 @@
-
-# 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 = yes # Enable N-Key Rollover
-AUDIO_ENABLE = yes # Audio output
-WATCHDOG_ENABLE = no # Resets keyboard if matrix_scan isn't run every 250ms
-
DEFAULT_FOLDER = lfkeyboards/lfk78/revc
diff --git a/keyboards/lfkeyboards/lfkpad/info.json b/keyboards/lfkeyboards/lfkpad/keyboard.json
index 0a41696cdc..50e02cb7ee 100644
--- a/keyboards/lfkeyboards/lfkpad/info.json
+++ b/keyboards/lfkeyboards/lfkpad/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x3231",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["F1", "F0", "D4", "D6"],
"rows": ["D5", "F4", "F6", "F7", "C7", "C6"]
diff --git a/keyboards/lfkeyboards/lfkpad/keymaps/default/keymap.c b/keyboards/lfkeyboards/lfkpad/keymaps/default/keymap.c
index 0aa720e400..05f42b8b98 100644
--- a/keyboards/lfkeyboards/lfkpad/keymaps/default/keymap.c
+++ b/keyboards/lfkeyboards/lfkpad/keymaps/default/keymap.c
@@ -21,11 +21,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
XXXXXXX, XXXXXXX, RGB_TOG
)
};
-
-void matrix_init_user(void) {
- // This keymap only has a single base layer, so reset the default if needed
- if (eeconfig_read_default_layer() > 1) {
- eeconfig_update_default_layer(1);
- default_layer_set(1);
- }
-}
diff --git a/keyboards/lfkeyboards/lfkpad/rules.mk b/keyboards/lfkeyboards/lfkpad/rules.mk
deleted file mode 100644
index 996d454d74..0000000000
--- a/keyboards/lfkeyboards/lfkpad/rules.mk
+++ /dev/null
@@ -1,11 +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
-AUDIO_ENABLE = no # Audio output
-WATCHDOG_ENABLE = no # Resets keyboard if matrix_scan() isn't run every 250ms
diff --git a/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c b/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c
index c2abd12843..7d6e267611 100644
--- a/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c
+++ b/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c
@@ -76,11 +76,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_SAD, RGB_HUD, RGB_SAI, XXXXXXX, XXXXXXX
)
};
-
-void matrix_init_user(void) {
- // This keymap only has a single base layer, so reset the default if needed
- if (eeconfig_read_default_layer() > 1) {
- eeconfig_update_default_layer(1);
- default_layer_set(1);
- }
-}
diff --git a/keyboards/lfkeyboards/mini1800/mini1800.c b/keyboards/lfkeyboards/mini1800/mini1800.c
index 2ca87cfdb6..6ac615f871 100644
--- a/keyboards/lfkeyboards/mini1800/mini1800.c
+++ b/keyboards/lfkeyboards/mini1800/mini1800.c
@@ -13,8 +13,8 @@ void matrix_init_kb(void)
matrix_init_user();
#ifndef AUDIO_ENABLE
// If we're not using the audio pin, drive it low
- setPinOutput(C6);
- writePinLow(C6);
+ gpio_set_pin_output(C6);
+ gpio_write_pin_low(C6);
#endif
_delay_ms(500);
#ifdef WATCHDOG_ENABLE
diff --git a/keyboards/lfkeyboards/mini1800/reva/info.json b/keyboards/lfkeyboards/mini1800/reva/info.json
deleted file mode 100644
index a0204033d8..0000000000
--- a/keyboards/lfkeyboards/mini1800/reva/info.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "processor": "at90usb1286",
- "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/lfkeyboards/mini1800/reva/keyboard.json b/keyboards/lfkeyboards/mini1800/reva/keyboard.json
new file mode 100644
index 0000000000..8d93a054e4
--- /dev/null
+++ b/keyboards/lfkeyboards/mini1800/reva/keyboard.json
@@ -0,0 +1,12 @@
+{
+ "processor": "at90usb1286",
+ "bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": true,
+ "nkro": true,
+ "audio": true,
+ "watchdog": true
+ }
+}
diff --git a/keyboards/lfkeyboards/mini1800/reva/rules.mk b/keyboards/lfkeyboards/mini1800/reva/rules.mk
deleted file mode 100644
index fa0a6ab5b7..0000000000
--- a/keyboards/lfkeyboards/mini1800/reva/rules.mk
+++ /dev/null
@@ -1,11 +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 = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-AUDIO_ENABLE = yes # Audio output
-WATCHDOG_ENABLE = yes # Resets keyboard if matrix_scan isn't run every 250ms
diff --git a/keyboards/lfkeyboards/mini1800/revc/info.json b/keyboards/lfkeyboards/mini1800/revc/info.json
deleted file mode 100644
index fd4b030c4e..0000000000
--- a/keyboards/lfkeyboards/mini1800/revc/info.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "processor": "at90usb646",
- "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/lfkeyboards/mini1800/revc/keyboard.json b/keyboards/lfkeyboards/mini1800/revc/keyboard.json
new file mode 100644
index 0000000000..408181d328
--- /dev/null
+++ b/keyboards/lfkeyboards/mini1800/revc/keyboard.json
@@ -0,0 +1,12 @@
+{
+ "processor": "at90usb646",
+ "bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": true,
+ "nkro": true,
+ "audio": true,
+ "watchdog": true
+ }
+}
diff --git a/keyboards/lfkeyboards/mini1800/revc/rules.mk b/keyboards/lfkeyboards/mini1800/revc/rules.mk
deleted file mode 100644
index fa0a6ab5b7..0000000000
--- a/keyboards/lfkeyboards/mini1800/revc/rules.mk
+++ /dev/null
@@ -1,11 +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 = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-AUDIO_ENABLE = yes # Audio output
-WATCHDOG_ENABLE = yes # Resets keyboard if matrix_scan isn't run every 250ms
diff --git a/keyboards/lfkeyboards/smk65/info.json b/keyboards/lfkeyboards/smk65/info.json
index fa21398129..0ecbf2ab95 100644
--- a/keyboards/lfkeyboards/smk65/info.json
+++ b/keyboards/lfkeyboards/smk65/info.json
@@ -3,6 +3,14 @@
"manufacturer": "LFKeyboards",
"url": "",
"maintainer": "qmk",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"usb": {
"vid": "0x4C46",
"device_version": "0.0.6"
diff --git a/keyboards/lfkeyboards/smk65/revb/info.json b/keyboards/lfkeyboards/smk65/revb/keyboard.json
index 148465d27d..148465d27d 100644
--- a/keyboards/lfkeyboards/smk65/revb/info.json
+++ b/keyboards/lfkeyboards/smk65/revb/keyboard.json
diff --git a/keyboards/lfkeyboards/smk65/revb/revb.c b/keyboards/lfkeyboards/smk65/revb/revb.c
index 8eb9b9afe2..f519b413b5 100644
--- a/keyboards/lfkeyboards/smk65/revb/revb.c
+++ b/keyboards/lfkeyboards/smk65/revb/revb.c
@@ -27,12 +27,12 @@ void matrix_init_kb(void)
#ifdef AUDIO_ENABLE
// audio_init() sets PB5 to output and drives it low, which breaks our matrix
// so reset PB5 to input
- setPinInput(B5);
- writePinHigh(B5);
+ gpio_set_pin_input(B5);
+ gpio_write_pin_high(B5);
#else
// If we're not using the audio pin, drive it low
- setPinOutput(C6);
- writePinLow(C6);
+ gpio_set_pin_output(C6);
+ gpio_write_pin_low(C6);
#endif
}
diff --git a/keyboards/lfkeyboards/smk65/revb/rules.mk b/keyboards/lfkeyboards/smk65/revb/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/lfkeyboards/smk65/revb/rules.mk
+++ /dev/null
diff --git a/keyboards/lfkeyboards/smk65/revf/info.json b/keyboards/lfkeyboards/smk65/revf/keyboard.json
index 63e9d0abc7..63e9d0abc7 100644
--- a/keyboards/lfkeyboards/smk65/revf/info.json
+++ b/keyboards/lfkeyboards/smk65/revf/keyboard.json
diff --git a/keyboards/lfkeyboards/smk65/revf/keymaps/via/keymap.c b/keyboards/lfkeyboards/smk65/revf/keymaps/via/keymap.c
index d2a22a09ec..9013d18189 100644
--- a/keyboards/lfkeyboards/smk65/revf/keymaps/via/keymap.c
+++ b/keyboards/lfkeyboards/smk65/revf/keymaps/via/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[1] = LAYOUT_all(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_F14, KC_F15,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
diff --git a/keyboards/lfkeyboards/smk65/revf/rules.mk b/keyboards/lfkeyboards/smk65/revf/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/lfkeyboards/smk65/revf/rules.mk
+++ /dev/null
diff --git a/keyboards/lfkeyboards/smk65/rules.mk b/keyboards/lfkeyboards/smk65/rules.mk
index 278378a421..b2d7497663 100644
--- a/keyboards/lfkeyboards/smk65/rules.mk
+++ b/keyboards/lfkeyboards/smk65/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 = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
DEFAULT_FOLDER = lfkeyboards/smk65/revb