Add dilemma max layer indicator #47
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
set max brightness to 128 pending testing migrate rgbmatrix layout macro to info.json migrate other settings to info.json add default keymap and readme add via keymap readme
KLE and Via JSONs should not be included in qmk_firmware
Still pending testing to validate coordinates Add copyright lines
some things were only working because "processor: RP2040" defaults to GENERIC_PROMICRO_RP2040. explicitly set "board": "GENERIC_RP_RP2040" instead. correctly enable SPI0 and SPID0 instead of SPI1
Forgot to move rgb matrix animations to info.json Didn't realise RGB_MATRIX_CENTER had an info.json mapping Missed migrating some rules.mk options to info.json
per requested changes Co-authored-by: Joel Challis <[email protected]>
per requested changes Co-authored-by: Joel Challis <[email protected]>
per requested changes Co-authored-by: Joel Challis <[email protected]>
per requested changes Co-authored-by: Joel Challis <[email protected]>
per requested changes Co-authored-by: Joel Challis <[email protected]>
Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: Drashna Jaelre <[email protected]>
casuanoob
reviewed
Dec 15, 2023
casuanoob
reviewed
Dec 15, 2023
|
Thanks casua! |
0xcharly
requested changes
Dec 15, 2023
0xcharly
requested changes
Dec 16, 2023
|
The brightness increases for layer and capslock indicators are now configurable from the keymap level with defines. Todo:
|
burkfers
force-pushed
the
bk_dilemma_4x6_4_layer_indicator
branch
from
501c89a to
7b949b7
Compare
|
Looks like this needs to be rebased. I've updated |
…emma_4x6_4_layer_indicator
Instead of rewriting for breaking change, simply removed akin to new 3x5_3 on qmk:develop
burkfers
force-pushed
the
bk_dilemma_4x6_4_layer_indicator
branch
from
f72b320 to
f7dc909
Compare
|
Freshly rebased. Instead of rewriting shutdown_user() to fit the breaking change, I've opted to simply remove it to match @casuanoob 's new Dilemma 3x5 implementation that's already been accepted into Behavior is correct in hardware, but please have a quick look to verify I didn't resolve a conflict in the wrong direction again. |
I think you need to rebase against |
|
Huh, I'm sure I had rebased it on top of The foot of this PR also says it's able to merge cleanly into the base branch. |
Hmm, this is not what I'm seeing… 
|
0xcharly
pushed a commit
that referenced
this pull request
Apr 8, 2024
* tentatively add dilemma 4x6_4 WIP untested * Add dilemma 4x6_4 WIP set max brightness to 128 pending testing migrate rgbmatrix layout macro to info.json migrate other settings to info.json add default keymap and readme add via keymap readme * 4x6_4 Remove files that shouldn't be in main KLE and Via JSONs should not be included in qmk_firmware * 4x6_4 Add RGBMATRIX coordinates in info.json WIP Still pending testing to validate coordinates Add copyright lines * 4x6_4 Change RGB matrix centre * 4x6_4 update rgb flags for outer columns * 4x6_4 add swap_hands config from Drashna * 4x6_4 explicitly set some defaults some things were only working because "processor: RP2040" defaults to GENERIC_PROMICRO_RP2040. explicitly set "board": "GENERIC_RP_RP2040" instead. correctly enable SPI0 and SPID0 instead of SPI1 * Update dilemma/readme.md * 4x6_4 migrate more items to info.json Forgot to move rgb matrix animations to info.json Didn't realise RGB_MATRIX_CENTER had an info.json mapping Missed migrating some rules.mk options to info.json * Update keyboards/bastardkb/dilemma/4x6_4/rules.mk per requested changes Co-authored-by: Joel Challis <[email protected]> * Update keyboards/bastardkb/dilemma/4x6_4/rules.mk per requested changes Co-authored-by: Joel Challis <[email protected]> * Update keyboards/bastardkb/dilemma/4x6_4/keymaps/via/config.h per requested changes Co-authored-by: Joel Challis <[email protected]> * Update keyboards/bastardkb/dilemma/4x6_4/keymaps/via/keymap.c per requested changes Co-authored-by: Joel Challis <[email protected]> * Update keyboards/bastardkb/dilemma/4x6_4/config.h per requested changes Co-authored-by: Joel Challis <[email protected]> * 4x6_4/config.h formatting change per review request Co-authored-by: Drashna Jaelre <[email protected]> * 4x6_4/info.json formatting change per review request Co-authored-by: Drashna Jaelre <[email protected]> * Add layer indicators * Use predefined rgb colors for layers * Refactor layer indicators from keymap to keyboard * swap encoder volume directions for CW=volup * Revert wrong conflict solutions following review * Update keyboards/bastardkb/dilemma/4x6_4/info.json * Update keyboards/bastardkb/dilemma/4x6_4/config.h * Update keyboards/bastardkb/dilemma/4x6_4/keymaps/default/readme.md * Update keyboards/bastardkb/dilemma/4x6_4/config.h * Apply suggested changes from code review * Apply suggested changes from code review * Break the brightness interval out into defines for configurability from keymap * Formatting * Add documentation for indicator brightness boosts * narrow scope of kb-internal function * fix type of counting variable * remove unneccessary condition * Remove shutdown_user Instead of rewriting for breaking change, simply removed akin to new 3x5_3 on qmk:develop * Formatting --------- Co-authored-by: casuanoob <[email protected]> Co-authored-by: casuanoob <[email protected]> Co-authored-by: Joel Challis <[email protected]> Co-authored-by: Drashna Jaelre <[email protected]> Co-authored-by: Ying Kun Zhan <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR adds the layer indicators by @ykz89 to the Max.