summaryrefslogtreecommitdiff
path: root/keyboards/ergodox_ez/keymaps
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2019-08-21 17:19:07 -0700
committerGitHub <noreply@github.com>2019-08-21 17:19:07 -0700
commit94efa18c28c8c0e08526c9665a8f0d6a4e7d3e96 (patch)
treef45a54ddfa7a8ec4539c78bbadeb1d3960727f2e /keyboards/ergodox_ez/keymaps
parent1c5b0cbbeb049b1ce3fb2da6a81fbf83dd9a3ea7 (diff)
[Keyboard] Updates to ZSA boards (#6513)
* Update Layer functions to use layer_state_t in ZSA Boards * Update Music Mask for ZSA boards Fixes an issue with the board getting stuck on Adjust layer when activating music mode * Add Support for SMART LED Toggle to Planck EZ * Add support for SMART LED toggle in Ergodox EZ * Ifdef swiss cheeze for Oryx Configurator * Documentation and updates * Add Oryx Keymap * Add option to configure the layers for the Layer Indicator * Update keymap with better examples * Make sure eeprom is initialized before reading from it * Force flush of LED matrix when suspending board This fixes an issue where the LEDs don't fully clear sometimes when the host system goes to sleep * Enable RGB Sleeping by default * Add clarification about planck ez led layer config
Diffstat (limited to 'keyboards/ergodox_ez/keymaps')
-rw-r--r--keyboards/ergodox_ez/keymaps/default/keymap.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/keyboards/ergodox_ez/keymaps/default/keymap.c b/keyboards/ergodox_ez/keymaps/default/keymap.c
index 40d0a1eaf0..fb3d3896bf 100644
--- a/keyboards/ergodox_ez/keymaps/default/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/default/keymap.c
@@ -6,7 +6,11 @@
#define MDIA 2 // media keys
enum custom_keycodes {
+#ifdef ORYX_CONFIGURATOR
+ EPRM = EZ_SAFE_RANGE,
+#else
EPRM = SAFE_RANGE,
+#endif
VRSN,
RGB_SLD
};
@@ -164,7 +168,7 @@ void matrix_init_user(void) {
};
// Runs whenever there is a layer state change.
-uint32_t layer_state_set_user(uint32_t state) {
+layer_state_t layer_state_set_user(layer_state_t state) {
ergodox_board_led_off();
ergodox_right_led_1_off();
ergodox_right_led_2_off();