aboutsummaryrefslogtreecommitdiff
path: root/keyboards/omkbd/ergodash
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/omkbd/ergodash')
-rw-r--r--keyboards/omkbd/ergodash/info.json5
-rw-r--r--keyboards/omkbd/ergodash/mini/keyboard.json (renamed from keyboards/omkbd/ergodash/mini/info.json)6
-rw-r--r--keyboards/omkbd/ergodash/mini/rules.mk3
-rw-r--r--keyboards/omkbd/ergodash/rev1/keyboard.json (renamed from keyboards/omkbd/ergodash/rev1/info.json)6
-rw-r--r--keyboards/omkbd/ergodash/rev1/keymaps/default/keymap.c15
-rw-r--r--keyboards/omkbd/ergodash/rev1/rules.mk3
-rw-r--r--keyboards/omkbd/ergodash/rules.mk15
7 files changed, 17 insertions, 36 deletions
diff --git a/keyboards/omkbd/ergodash/info.json b/keyboards/omkbd/ergodash/info.json
index 4369a04103..306a3970bb 100644
--- a/keyboards/omkbd/ergodash/info.json
+++ b/keyboards/omkbd/ergodash/info.json
@@ -1,4 +1,7 @@
{
"processor": "atmega32u4",
- "bootloader": "caterina"
+ "bootloader": "caterina",
+ "split": {
+ "enabled": true
+ }
}
diff --git a/keyboards/omkbd/ergodash/mini/info.json b/keyboards/omkbd/ergodash/mini/keyboard.json
index 4e4a13e93a..0423326177 100644
--- a/keyboards/omkbd/ergodash/mini/info.json
+++ b/keyboards/omkbd/ergodash/mini/keyboard.json
@@ -8,6 +8,12 @@
"pid": "0x6060",
"device_version": "1.0.0"
},
+ "features": {
+ "bootmagic": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
"rows": ["D7", "E6", "B4", "B5"]
diff --git a/keyboards/omkbd/ergodash/mini/rules.mk b/keyboards/omkbd/ergodash/mini/rules.mk
deleted file mode 100644
index bb9e33b082..0000000000
--- a/keyboards/omkbd/ergodash/mini/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-BACKLIGHT_ENABLE = no
-RGBLIGHT_ENABLE = no
-AUDIO_ENABLE = no
diff --git a/keyboards/omkbd/ergodash/rev1/info.json b/keyboards/omkbd/ergodash/rev1/keyboard.json
index b3ebe4648e..07405e22f7 100644
--- a/keyboards/omkbd/ergodash/rev1/info.json
+++ b/keyboards/omkbd/ergodash/rev1/keyboard.json
@@ -8,6 +8,12 @@
"pid": "0x6060",
"device_version": "1.0.0"
},
+ "features": {
+ "bootmagic": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
"rows": ["D4", "D7", "E6", "B4", "B5"]
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/default/keymap.c b/keyboards/omkbd/ergodash/rev1/keymaps/default/keymap.c
index 739e22c04e..f112f11394 100644
--- a/keyboards/omkbd/ergodash/rev1/keymaps/default/keymap.c
+++ b/keyboards/omkbd/ergodash/rev1/keymaps/default/keymap.c
@@ -9,8 +9,7 @@ enum layer_names {
};
enum custom_keycodes {
- QWERTY = SAFE_RANGE,
- LOWER,
+ LOWER = SAFE_RANGE,
RAISE,
ADJUST,
};
@@ -108,20 +107,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
float tone_qwerty[][2] = SONG(QWERTY_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:
- if (record->event.pressed) {
- print("mode just switched to qwerty and this is a huge string\n");
- set_single_persistent_default_layer(_QWERTY);
- }
- return false;
- break;
case LOWER:
if (record->event.pressed) {
layer_on(_LOWER);
diff --git a/keyboards/omkbd/ergodash/rev1/rules.mk b/keyboards/omkbd/ergodash/rev1/rules.mk
deleted file mode 100644
index bb9e33b082..0000000000
--- a/keyboards/omkbd/ergodash/rev1/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-BACKLIGHT_ENABLE = no
-RGBLIGHT_ENABLE = no
-AUDIO_ENABLE = no
diff --git a/keyboards/omkbd/ergodash/rules.mk b/keyboards/omkbd/ergodash/rules.mk
index 9a3cb95088..492cdde65d 100644
--- a/keyboards/omkbd/ergodash/rules.mk
+++ b/keyboards/omkbd/ergodash/rules.mk
@@ -1,16 +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 = 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 # Enables split keyboard support
-
DEFAULT_FOLDER = omkbd/ergodash/rev1