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

Waffling60 - minor tweak, improve default behavior of caps lock indicator. #16836

Merged
merged 29 commits into from
Apr 13, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
4822ba3
enable rgb underglow for VIA-firmware
Jan 31, 2021
95d87c6
Merge remote-tracking branch 'upstream/master'
Feb 25, 2021
6d1ca39
Merge remote-tracking branch 'upstream/master'
Apr 5, 2021
1bb162a
update master branch from remote
Apr 5, 2021
e32af47
Merge remote-tracking branch 'upstream/master'
Apr 14, 2021
baa29b1
Merge remote-tracking branch 'upstream/master'
Apr 29, 2021
3d4c946
cont
Apr 29, 2021
456835e
Merge remote-tracking branch 'upstream/master'
May 25, 2021
7564a8f
Merge remote-tracking branch 'upstream/master'
Jun 21, 2021
92f7266
Merge remote-tracking branch 'upstream/master'
Jun 23, 2021
a619d57
Merge remote-tracking branch 'upstream/master'
Aug 29, 2021
d31268c
Merge remote-tracking branch 'upstream/master'
4pplet Sep 20, 2021
475cd46
Merge remote-tracking branch 'upstream/master'
4pplet Sep 22, 2021
cd4f7e9
Merge remote-tracking branch 'upstream/master'
4pplet Oct 4, 2021
32eb4bf
Merge remote-tracking branch 'upstream/master'
4pplet Dec 28, 2021
8a8921c
Merge remote-tracking branch 'upstream/master'
4pplet Feb 3, 2022
b363808
adding rev c
4pplet Feb 3, 2022
c01d7e5
Update keyboards/4pplet/waffling60/rev_c/config.h
4pplet Feb 4, 2022
3e70479
Update readme.md
4pplet Feb 4, 2022
0b7a791
Update keyboards/4pplet/waffling60/rev_c/rev_c.c
4pplet Feb 5, 2022
5d58560
Merge remote-tracking branch 'upstream/master'
4pplet Feb 22, 2022
40aef4b
Merge remote-tracking branch 'upstream/master'
4pplet Feb 28, 2022
308b2f2
Merge branch 'master' of https://github.com/4pplet/qmk_firmware
4pplet Feb 28, 2022
1fd4987
Added build command for rev c and bootloader instruction in the main …
4pplet Mar 22, 2022
83501bb
Merge branch 'master' into waffling60_c
4pplet Mar 22, 2022
ff49df5
Merge remote-tracking branch 'upstream/master'
4pplet Apr 2, 2022
5bfe75f
Merge branch 'master' into waffling60_c
4pplet Apr 11, 2022
0767f66
updating to new default led behaviour
4pplet Apr 11, 2022
237d759
updating aRGB default behaviour and keymap
4pplet Apr 11, 2022
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
updating to new default led behaviour
updating to new default led behaviour, so it's possible to set color and brightness in VIA
  • Loading branch information
4pplet committed Apr 11, 2022
commit 0767f66f74c97094ecc0c05774f4002c82b30d77
19 changes: 10 additions & 9 deletions keyboards/4pplet/waffling60/rev_b/rev_b.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,16 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.

bool led_update_kb(led_t led_state) {
bool res = led_update_user(led_state);
if(CAPS_LOCK_ENABLE){
if(res) {
if(led_state.caps_lock){
rgblight_enable();
rgblight_mode(1);
rgblight_sethsv_noeeprom(CAPS_LOCK_COLOR);
}
else
rgblight_disable_noeeprom();
if (CAPS_LOCK_ENABLE && res) {
if(led_state.caps_lock) {
#ifdef CAPS_LOCK_COLOR
rgblight_sethsv_at(CAPS_LOCK_COLOR, 1);
#else
rgblight_sethsv_at(rgblight_get_hue(),rgblight_get_sat(),rgblight_get_val(), 1);
#endif
}
else{
rgblight_sethsv_at(HSV_OFF, 1);
}
}
return res;
Expand Down
5 changes: 2 additions & 3 deletions keyboards/4pplet/waffling60/rev_b/rev_b.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#pragma once

// defines to set RGB-led behaviour. Off by default
#define CAPS_LOCK_ENABLE false
#define CAPS_LOCK_COLOR HSV_ORANGE
#define CAPS_LOCK_ENABLE true
//#define CAPS_LOCK_COLOR HSV_ORANGE

#include "quantum.h"

Expand Down
15 changes: 9 additions & 6 deletions keyboards/4pplet/waffling60/rev_c/rev_c.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,15 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
bool led_update_kb(led_t led_state) {
bool res = led_update_user(led_state);
if (CAPS_LOCK_ENABLE && res) {
if (led_state.caps_lock){
rgblight_enable();
rgblight_mode(1);
rgblight_sethsv_noeeprom(CAPS_LOCK_COLOR);
} else {
rgblight_disable_noeeprom();
if(led_state.caps_lock) {
#ifdef CAPS_LOCK_COLOR
rgblight_sethsv_at(CAPS_LOCK_COLOR, 1);
#else
rgblight_sethsv_at(rgblight_get_hue(),rgblight_get_sat(),rgblight_get_val(), 1);
#endif
}
else{
rgblight_sethsv_at(HSV_OFF, 1);
}
}
return res;
Expand Down
5 changes: 2 additions & 3 deletions keyboards/4pplet/waffling60/rev_c/rev_c.h