diff options
author | Drashna Jaelre <drashna@live.com> | 2019-05-19 10:01:16 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-19 10:01:16 -0700 |
commit | 6b8be985551efc5a5f95dfea6dc1554352bc46e0 (patch) | |
tree | cb0db9437ef27eef7c07a26f985a615d17a4d794 /users/drashna/drashna.c | |
parent | 2a8fd5823244eb1c7e8906b4118f01d2078c4e28 (diff) | |
parent | 89e9785d7a87e8dbb941dd272c032f34658169fd (diff) | |
download | firmware-6b8be985551efc5a5f95dfea6dc1554352bc46e0.tar.gz firmware-6b8be985551efc5a5f95dfea6dc1554352bc46e0.tar.bz2 firmware-6b8be985551efc5a5f95dfea6dc1554352bc46e0.zip |
[Keymap] Drashna Corne Keyboard updates (#5903)
* Re-enable Audio
And there was much rejoicingmake keebio/iris/rev2:drashna AUDIO_ENABLE=yes!
* Re-add debounce to ergodox EZ
* Fix rgb matrix helper function
* Make sure that RGM Matrix is checked properly
* Fix merge commit?
* Disable more RGB matrix modes
* Increase Debounce for Ergodox EZ
The performance improvements have made it necessary, actually
* Consolidate RGB Matrix layer indication function
And changes to iris
* Fix lighting issue for gamepad
* Update Corne Keyboard configuration
* Update Corne Keyboard layout
* Update KC_MAKE macro to better handle crkbd split
* Tweaks to Corne Keyboard Layout
* Enable RGB Matrix Sleep
* Update my code to use layer_state_t typedef
Diffstat (limited to 'users/drashna/drashna.c')
-rw-r--r-- | users/drashna/drashna.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/users/drashna/drashna.c b/users/drashna/drashna.c index 7c60a2e4a..acc6b9f9e 100644 --- a/users/drashna/drashna.c +++ b/users/drashna/drashna.c @@ -187,13 +187,13 @@ void matrix_scan_user(void) { __attribute__ ((weak)) -uint32_t layer_state_set_keymap (uint32_t state) { +layer_state_t layer_state_set_keymap (layer_state_t state) { return state; } // on layer change, no matter where the change was initiated // Then runs keymap's layer change check -uint32_t layer_state_set_user(uint32_t state) { +layer_state_t layer_state_set_user(layer_state_t state) { state = update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST); #ifdef RGBLIGHT_ENABLE state = layer_state_set_rgb(state); @@ -203,12 +203,12 @@ uint32_t layer_state_set_user(uint32_t state) { __attribute__ ((weak)) -uint32_t default_layer_state_set_keymap (uint32_t state) { +layer_state_t default_layer_state_set_keymap (layer_state_t state) { return state; } // Runs state check and changes underglow color and animation -uint32_t default_layer_state_set_user(uint32_t state) { +layer_state_t default_layer_state_set_user(layer_state_t state) { state = default_layer_state_set_keymap(state); #if 0 #ifdef RGBLIGHT_ENABLE |