diff options
| author | Drashna Jaelre <drashna@live.com> | 2021-01-22 08:23:03 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-22 08:23:03 -0800 |
| commit | 7a08b9d374dfcf9d872738af44b231862064b96f (patch) | |
| tree | a83e16b5b6afd67b22fcbdf81ced5896554ca631 /users/drashna/rgb_matrix_stuff.c | |
| parent | c16a3dcb5458bc8d237d26c20a434c333b48d5c8 (diff) | |
| download | qmk_firmware-7a08b9d374dfcf9d872738af44b231862064b96f.tar.gz qmk_firmware-7a08b9d374dfcf9d872738af44b231862064b96f.zip | |
[Keymap] Cleanup and updating of drashna keymap code (#11516)
* Update other keyboards for rgb matrix changes
* Remove customized bootmagic code
* Fix corne layout compilation error
* Fix compiler errors with all keymaps
* Add Simple Visualizer for ergodox infinity
* Fix compile issue with Corne
* Fix keymap stuff
* Add alias for mouse layer
* Add Halmak Keyboard layout
* Updates for Kyria
* Add support for oled interval
* Change RGB stuff
[CHANGE] Fix coexistence issues
* Fix rgb_stuff
* Add custom ploopyco mouse keymap
* Decrease default dwell time
* Updates based on last breaking changes update
* Disable command on dactyl
* Update ergodox to use proper commands for rgb matrix indicators
* Update all rgb matrix indicator functions
* Update rules for dactyl-manuform
* Reduce wait time for mouse layer off event
* Add more info to logger
* Add wrappers for get_tapping term
* Move version.h include into only file that actually needs it
* Update rgb sleep stuff
* Update key print function
* Change DM keymap settings
* Change pin for DM Manuform
* Add Proton C stuff for Corne keymap
* more arm corne tinkering
* Even more arm stuff for corne
* Cleanup corne stuff
* redirect default keymap to drashna
because I am a very bad man
* change corne rgb priority
* Update tractyl manuform to not conflict
* Add more secret stuff
* more dactyl tweaks
* Add more options to split transport
* Changes of oled support
* Change split settings
* Improve keylogger formatting more
* tweak oled stuff
* Oled and such tweaks
* Reduce brightness due to leds
* Decrease brightness more
* Only run layer code if master
Diffstat (limited to 'users/drashna/rgb_matrix_stuff.c')
| -rw-r--r-- | users/drashna/rgb_matrix_stuff.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/users/drashna/rgb_matrix_stuff.c b/users/drashna/rgb_matrix_stuff.c index 52e261234..573cc7bc9 100644 --- a/users/drashna/rgb_matrix_stuff.c +++ b/users/drashna/rgb_matrix_stuff.c | |||
| @@ -26,7 +26,7 @@ static uint32_t hypno_timer; | |||
| 26 | # define RGB_MATRIX_REST_MODE RGB_MATRIX_CYCLE_OUT_IN | 26 | # define RGB_MATRIX_REST_MODE RGB_MATRIX_CYCLE_OUT_IN |
| 27 | #endif | 27 | #endif |
| 28 | 28 | ||
| 29 | void rgb_matrix_layer_helper(uint8_t hue, uint8_t sat, uint8_t val, uint8_t mode, uint8_t speed, uint8_t led_type) { | 29 | void rgb_matrix_layer_helper(uint8_t hue, uint8_t sat, uint8_t val, uint8_t mode, uint8_t speed, uint8_t led_type, uint8_t led_min, uint8_t led_max) { |
| 30 | HSV hsv = {hue, sat, val}; | 30 | HSV hsv = {hue, sat, val}; |
| 31 | if (hsv.v > rgb_matrix_get_val()) { | 31 | if (hsv.v > rgb_matrix_get_val()) { |
| 32 | hsv.v = rgb_matrix_get_val(); | 32 | hsv.v = rgb_matrix_get_val(); |
| @@ -40,7 +40,7 @@ void rgb_matrix_layer_helper(uint8_t hue, uint8_t sat, uint8_t val, uint8_t mode | |||
| 40 | RGB rgb = hsv_to_rgb(hsv); | 40 | RGB rgb = hsv_to_rgb(hsv); |
| 41 | for (uint8_t i = 0; i < DRIVER_LED_TOTAL; i++) { | 41 | for (uint8_t i = 0; i < DRIVER_LED_TOTAL; i++) { |
| 42 | if (HAS_FLAGS(g_led_config.flags[i], led_type)) { | 42 | if (HAS_FLAGS(g_led_config.flags[i], led_type)) { |
| 43 | rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b); | 43 | RGB_MATRIX_INDICATOR_SET_COLOR(i, rgb.r, rgb.g, rgb.b); |
| 44 | } | 44 | } |
| 45 | } | 45 | } |
| 46 | break; | 46 | break; |
| @@ -50,7 +50,7 @@ void rgb_matrix_layer_helper(uint8_t hue, uint8_t sat, uint8_t val, uint8_t mode | |||
| 50 | RGB rgb = hsv_to_rgb(hsv); | 50 | RGB rgb = hsv_to_rgb(hsv); |
| 51 | for (uint8_t i = 0; i < DRIVER_LED_TOTAL; i++) { | 51 | for (uint8_t i = 0; i < DRIVER_LED_TOTAL; i++) { |
| 52 | if (HAS_FLAGS(g_led_config.flags[i], led_type)) { | 52 | if (HAS_FLAGS(g_led_config.flags[i], led_type)) { |
| 53 | rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b); | 53 | RGB_MATRIX_INDICATOR_SET_COLOR(i, rgb.r, rgb.g, rgb.b); |
| 54 | } | 54 | } |
| 55 | } | 55 | } |
| 56 | break; | 56 | break; |
