Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed RGB_DISABLE_AFTER_TIMEOUT to be seconds based & small internals cleanup #6480

Merged
merged 2 commits into from
May 4, 2020
Merged

Fixed RGB_DISABLE_AFTER_TIMEOUT to be seconds based & small internals cleanup #6480

merged 2 commits into from
May 4, 2020

Conversation

XScorpion2
Copy link
Contributor

Description

This PR changes RGB_DISABLE_AFTER_TIMEOUT to be based on seconds, instead of some odd previous 1.2s per unit from before all the rgb matrix work. In addition this did a bit of code cleanup saving another 100 bytes depending on features used. Also fixed issues with timeouts / suspending at the wrong time not turning off all LEDs in some cases.

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

Issues Fixed or Closed by This PR

Checklist

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

@XScorpion2 XScorpion2 mentioned this pull request Aug 4, 2019
Closed
13 tasks
@drashna drashna requested a review from a team August 4, 2019 04:26
@XScorpion2 XScorpion2 mentioned this pull request Aug 5, 2019
Closed
13 tasks
@drashna
Copy link
Member

drashna commented Aug 8, 2019

Could the timeout be changed to milliseconds, actually?

A majority of the timing settings that we have already are in ms, so to keep things consistent and logical, it would make more sense.

@XScorpion2
Copy link
Contributor Author

@drashna so picky...and yes will do that.

@XScorpion2
Copy link
Contributor Author

@drashna fixed

@drashna drashna mentioned this pull request Aug 17, 2019
Closed
4 tasks
zvecr
zvecr requested changes Aug 24, 2019
View reviewed changes
docs/feature_rgb_matrix.md Outdated Show resolved Hide resolved
@zvecr zvecr added the breaking_change Changes that need to wait for a version increment label Aug 24, 2019
@zvecr zvecr mentioned this pull request Aug 26, 2019
Merged
13 tasks
@XScorpion2 XScorpion2 force-pushed the bugfix/rgb_timeout_fix branch from 666b21b to 8a0ba93 Compare August 31, 2019 02:38
@XScorpion2 XScorpion2 force-pushed the bugfix/rgb_timeout_fix branch from 8a0ba93 to 982a323 Compare September 16, 2019 03:06
@XScorpion2
Copy link
Contributor Author

Rebased on latest master, verified still working locally.
CI Failure is due to some unrelated issue in planck/rev1 default keymap.

zvecr
zvecr reviewed Sep 16, 2019
View reviewed changes
Copy link
Member

@zvecr zvecr left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@XScorpion2 thanks for putting in the upgrade behaviour for the TIMEOUT config option.

Quick question does the g_rgb_counters.tick to g_rgb_timer and rgb_frame_buffer to g_rgb_frame_buffer rename also throw upgrade issues with custom RGB Matrix effects?

@XScorpion2
Copy link
Contributor Author

XScorpion2 commented Sep 16, 2019 •
edited
Loading

@zvecr yes, the rename would cause an upgrade issue with custom effects.
Though it's a bit more than a rename as it splits the 2 timers inside of it out which helps a little with firmware size in a few locations.

@drashna
Copy link
Member

drashna commented Sep 21, 2019

Looks like there are some merge conflicts

@XScorpion2
Copy link
Contributor Author

@drashna not anymore

@XScorpion2 XScorpion2 force-pushed the bugfix/rgb_timeout_fix branch from 027d6a5 to 055ca5a Compare September 28, 2019 17:34
@XScorpion2 XScorpion2 force-pushed the bugfix/rgb_timeout_fix branch from 055ca5a to 7d28553 Compare October 26, 2019 14:47
@XScorpion2
Copy link
Contributor Author

Any word on when this might get approved?

@XScorpion2 XScorpion2 force-pushed the bugfix/rgb_timeout_fix branch from 7d28553 to dad3357 Compare November 9, 2019 17:43
@XScorpion2 XScorpion2 force-pushed the bugfix/rgb_timeout_fix branch from dad3357 to 47d4c44 Compare December 8, 2019 13:49
@XScorpion2 XScorpion2 mentioned this pull request Dec 25, 2019
Merged
6 tasks
@XScorpion2 XScorpion2 force-pushed the bugfix/rgb_timeout_fix branch from 47d4c44 to 92e0d01 Compare January 5, 2020 02:25
noroadsleft
noroadsleft requested changes May 2, 2020
View reviewed changes
Copy link
Member

@noroadsleft noroadsleft left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you revert the changes to users/xulkal/config.h? They're not truly necessary here and you have them on #9004.

Do that and we can merge this in.

@XScorpion2
Copy link
Contributor Author

crap, sure one min

@XScorpion2
Copy link
Contributor Author

Reverted unintended whitespace change

@XScorpion2
Copy link
Contributor Author

Looks like CI failure unrelated to changes, something like log parsing /uploading at the end failed but all tests before that passed.

noroadsleft
noroadsleft approved these changes May 3, 2020
View reviewed changes
Copy link
Member

@noroadsleft noroadsleft left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

__attribute__ ((weak)) ✔️

@noroadsleft noroadsleft merged commit 5281af4 into qmk:future May 4, 2020
@noroadsleft
Copy link
Member

Thanks!

noroadsleft pushed a commit that referenced this pull request May 15, 2020
@XScorpion2 @noroadsleft
Fixed RGB_DISABLE_AFTER_TIMEOUT to be seconds based & small internals…
a823d80 
… cleanup (#6480)

* Fixed RGB_DISABLE_AFTER_TIMEOUT to be seconds based & small internals cleanup

Fixing AVR int overflow compile error
Updated timeout to milliseconds
Clang Format for rebase

PR Feedback making RGB_DISABLE_AFTER_TIMEOUT obsolete in favor of RGB_DISABLE_TIMEOUT

* Reverting change
noroadsleft pushed a commit to noroadsleft/qmk_firmware that referenced this pull request May 22, 2020
@XScorpion2 @noroadsleft
Fixed RGB_DISABLE_AFTER_TIMEOUT to be seconds based & small internals…
2ab08ec 
… cleanup (qmk#6480)

* Fixed RGB_DISABLE_AFTER_TIMEOUT to be seconds based & small internals cleanup

Fixing AVR int overflow compile error
Updated timeout to milliseconds
Clang Format for rebase

PR Feedback making RGB_DISABLE_AFTER_TIMEOUT obsolete in favor of RGB_DISABLE_TIMEOUT

* Reverting change
noroadsleft pushed a commit to noroadsleft/qmk_firmware that referenced this pull request May 28, 2020
@XScorpion2 @noroadsleft
Fixed RGB_DISABLE_AFTER_TIMEOUT to be seconds based & small internals…
8ee571f 
… cleanup (qmk#6480)

* Fixed RGB_DISABLE_AFTER_TIMEOUT to be seconds based & small internals cleanup

Fixing AVR int overflow compile error
Updated timeout to milliseconds
Clang Format for rebase

PR Feedback making RGB_DISABLE_AFTER_TIMEOUT obsolete in favor of RGB_DISABLE_TIMEOUT

* Reverting change
noroadsleft added a commit that referenced this pull request May 30, 2020
@noroadsleft
2020 May 30 Breaking Changes Update (#9215)
fced377 
* Branch point for 2020 May 30 Breaking Change

* Migrate `ACTION_LAYER_TOGGLE` to `TG()` (#8954)

* Migrate `ACTION_MODS_ONESHOT` to `OSM()` (#8957)

* Migrate `ACTION_DEFAULT_LAYER_SET` to `DF()` (#8958)

* Migrate `ACTION_LAYER_MODS` to `LM()` (#8959)

* Migrate `ACTION_MODS_TAP_KEY` to `MT()` (#8968)

* Convert V-USB usbdrv to a submodule (#8321)

* Unify Tap Hold functions and documentation (#8348)

* Changing board names to prevent confusion (#8412)

* Move the Keyboardio Model01 to a keyboardio/ subdir (#8499)

* Move spaceman keyboards (#8830)

* Migrate miscellaneous `fn_actions` entries (#8977)

* Migrate `ACTION_MODS_KEY` to chained mod keycodes (#8979)

* Organizing my keyboards (plaid, tartan, ergoinu) (#8537)

* Refactor Lily58 to use split_common (#6260)

* Refactor zinc to use split_common (#7114)

* Add a message if bin/qmk doesn't work (#9000)

* Fix conflicting types for 'tfp_printf' (#8269)

* Fixed RGB_DISABLE_AFTER_TIMEOUT to be seconds based & small internals cleanup (#6480)

* Refactor and updates to TKC1800 code (#8472)

* Switch to qmk forks for everything (#9019)

* audio refactor: replace deprecated PLAY_NOTE_ARRAY (#8484)

* Audio enable corrections (2/3) (#8903)

* Split HHKB to ANSI and JP layouts and Add VIA support for each (#8582)

* Audio enable corrections (Part 4) (#8974)

* Fix typo from PR7114 (#9171)

* Augment future branch Changelogs (#8978)

* Revert "Branch point for 2020 May 30 Breaking Change"
@noroadsleft noroadsleft mentioned this pull request Jun 5, 2020
Merged
13 tasks
turky pushed a commit to turky/qmk_firmware that referenced this pull request Jun 13, 2020
@noroadsleft @turky
2020 May 30 Breaking Changes Update (qmk#9215)
f453aa2 
* Branch point for 2020 May 30 Breaking Change

* Migrate `ACTION_LAYER_TOGGLE` to `TG()` (qmk#8954)

* Migrate `ACTION_MODS_ONESHOT` to `OSM()` (qmk#8957)

* Migrate `ACTION_DEFAULT_LAYER_SET` to `DF()` (qmk#8958)

* Migrate `ACTION_LAYER_MODS` to `LM()` (qmk#8959)

* Migrate `ACTION_MODS_TAP_KEY` to `MT()` (qmk#8968)

* Convert V-USB usbdrv to a submodule (qmk#8321)

* Unify Tap Hold functions and documentation (qmk#8348)

* Changing board names to prevent confusion (qmk#8412)

* Move the Keyboardio Model01 to a keyboardio/ subdir (qmk#8499)

* Move spaceman keyboards (qmk#8830)

* Migrate miscellaneous `fn_actions` entries (qmk#8977)

* Migrate `ACTION_MODS_KEY` to chained mod keycodes (qmk#8979)

* Organizing my keyboards (plaid, tartan, ergoinu) (qmk#8537)

* Refactor Lily58 to use split_common (qmk#6260)

* Refactor zinc to use split_common (qmk#7114)

* Add a message if bin/qmk doesn't work (qmk#9000)

* Fix conflicting types for 'tfp_printf' (qmk#8269)

* Fixed RGB_DISABLE_AFTER_TIMEOUT to be seconds based & small internals cleanup (qmk#6480)

* Refactor and updates to TKC1800 code (qmk#8472)

* Switch to qmk forks for everything (qmk#9019)

* audio refactor: replace deprecated PLAY_NOTE_ARRAY (qmk#8484)

* Audio enable corrections (2/3) (qmk#8903)

* Split HHKB to ANSI and JP layouts and Add VIA support for each (qmk#8582)

* Audio enable corrections (Part 4) (qmk#8974)

* Fix typo from PR7114 (qmk#9171)

* Augment future branch Changelogs (qmk#8978)

* Revert "Branch point for 2020 May 30 Breaking Change"
jakobaa pushed a commit to jakobaa/qmk_firmware that referenced this pull request Jul 7, 2020
@noroadsleft @jakobaa
2020 May 30 Breaking Changes Update (qmk#9215)
1df4273 
* Branch point for 2020 May 30 Breaking Change

* Migrate `ACTION_LAYER_TOGGLE` to `TG()` (qmk#8954)

* Migrate `ACTION_MODS_ONESHOT` to `OSM()` (qmk#8957)

* Migrate `ACTION_DEFAULT_LAYER_SET` to `DF()` (qmk#8958)

* Migrate `ACTION_LAYER_MODS` to `LM()` (qmk#8959)

* Migrate `ACTION_MODS_TAP_KEY` to `MT()` (qmk#8968)

* Convert V-USB usbdrv to a submodule (qmk#8321)

* Unify Tap Hold functions and documentation (qmk#8348)

* Changing board names to prevent confusion (qmk#8412)

* Move the Keyboardio Model01 to a keyboardio/ subdir (qmk#8499)

* Move spaceman keyboards (qmk#8830)

* Migrate miscellaneous `fn_actions` entries (qmk#8977)

* Migrate `ACTION_MODS_KEY` to chained mod keycodes (qmk#8979)

* Organizing my keyboards (plaid, tartan, ergoinu) (qmk#8537)

* Refactor Lily58 to use split_common (qmk#6260)

* Refactor zinc to use split_common (qmk#7114)

* Add a message if bin/qmk doesn't work (qmk#9000)

* Fix conflicting types for 'tfp_printf' (qmk#8269)

* Fixed RGB_DISABLE_AFTER_TIMEOUT to be seconds based & small internals cleanup (qmk#6480)

* Refactor and updates to TKC1800 code (qmk#8472)

* Switch to qmk forks for everything (qmk#9019)

* audio refactor: replace deprecated PLAY_NOTE_ARRAY (qmk#8484)

* Audio enable corrections (2/3) (qmk#8903)

* Split HHKB to ANSI and JP layouts and Add VIA support for each (qmk#8582)

* Audio enable corrections (Part 4) (qmk#8974)

* Fix typo from PR7114 (qmk#9171)

* Augment future branch Changelogs (qmk#8978)

* Revert "Branch point for 2020 May 30 Breaking Change"
drashna pushed a commit to zsa/qmk_firmware that referenced this pull request Aug 9, 2020
@noroadsleft @drashna
2020 May 30 Breaking Changes Update (qmk#9215)
d9cebd5 
* Branch point for 2020 May 30 Breaking Change

* Migrate `ACTION_LAYER_TOGGLE` to `TG()` (qmk#8954)

* Migrate `ACTION_MODS_ONESHOT` to `OSM()` (qmk#8957)

* Migrate `ACTION_DEFAULT_LAYER_SET` to `DF()` (qmk#8958)

* Migrate `ACTION_LAYER_MODS` to `LM()` (qmk#8959)

* Migrate `ACTION_MODS_TAP_KEY` to `MT()` (qmk#8968)

* Convert V-USB usbdrv to a submodule (qmk#8321)

* Unify Tap Hold functions and documentation (qmk#8348)

* Changing board names to prevent confusion (qmk#8412)

* Move the Keyboardio Model01 to a keyboardio/ subdir (qmk#8499)

* Move spaceman keyboards (qmk#8830)

* Migrate miscellaneous `fn_actions` entries (qmk#8977)

* Migrate `ACTION_MODS_KEY` to chained mod keycodes (qmk#8979)

* Organizing my keyboards (plaid, tartan, ergoinu) (qmk#8537)

* Refactor Lily58 to use split_common (qmk#6260)

* Refactor zinc to use split_common (qmk#7114)

* Add a message if bin/qmk doesn't work (qmk#9000)

* Fix conflicting types for 'tfp_printf' (qmk#8269)

* Fixed RGB_DISABLE_AFTER_TIMEOUT to be seconds based & small internals cleanup (qmk#6480)

* Refactor and updates to TKC1800 code (qmk#8472)

* Switch to qmk forks for everything (qmk#9019)

* audio refactor: replace deprecated PLAY_NOTE_ARRAY (qmk#8484)

* Audio enable corrections (2/3) (qmk#8903)

* Split HHKB to ANSI and JP layouts and Add VIA support for each (qmk#8582)

* Audio enable corrections (Part 4) (qmk#8974)

* Fix typo from PR7114 (qmk#9171)

* Augment future branch Changelogs (qmk#8978)

* Revert "Branch point for 2020 May 30 Breaking Change"
@XScorpion2 XScorpion2 deleted the bugfix/rgb_timeout_fix branch November 21, 2020 18:23
sjmacneil pushed a commit to sjmacneil/qmk_firmware that referenced this pull request Feb 19, 2021
@noroadsleft @sjmacneil
2020 May 30 Breaking Changes Update (qmk#9215)
6829e84 
* Branch point for 2020 May 30 Breaking Change

* Migrate `ACTION_LAYER_TOGGLE` to `TG()` (qmk#8954)

* Migrate `ACTION_MODS_ONESHOT` to `OSM()` (qmk#8957)

* Migrate `ACTION_DEFAULT_LAYER_SET` to `DF()` (qmk#8958)

* Migrate `ACTION_LAYER_MODS` to `LM()` (qmk#8959)

* Migrate `ACTION_MODS_TAP_KEY` to `MT()` (qmk#8968)

* Convert V-USB usbdrv to a submodule (qmk#8321)

* Unify Tap Hold functions and documentation (qmk#8348)

* Changing board names to prevent confusion (qmk#8412)

* Move the Keyboardio Model01 to a keyboardio/ subdir (qmk#8499)

* Move spaceman keyboards (qmk#8830)

* Migrate miscellaneous `fn_actions` entries (qmk#8977)

* Migrate `ACTION_MODS_KEY` to chained mod keycodes (qmk#8979)

* Organizing my keyboards (plaid, tartan, ergoinu) (qmk#8537)

* Refactor Lily58 to use split_common (qmk#6260)

* Refactor zinc to use split_common (qmk#7114)

* Add a message if bin/qmk doesn't work (qmk#9000)

* Fix conflicting types for 'tfp_printf' (qmk#8269)

* Fixed RGB_DISABLE_AFTER_TIMEOUT to be seconds based & small internals cleanup (qmk#6480)

* Refactor and updates to TKC1800 code (qmk#8472)

* Switch to qmk forks for everything (qmk#9019)

* audio refactor: replace deprecated PLAY_NOTE_ARRAY (qmk#8484)

* Audio enable corrections (2/3) (qmk#8903)

* Split HHKB to ANSI and JP layouts and Add VIA support for each (qmk#8582)

* Audio enable corrections (Part 4) (qmk#8974)

* Fix typo from PR7114 (qmk#9171)

* Augment future branch Changelogs (qmk#8978)

* Revert "Branch point for 2020 May 30 Breaking Change"
BorisTestov pushed a commit to BorisTestov/qmk_firmware that referenced this pull request May 23, 2024
@noroadsleft
2020 May 30 Breaking Changes Update (qmk#9215)
629f5cb 
* Branch point for 2020 May 30 Breaking Change

* Migrate `ACTION_LAYER_TOGGLE` to `TG()` (qmk#8954)

* Migrate `ACTION_MODS_ONESHOT` to `OSM()` (qmk#8957)

* Migrate `ACTION_DEFAULT_LAYER_SET` to `DF()` (qmk#8958)

* Migrate `ACTION_LAYER_MODS` to `LM()` (qmk#8959)

* Migrate `ACTION_MODS_TAP_KEY` to `MT()` (qmk#8968)

* Convert V-USB usbdrv to a submodule (qmk#8321)

* Unify Tap Hold functions and documentation (qmk#8348)

* Changing board names to prevent confusion (qmk#8412)

* Move the Keyboardio Model01 to a keyboardio/ subdir (qmk#8499)

* Move spaceman keyboards (qmk#8830)

* Migrate miscellaneous `fn_actions` entries (qmk#8977)

* Migrate `ACTION_MODS_KEY` to chained mod keycodes (qmk#8979)

* Organizing my keyboards (plaid, tartan, ergoinu) (qmk#8537)

* Refactor Lily58 to use split_common (qmk#6260)

* Refactor zinc to use split_common (qmk#7114)

* Add a message if bin/qmk doesn't work (qmk#9000)

* Fix conflicting types for 'tfp_printf' (qmk#8269)

* Fixed RGB_DISABLE_AFTER_TIMEOUT to be seconds based & small internals cleanup (qmk#6480)

* Refactor and updates to TKC1800 code (qmk#8472)

* Switch to qmk forks for everything (qmk#9019)

* audio refactor: replace deprecated PLAY_NOTE_ARRAY (qmk#8484)

* Audio enable corrections (2/3) (qmk#8903)

* Split HHKB to ANSI and JP layouts and Add VIA support for each (qmk#8582)

* Audio enable corrections (Part 4) (qmk#8974)

* Fix typo from PR7114 (qmk#9171)

* Augment future branch Changelogs (qmk#8978)

* Revert "Branch point for 2020 May 30 Breaking Change"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@drashna drashna drashna approved these changes

@noroadsleft noroadsleft noroadsleft approved these changes

@zvecr zvecr Awaiting requested review from zvecr

@yanfali yanfali Awaiting requested review from yanfali

Assignees
No one assigned
Labels
breaking_change Changes that need to wait for a version increment core documentation enhancement
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@XScorpion2 @drashna @noroadsleft @yanfali @zvecr