summaryrefslogtreecommitdiff
path: root/keyboards/planck
diff options
context:
space:
mode:
authorDrashna Jael're <drashna@live.com>2020-01-14 17:51:28 -0800
committerFlorian Didron <fdidron@users.noreply.github.com>2020-02-26 10:15:12 +0900
commitbd9df627137230a0b333ab48f1e90130404d782b (patch)
tree4f1c18605fa3c5a8b27af500a4a06f46820572b8 /keyboards/planck
parent5ed3ecdd73913ee484777ab33840f3ece5d3571f (diff)
Add Oryx keymap, etc
Diffstat (limited to 'keyboards/planck')
-rw-r--r--keyboards/planck/ez/ez.c2
-rw-r--r--keyboards/planck/keymaps/oryx/keymap.c17
-rw-r--r--keyboards/planck/keymaps/oryx/rules.mk1
3 files changed, 2 insertions, 18 deletions
diff --git a/keyboards/planck/ez/ez.c b/keyboards/planck/ez/ez.c
index 1e8a9d4e12..aca2c4dd5d 100644
--- a/keyboards/planck/ez/ez.c
+++ b/keyboards/planck/ez/ez.c
@@ -346,7 +346,7 @@ bool music_mask_kb(uint16_t keycode) {
}
}
#endif
-#ifdef WEBUSB_ENABLE
+#ifdef ORYX_ENABLE
static uint16_t loops = 0;
static bool is_on = false;
diff --git a/keyboards/planck/keymaps/oryx/keymap.c b/keyboards/planck/keymaps/oryx/keymap.c
index 46737dbf7b..a1e9ae4636 100644
--- a/keyboards/planck/keymaps/oryx/keymap.c
+++ b/keyboards/planck/keymaps/oryx/keymap.c
@@ -130,22 +130,5 @@ bool music_mask_user(uint16_t keycode) {
}
}
uint32_t layer_state_set_user(uint32_t state) {
- palClearPad(GPIOB, 8);
- palClearPad(GPIOB, 9);
- uint8_t layer = biton32(state);
- switch (layer) {
- case _LOWER:
- palSetPad(GPIOB, 9);
- break;
- case _RAISE:
- palSetPad(GPIOB, 8);
- break;
- case _ADJUST:
- palSetPad(GPIOB, 9);
- palSetPad(GPIOB, 8);
- break;
- default:
- break;
- }
return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
}
diff --git a/keyboards/planck/keymaps/oryx/rules.mk b/keyboards/planck/keymaps/oryx/rules.mk
index 8b256e2a9c..27ab9be851 100644
--- a/keyboards/planck/keymaps/oryx/rules.mk
+++ b/keyboards/planck/keymaps/oryx/rules.mk
@@ -3,3 +3,4 @@ SRC += muse.c
# See rules at https://docs.qmk.fm/#/config_options?id=the-rulesmk-file
COMMAND_ENABLE = no
MOUSEKEY_ENABLE = no
+ORYX_ENABLE = yes