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.

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

Add dilemma max layer indicator #47

Merged
Merged
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
54011ee
tentatively add dilemma 4x6_4 WIP untested
casuanoob Aug 31, 2023
e4ade6e
Add dilemma 4x6_4 WIP
casuanoob Sep 6, 2023
bb1ba38
4x6_4 Remove files that shouldn't be in main
casuanoob Sep 7, 2023
84c18cf
4x6_4 Add RGBMATRIX coordinates in info.json WIP
casuanoob Sep 7, 2023
73086b7
4x6_4 Change RGB matrix centre
casuanoob Sep 9, 2023
a6468c4
4x6_4 update rgb flags for outer columns
casuanoob Sep 9, 2023
c0ef5e8
4x6_4 add swap_hands config from Drashna
casuanoob Sep 9, 2023
c9619bf
4x6_4 explicitly set some defaults
casuanoob Sep 14, 2023
a07a7ac
Update dilemma/readme.md
casuanoob Sep 18, 2023
c6a727a
4x6_4 migrate more items to info.json
casuanoob Sep 18, 2023
fb0d06e
Update keyboards/bastardkb/dilemma/4x6_4/rules.mk
casuanoob Sep 18, 2023
ea311b8
Update keyboards/bastardkb/dilemma/4x6_4/rules.mk
casuanoob Sep 18, 2023
212d9f1
Update keyboards/bastardkb/dilemma/4x6_4/keymaps/via/config.h
casuanoob Sep 18, 2023
c51cf08
Update keyboards/bastardkb/dilemma/4x6_4/keymaps/via/keymap.c
casuanoob Sep 18, 2023
0a58026
Update keyboards/bastardkb/dilemma/4x6_4/config.h
casuanoob Sep 18, 2023
6fbf021
4x6_4/config.h formatting change per review request
casuanoob Sep 19, 2023
5be3d75
4x6_4/info.json formatting change per review request
casuanoob Sep 19, 2023
d36c7c5
Add layer indicators
ykz89 Sep 19, 2023
03f8d39
Use predefined rgb colors for layers
ykz89 Sep 20, 2023
e00deea
Merge branch 'bk_dilemma_4x6_4_layer_indicator_yingeling' into bk_dil…
Dec 13, 2023
9c512d6
Refactor layer indicators from keymap to keyboard
Dec 14, 2023
4238571
swap encoder volume directions for CW=volup
Dec 15, 2023
59a344e
Revert wrong conflict solutions following review
Dec 15, 2023
5db548a
Update keyboards/bastardkb/dilemma/4x6_4/info.json
casuanoob Dec 15, 2023
fb563a7
Update keyboards/bastardkb/dilemma/4x6_4/config.h
casuanoob Dec 15, 2023
ade3fe7
Update keyboards/bastardkb/dilemma/4x6_4/keymaps/default/readme.md
casuanoob Dec 15, 2023
c7982cb
Update keyboards/bastardkb/dilemma/4x6_4/config.h
casuanoob Dec 15, 2023
7665871
Apply suggested changes from code review
Dec 16, 2023
ee18162
Apply suggested changes from code review
Dec 16, 2023
c4e4fe8
Break the brightness interval out into defines for configurability fr…
Dec 17, 2023
9bff07a
Formatting
Dec 17, 2023
443aa44
Add documentation for indicator brightness boosts
Dec 23, 2023
1799681
narrow scope of kb-internal function
Dec 25, 2023
8bdb8ab
fix type of counting variable
Dec 25, 2023
eab8ef4
remove unneccessary condition
Dec 25, 2023
c253178
Remove shutdown_user
Dec 26, 2023
f7dc909
Formatting
Dec 26, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove unneccessary condition
  • Loading branch information
burkfers committed Dec 26, 2023
commit eab8ef445b34b942f504685c63156e3751224aa2
6 changes: 2 additions & 4 deletions keyboards/bastardkb/dilemma/4x6_4/4x6_4.c
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,8 @@ bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
if (layer > 0) {
HSV hsv = _get_hsv_for_layer_index(layer);

if (hsv.v > rgb_matrix_get_val()) {
// Set brightness to the configured interval brighter than current brightness, clamped to 255 (ie. uint8_t max value). This compensates for the dimmer appearance of the underglow LEDs.
hsv.v = MIN(rgb_matrix_get_val() + LAYER_INDICATOR_BRIGHTNESS_INC, 255);
}
// Set brightness to the configured interval brighter than current brightness, clamped to 255 (ie. uint8_t max value). This compensates for the dimmer appearance of the underglow LEDs.
hsv.v = MIN(rgb_matrix_get_val() + LAYER_INDICATOR_BRIGHTNESS_INC, 255);
const RGB rgb = hsv_to_rgb(hsv);

for (int i = led_min; i < led_max; i++) {
Expand Down