aboutsummaryrefslogtreecommitdiff
path: root/keyboards/kiwikeebs
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/kiwikeebs')
-rw-r--r--keyboards/kiwikeebs/macro/keyboard.json (renamed from keyboards/kiwikeebs/macro/info.json)9
-rw-r--r--keyboards/kiwikeebs/macro/keymaps/default/keymap.c2
-rw-r--r--keyboards/kiwikeebs/macro/keymaps/via/keymap.c2
-rw-r--r--keyboards/kiwikeebs/macro/rules.mk13
-rw-r--r--keyboards/kiwikeebs/macro_v2/keyboard.json (renamed from keyboards/kiwikeebs/macro_v2/info.json)9
-rw-r--r--keyboards/kiwikeebs/macro_v2/keymaps/default/keymap.c2
-rw-r--r--keyboards/kiwikeebs/macro_v2/keymaps/via/keymap.c2
-rw-r--r--keyboards/kiwikeebs/macro_v2/rules.mk13
8 files changed, 22 insertions, 30 deletions
diff --git a/keyboards/kiwikeebs/macro/info.json b/keyboards/kiwikeebs/macro/keyboard.json
index 84b8afb982..d8bc9f3925 100644
--- a/keyboards/kiwikeebs/macro/info.json
+++ b/keyboards/kiwikeebs/macro/keyboard.json
@@ -8,6 +8,15 @@
"pid": "0x4712",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["F7", "B1", "B3", "B2"],
"rows": ["E6", "D7"]
diff --git a/keyboards/kiwikeebs/macro/keymaps/default/keymap.c b/keyboards/kiwikeebs/macro/keymaps/default/keymap.c
index b7f98c68ca..77c3603f8a 100644
--- a/keyboards/kiwikeebs/macro/keymaps/default/keymap.c
+++ b/keyboards/kiwikeebs/macro/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[_FN1] = LAYOUT(
QK_BOOT, KC_UP, _______,
- KC_LEFT, KC_DOWN, KC_RGHT, MAGIC_TOGGLE_NKRO
+ KC_LEFT, KC_DOWN, KC_RGHT, NK_TOGG
),
[_FN2] = LAYOUT(
_______, _______, _______,
diff --git a/keyboards/kiwikeebs/macro/keymaps/via/keymap.c b/keyboards/kiwikeebs/macro/keymaps/via/keymap.c
index 0641efab59..4aa89cab95 100644
--- a/keyboards/kiwikeebs/macro/keymaps/via/keymap.c
+++ b/keyboards/kiwikeebs/macro/keymaps/via/keymap.c
@@ -29,6 +29,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[_FN] = LAYOUT(
QK_BOOT, KC_UP, _______,
- KC_LEFT, KC_DOWN, KC_RGHT, MAGIC_TOGGLE_NKRO
+ KC_LEFT, KC_DOWN, KC_RGHT, NK_TOGG
)
};
diff --git a/keyboards/kiwikeebs/macro/rules.mk b/keyboards/kiwikeebs/macro/rules.mk
deleted file mode 100644
index f0a88209b6..0000000000
--- a/keyboards/kiwikeebs/macro/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 = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = yes \ No newline at end of file
diff --git a/keyboards/kiwikeebs/macro_v2/info.json b/keyboards/kiwikeebs/macro_v2/keyboard.json
index efdf6d860f..d9b693dd1a 100644
--- a/keyboards/kiwikeebs/macro_v2/info.json
+++ b/keyboards/kiwikeebs/macro_v2/keyboard.json
@@ -8,6 +8,15 @@
"pid": "0x4712",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["B6", "C6", "C7", "D4"],
"rows": ["B5", "B4"]
diff --git a/keyboards/kiwikeebs/macro_v2/keymaps/default/keymap.c b/keyboards/kiwikeebs/macro_v2/keymaps/default/keymap.c
index bfe8208a8b..0c66b20c91 100644
--- a/keyboards/kiwikeebs/macro_v2/keymaps/default/keymap.c
+++ b/keyboards/kiwikeebs/macro_v2/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[_FN1] = LAYOUT(
QK_BOOT, KC_UP, _______,
- KC_LEFT, KC_DOWN, KC_RGHT, MAGIC_TOGGLE_NKRO
+ KC_LEFT, KC_DOWN, KC_RGHT, NK_TOGG
),
[_FN2] = LAYOUT(
_______, _______, _______,
diff --git a/keyboards/kiwikeebs/macro_v2/keymaps/via/keymap.c b/keyboards/kiwikeebs/macro_v2/keymaps/via/keymap.c
index 0641efab59..4aa89cab95 100644
--- a/keyboards/kiwikeebs/macro_v2/keymaps/via/keymap.c
+++ b/keyboards/kiwikeebs/macro_v2/keymaps/via/keymap.c
@@ -29,6 +29,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[_FN] = LAYOUT(
QK_BOOT, KC_UP, _______,
- KC_LEFT, KC_DOWN, KC_RGHT, MAGIC_TOGGLE_NKRO
+ KC_LEFT, KC_DOWN, KC_RGHT, NK_TOGG
)
};
diff --git a/keyboards/kiwikeebs/macro_v2/rules.mk b/keyboards/kiwikeebs/macro_v2/rules.mk
deleted file mode 100644
index 131aa72aeb..0000000000
--- a/keyboards/kiwikeebs/macro_v2/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 = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = yes