aboutsummaryrefslogtreecommitdiff
path: root/keyboards/keebio/nyquist
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/keebio/nyquist')
-rw-r--r--keyboards/keebio/nyquist/keymaps/default/keymap.c11
-rw-r--r--keyboards/keebio/nyquist/keymaps/tester/keymap.c13
-rw-r--r--keyboards/keebio/nyquist/rev1/keyboard.json (renamed from keyboards/keebio/nyquist/rev1/info.json)9
-rw-r--r--keyboards/keebio/nyquist/rev1/rules.mk14
-rw-r--r--keyboards/keebio/nyquist/rev2/keyboard.json (renamed from keyboards/keebio/nyquist/rev2/info.json)11
-rw-r--r--keyboards/keebio/nyquist/rev2/rules.mk14
-rw-r--r--keyboards/keebio/nyquist/rev3/keyboard.json (renamed from keyboards/keebio/nyquist/rev3/info.json)11
-rw-r--r--keyboards/keebio/nyquist/rev3/rules.mk14
-rw-r--r--keyboards/keebio/nyquist/rev4/keyboard.json (renamed from keyboards/keebio/nyquist/rev4/info.json)0
9 files changed, 38 insertions, 59 deletions
diff --git a/keyboards/keebio/nyquist/keymaps/default/keymap.c b/keyboards/keebio/nyquist/keymaps/default/keymap.c
index 8bf16240fb..df399d355f 100644
--- a/keyboards/keebio/nyquist/keymaps/default/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/default/keymap.c
@@ -162,11 +162,6 @@ float tone_dvorak[][2] = SONG(DVORAK_SOUND);
float tone_colemak[][2] = SONG(COLEMAK_SOUND);
#endif
-void persistent_default_layer_set(uint16_t default_layer) {
- eeconfig_update_default_layer(default_layer);
- default_layer_set(default_layer);
-}
-
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
case QWERTY:
@@ -174,7 +169,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
#ifdef AUDIO_ENABLE
PLAY_SONG(tone_qwerty);
#endif
- persistent_default_layer_set(1UL<<_QWERTY);
+ set_single_persistent_default_layer(_QWERTY);
}
return false;
break;
@@ -183,7 +178,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
#ifdef AUDIO_ENABLE
PLAY_SONG(tone_colemak);
#endif
- persistent_default_layer_set(1UL<<_COLEMAK);
+ set_single_persistent_default_layer(_COLEMAK);
}
return false;
break;
@@ -192,7 +187,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
#ifdef AUDIO_ENABLE
PLAY_SONG(tone_dvorak);
#endif
- persistent_default_layer_set(1UL<<_DVORAK);
+ set_single_persistent_default_layer(_DVORAK);
}
return false;
break;
diff --git a/keyboards/keebio/nyquist/keymaps/tester/keymap.c b/keyboards/keebio/nyquist/keymaps/tester/keymap.c
index 6109661ffd..7ed85044ca 100644
--- a/keyboards/keebio/nyquist/keymaps/tester/keymap.c
+++ b/keyboards/keebio/nyquist/keymaps/tester/keymap.c
@@ -11,7 +11,7 @@ extern keymap_config_t keymap_config;
#define _DVORAK 2
#define _LOWER 3
#define _RAISE 4
-#define _ADJUST 16
+#define _ADJUST 5
enum custom_keycodes {
QWERTY = SAFE_RANGE,
@@ -159,11 +159,6 @@ float tone_dvorak[][2] = SONG(DVORAK_SOUND);
float tone_colemak[][2] = SONG(COLEMAK_SOUND);
#endif
-void persistent_default_layer_set(uint16_t default_layer) {
- eeconfig_update_default_layer(default_layer);
- default_layer_set(default_layer);
-}
-
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
case QWERTY:
@@ -171,7 +166,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
#ifdef AUDIO_ENABLE
PLAY_SONG(tone_qwerty);
#endif
- persistent_default_layer_set(1UL<<_QWERTY);
+ set_single_persistent_default_layer(_QWERTY);
}
return false;
break;
@@ -180,7 +175,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
#ifdef AUDIO_ENABLE
PLAY_SONG(tone_colemak);
#endif
- persistent_default_layer_set(1UL<<_COLEMAK);
+ set_single_persistent_default_layer(_COLEMAK);
}
return false;
break;
@@ -189,7 +184,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
#ifdef AUDIO_ENABLE
PLAY_SONG(tone_dvorak);
#endif
- persistent_default_layer_set(1UL<<_DVORAK);
+ set_single_persistent_default_layer(_DVORAK);
}
return false;
break;
diff --git a/keyboards/keebio/nyquist/rev1/info.json b/keyboards/keebio/nyquist/rev1/keyboard.json
index cd729aa87b..717b49e971 100644
--- a/keyboards/keebio/nyquist/rev1/info.json
+++ b/keyboards/keebio/nyquist/rev1/keyboard.json
@@ -4,12 +4,21 @@
"pid": "0x1156",
"device_version": "1.0.0"
},
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
"rows": ["D4", "D7", "E6", "B4", "B5"]
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D0"
},
"rgblight": {
diff --git a/keyboards/keebio/nyquist/rev1/rules.mk b/keyboards/keebio/nyquist/rev1/rules.mk
deleted file mode 100644
index 714a247e2b..0000000000
--- a/keyboards/keebio/nyquist/rev1/rules.mk
+++ /dev/null
@@ -1,14 +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 = 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.
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/keebio/nyquist/rev2/info.json b/keyboards/keebio/nyquist/rev2/keyboard.json
index f6b80cb946..435cdd189f 100644
--- a/keyboards/keebio/nyquist/rev2/info.json
+++ b/keyboards/keebio/nyquist/rev2/keyboard.json
@@ -4,6 +4,16 @@
"pid": "0x2156",
"device_version": "2.0.0"
},
+ "features": {
+ "backlight": true,
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["D2", "F5", "F6", "F7", "B1", "B3"],
"rows": ["D4", "D7", "E6", "B4", "B5"]
@@ -21,6 +31,7 @@
"pin": "D3"
},
"split": {
+ "enabled": true,
"soft_serial_pin": "D0"
},
"processor": "atmega32u4",
diff --git a/keyboards/keebio/nyquist/rev2/rules.mk b/keyboards/keebio/nyquist/rev2/rules.mk
deleted file mode 100644
index 83432f0b5e..0000000000
--- a/keyboards/keebio/nyquist/rev2/rules.mk
+++ /dev/null
@@ -1,14 +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 = yes # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/keebio/nyquist/rev3/info.json b/keyboards/keebio/nyquist/rev3/keyboard.json
index 9b3cc6d15a..80e5a10a17 100644
--- a/keyboards/keebio/nyquist/rev3/info.json
+++ b/keyboards/keebio/nyquist/rev3/keyboard.json
@@ -4,6 +4,16 @@
"pid": "0x3156",
"device_version": "3.0.0"
},
+ "features": {
+ "backlight": true,
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["F1", "F4", "B7", "D2", "D3", "D4"],
"rows": ["F0", "F5", "D7", "F6", "F7"]
@@ -14,6 +24,7 @@
"levels": 7
},
"split": {
+ "enabled": true,
"soft_serial_pin": "D0"
},
"rgblight": {
diff --git a/keyboards/keebio/nyquist/rev3/rules.mk b/keyboards/keebio/nyquist/rev3/rules.mk
deleted file mode 100644
index 83432f0b5e..0000000000
--- a/keyboards/keebio/nyquist/rev3/rules.mk
+++ /dev/null
@@ -1,14 +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 = yes # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/keebio/nyquist/rev4/info.json b/keyboards/keebio/nyquist/rev4/keyboard.json
index 804d1aa5d4..804d1aa5d4 100644
--- a/keyboards/keebio/nyquist/rev4/info.json
+++ b/keyboards/keebio/nyquist/rev4/keyboard.json