TMO50: use layer_state_set_kb at keyboard level (#10150)

* Change TMO to use layer_state_set_kb as is customary at the keyboard level.

This also factors out `process_indicator_led` to a separate method.
master
Joe Wasson 2020-08-31 22:19:51 -07:00 committed by GitHub
parent a9a2817f3a
commit 4a6cfb06c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 11 deletions

View File

@ -51,34 +51,51 @@ void led_set_kb(uint8_t usb_led) {
led_set_user(usb_led); led_set_user(usb_led);
} }
uint32_t layer_state_set_user(uint32_t state) layer_state_t layer_state_set_kb(layer_state_t state)
{
state = layer_state_set_user(state);
process_indicator_led_kb(state);
return state;
}
__attribute__((weak))
bool process_indicator_led_user(layer_state_t state){
return true;
}
bool process_indicator_led_kb(layer_state_t state)
{
if(process_indicator_led_user(state))
{ {
// if on layer 0, turn on B0 LED, otherwise off. // if on layer 0, turn on B0 LED, otherwise off.
if (biton32(state) == 0) { if (get_highest_layer(state) == 0) {
PORTB &= ~(1<<PB0); PORTB &= ~(1<<PB0);
} else { } else {
PORTB |= (1<<PB0); PORTB |= (1<<PB0);
} }
// if on layer 1, turn on B1 LED, otherwise off. // if on layer 1, turn on B1 LED, otherwise off.
if (biton32(state) == 1) { if (get_highest_layer(state) == 1) {
PORTB &= ~(1<<PB1); PORTB &= ~(1<<PB1);
} else { } else {
PORTB |= (1<<PB1); PORTB |= (1<<PB1);
} }
// if on layer 2, turn on B2 LED, otherwise off. // if on layer 2, turn on B2 LED, otherwise off.
if (biton32(state) == 2) { if (get_highest_layer(state) == 2) {
PORTB &= ~(1<<PB2); PORTB &= ~(1<<PB2);
} else { } else {
PORTB |= (1<<PB2); PORTB |= (1<<PB2);
} }
// if on layer 3, turn on B3 LED, otherwise off. // if on layer 3, turn on B3 LED, otherwise off.
if (biton32(state) == 3) { if (get_highest_layer(state) == 3) {
PORTB &= ~(1<<PB3); PORTB &= ~(1<<PB3);
} else { } else {
PORTB |= (1<<PB3); PORTB |= (1<<PB3);
} }
}
return state;
return true;
} }

View File

@ -17,6 +17,10 @@
#include "quantum.h" #include "quantum.h"
bool process_indicator_led_kb(layer_state_t state);
__attribute__((weak))
bool process_indicator_led_user(layer_state_t state);
/* This a shortcut to help you visually see your layout. /* This a shortcut to help you visually see your layout.
* *
* The first section contains all of the arguments representing the physical * The first section contains all of the arguments representing the physical
@ -51,4 +55,3 @@
{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \ { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
{ K30, K31, K32, K33, KC_NO, KC_NO, KC_NO, K37, KC_NO, KC_NO, K3A, KC_NO, KC_NO, KC_NO } \ { K30, K31, K32, K33, KC_NO, KC_NO, KC_NO, K37, KC_NO, KC_NO, K3A, KC_NO, KC_NO, KC_NO } \
} }