diff options
author | Drashna Jael're <drashna@live.com> | 2021-10-11 20:36:47 -0700 |
---|---|---|
committer | Drashna Jael're <drashna@live.com> | 2021-10-11 20:36:47 -0700 |
commit | b34675555cbd9a71a797a7ebc2148cbf2e8f0efc (patch) | |
tree | 2d701310ccd3fc2c603d63536ab4a3c1d9b9381b /keyboards/planck/ez/glow/keymaps | |
parent | bcddde8738dbba48c548f1e3f12a10bbf60a65d8 (diff) | |
parent | d9e077468ab3446cbd7306a453a73dad2c1403e8 (diff) |
Merge commit 'd9e077468ab3446cbd7306a453a73dad2c1403e8' into firmware_21
Diffstat (limited to 'keyboards/planck/ez/glow/keymaps')
-rw-r--r-- | keyboards/planck/ez/glow/keymaps/glow/keymap.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/keyboards/planck/ez/glow/keymaps/glow/keymap.c b/keyboards/planck/ez/glow/keymaps/glow/keymap.c index 2cb68dfe95..37659fbc32 100644 --- a/keyboards/planck/ez/glow/keymaps/glow/keymap.c +++ b/keyboards/planck/ez/glow/keymaps/glow/keymap.c @@ -176,7 +176,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { float plover_gb_song[][2] = SONG(PLOVER_GOODBYE_SOUND); #endif -uint32_t layer_state_set_user(uint32_t state) { +layer_state_t layer_state_set_user(layer_state_t state) { return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); } @@ -256,7 +256,7 @@ uint16_t muse_counter = 0; uint8_t muse_offset = 70; uint16_t muse_tempo = 50; -bool encoder_update(bool clockwise) { +bool encoder_update_user(uint8_t index, bool clockwise) { if (muse_mode) { if (IS_LAYER_ON(_RAISE)) { if (clockwise) { @@ -293,7 +293,7 @@ bool encoder_update(bool clockwise) { return true; } -void dip_update(uint8_t index, bool active) { +bool dip_switch_update_user(uint8_t index, bool active) { switch (index) { case 0: if (active) { @@ -318,6 +318,7 @@ void dip_update(uint8_t index, bool active) { #endif } } + return true; } void matrix_scan_user(void) { |