mirror of
https://github.com/qmk/qmk_firmware
synced 2024-12-22 08:26:21 +00:00
Get rid of USB_LED_CAPS_LOCK
(#21436)
This commit is contained in:
parent
928e03e8d6
commit
87b11345a5
@ -18,12 +18,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
|
||||
};
|
||||
|
||||
void led_set_user(uint8_t usb_led) {
|
||||
if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
|
||||
bool led_update_user(led_t led_state) {
|
||||
if (led_state.caps_lock) {
|
||||
setPinOutput(B2);
|
||||
writePinLow(B2);
|
||||
} else {
|
||||
setPinInput(B2);
|
||||
writePinLow(B2);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
@ -18,12 +18,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
|
||||
};
|
||||
|
||||
void led_set_user(uint8_t usb_led) {
|
||||
if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
|
||||
bool led_update_user(led_t led_state) {
|
||||
if (led_state.caps_lock) {
|
||||
setPinOutput(B2);
|
||||
writePinLow(B2);
|
||||
} else {
|
||||
setPinInput(B2);
|
||||
writePinLow(B2);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
@ -72,10 +72,11 @@ layer_state_t layer_state_set_user(layer_state_t state) {
|
||||
}
|
||||
|
||||
// support for standard mod state keys (caps lock, scroll lock, etc.)
|
||||
void led_set_user(uint8_t usb_led) {
|
||||
if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
|
||||
bool led_update_user(led_t led_state) {
|
||||
if (led_state.caps_lock) {
|
||||
DDRB |= (1 << 2); PORTB &= ~(1 << 2);
|
||||
} else {
|
||||
DDRB &= ~(1 << 2); PORTB &= ~(1 << 2);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
@ -18,12 +18,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
|
||||
};
|
||||
|
||||
void led_set_user(uint8_t usb_led) {
|
||||
if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
|
||||
bool led_update_user(led_t led_state) {
|
||||
if (led_state.caps_lock) {
|
||||
setPinOutput(B2);
|
||||
writePinLow(B2);
|
||||
} else {
|
||||
setPinInput(B2);
|
||||
writePinLow(B2);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
@ -157,11 +157,11 @@ void dynamic_macro_record_end_user(int8_t direction) {
|
||||
// Custom Caps Lock backlight behaviour
|
||||
// ------------------------------------
|
||||
|
||||
void led_set_user(uint8_t usb_led) {
|
||||
bool led_update_user(led_t led_state) {
|
||||
// This exists because I don't like the backlight to turn OFF when the Caps Lock is ON.
|
||||
// That is, this will turn the backlight ON (at half the brightness) when the Caps Lock is ON as well.
|
||||
static bool prev_is_caps_on;
|
||||
bool is_caps_on = IS_LED_ON(usb_led, USB_LED_CAPS_LOCK);
|
||||
bool is_caps_on = led_state.caps_lock;
|
||||
|
||||
if (prev_is_caps_on != is_caps_on) {
|
||||
prev_is_caps_on = is_caps_on;
|
||||
@ -178,7 +178,7 @@ void led_set_user(uint8_t usb_led) {
|
||||
}
|
||||
|
||||
// Turn on the Pro Micro's on-board LEDs for Caps Lock
|
||||
if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
|
||||
if (led_state.caps_lock) {
|
||||
// Set to low
|
||||
setPinOutput(B0);
|
||||
writePinLow(B0);
|
||||
@ -189,6 +189,7 @@ void led_set_user(uint8_t usb_led) {
|
||||
setPinInput(B0);
|
||||
setPinInput(D5);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
// Backlight idle timeout feature
|
||||
|
@ -35,11 +35,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
)
|
||||
};
|
||||
|
||||
|
||||
|
||||
void led_set_user(uint8_t usb_led){
|
||||
bool led_update_user(led_t led_state){
|
||||
//turn on the Pro Micro's on board LEDs for CAPS LOCK
|
||||
if(IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)){
|
||||
if(led_state.caps_lock){
|
||||
//set led pins to low
|
||||
setPinOutput(B0);
|
||||
writePinLow(B0);
|
||||
@ -50,4 +48,5 @@ void led_set_user(uint8_t usb_led){
|
||||
setPinInput(B0);
|
||||
setPinInput(D5);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
@ -19,20 +19,23 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#include <stdint.h>
|
||||
#include "led.h"
|
||||
|
||||
|
||||
void led_set(uint8_t usb_led)
|
||||
bool led_update_kb(led_t led_state)
|
||||
{
|
||||
if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
|
||||
// output low
|
||||
DDRB |= (1<<0);
|
||||
PORTB &= ~(1<<0);
|
||||
DDRD |= (1<<5);
|
||||
PORTD &= ~(1<<5);
|
||||
} else {
|
||||
// Hi-Z
|
||||
DDRB &= ~(1<<0);
|
||||
PORTB &= ~(1<<0);
|
||||
DDRD &= ~(1<<5);
|
||||
PORTD &= ~(1<<5);
|
||||
bool res = led_update_user(led_state);
|
||||
if (res) {
|
||||
if (led_state.caps_lock) {
|
||||
// output low
|
||||
DDRB |= (1<<0);
|
||||
PORTB &= ~(1<<0);
|
||||
DDRD |= (1<<5);
|
||||
PORTD &= ~(1<<5);
|
||||
} else {
|
||||
// Hi-Z
|
||||
DDRB &= ~(1<<0);
|
||||
PORTB &= ~(1<<0);
|
||||
DDRD &= ~(1<<5);
|
||||
PORTD &= ~(1<<5);
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
@ -51,10 +51,11 @@ void matrix_init_user(void) {
|
||||
writePinLow(B0);
|
||||
}
|
||||
|
||||
void led_set_user(uint8_t usb_led) {
|
||||
if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
|
||||
bool led_update_user(led_t led_state) {
|
||||
if (led_state.caps_lock) {
|
||||
writePinHigh(B0);
|
||||
} else {
|
||||
writePinLow(B0);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
@ -25,12 +25,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
|
||||
};
|
||||
|
||||
void led_set_user(uint8_t usb_led) {
|
||||
if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
|
||||
bool led_update_user(led_t led_state) {
|
||||
if (led_state.caps_lock) {
|
||||
DDRB |= (1 << 2); PORTB &= ~(1 << 2);
|
||||
} else {
|
||||
DDRB &= ~(1 << 2); PORTB &= ~(1 << 2);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
bool process_record_user(uint16_t keycode, keyrecord_t *record)
|
||||
|
@ -85,7 +85,7 @@ void highlight_layer3(void){
|
||||
}
|
||||
|
||||
bool rgb_matrix_indicators_user(void) {
|
||||
uint8_t this_led = host_keyboard_leds();
|
||||
led_t led_state = host_keyboard_led_state();
|
||||
if (!g_suspend_state) {
|
||||
switch (get_highest_layer(layer_state)) {
|
||||
case 3:
|
||||
@ -94,7 +94,7 @@ bool rgb_matrix_indicators_user(void) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
if ( this_led & (1<<USB_LED_CAPS_LOCK)) {
|
||||
if (led_state.caps_lock) {
|
||||
rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF);
|
||||
}
|
||||
return false;
|
||||
|
@ -146,7 +146,7 @@ void highlight_layer3(void) {
|
||||
}
|
||||
|
||||
bool rgb_matrix_indicators_user(void) {
|
||||
uint8_t this_led = host_keyboard_leds();
|
||||
led_t led_state = host_keyboard_led_state();
|
||||
if (!g_suspend_state) {
|
||||
switch (get_highest_layer(layer_state)) {
|
||||
case 1:
|
||||
@ -161,7 +161,7 @@ bool rgb_matrix_indicators_user(void) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
if ( this_led & (1<<USB_LED_CAPS_LOCK)) {
|
||||
if (led_state.caps_lock) {
|
||||
rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF);
|
||||
}
|
||||
return false;
|
||||
|
@ -296,12 +296,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
|
||||
|
||||
|
||||
void led_set_user(uint8_t usb_led) {
|
||||
if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
|
||||
bool led_update_user(led_t led_state) {
|
||||
if (led_state.caps_lock) {
|
||||
ergodox_right_led_1_on();
|
||||
} else {
|
||||
ergodox_right_led_1_off();
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
|
@ -194,11 +194,12 @@ void matrix_scan_user(void) {
|
||||
}
|
||||
};
|
||||
|
||||
void led_set_user(uint8_t usb_led){
|
||||
if (usb_led & (1 << USB_LED_CAPS_LOCK))
|
||||
bool led_update_user(led_t led_state){
|
||||
if (led_state.caps_lock)
|
||||
{
|
||||
capsOn = true;
|
||||
}else {
|
||||
capsOn = false;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
@ -351,11 +351,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
||||
return true;
|
||||
}
|
||||
|
||||
void led_set_user(uint8_t usb_led) {
|
||||
if (usb_led & (1<<USB_LED_CAPS_LOCK)){
|
||||
bool led_update_user(led_t led_state) {
|
||||
if (led_state.caps_lock){
|
||||
frenchdev_led_3_on();
|
||||
} else {
|
||||
frenchdev_led_3_off();
|
||||
}
|
||||
return ;
|
||||
return false;
|
||||
}
|
||||
|
@ -67,24 +67,6 @@ oled_rotation_t oled_init_user(oled_rotation_t rotation) {
|
||||
return OLED_ROTATION_180;
|
||||
}
|
||||
bool oled_task_user(void) {
|
||||
// Host Keyboard Layer Status
|
||||
/*oled_write_P(PSTR("Lyr: "), false);
|
||||
switch (get_highest_layer(layer_state)) {
|
||||
case 0:
|
||||
oled_write_P(PSTR("Alpha\n"), false);
|
||||
break;
|
||||
case 1:
|
||||
oled_write_P(PSTR("FN\n"), false);
|
||||
break;
|
||||
default:
|
||||
// Or use the write_ln shortcut over adding '\n' to the end of your string
|
||||
oled_write_ln_P(PSTR("Undefined"), false);
|
||||
}
|
||||
|
||||
uint8_t led_usb_state = host_keyboard_leds();
|
||||
oled_write_P(led_usb_state & (1<<USB_LED_CAPS_LOCK) ? PSTR("CAPLCK ") : PSTR(" "), false);
|
||||
*/
|
||||
|
||||
static const char PROGMEM qmk_logo[] = {
|
||||
0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
|
||||
0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
|
||||
|
@ -1303,8 +1303,8 @@ void turn_off_capslock(void) {
|
||||
rgbsps_send();
|
||||
}
|
||||
|
||||
void led_set_user(uint8_t usb_led) {
|
||||
bool new_capslock = usb_led & (1<<USB_LED_CAPS_LOCK);
|
||||
bool led_update_user(led_t led_state) {
|
||||
bool new_capslock = led_state.caps_lock;
|
||||
if (new_capslock ^ capslock) { // capslock state is different
|
||||
if ((capslock = new_capslock)) {
|
||||
rgbsps_set(LED_IND_CAPSLOCK, THEME_COLOR_CAPSLOCK);
|
||||
@ -1313,6 +1313,7 @@ void turn_off_capslock(void) {
|
||||
}
|
||||
rgbsps_send();
|
||||
}
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
@ -1306,8 +1306,8 @@ void turn_off_capslock(void) {
|
||||
rgbsps_send();
|
||||
}
|
||||
|
||||
void led_set_user(uint8_t usb_led) {
|
||||
bool new_capslock = usb_led & (1<<USB_LED_CAPS_LOCK);
|
||||
bool led_update_user(led_t led_state) {
|
||||
bool new_capslock = led_state.caps_lock;
|
||||
if (new_capslock ^ capslock) { // capslock state is different
|
||||
if ((capslock = new_capslock)) {
|
||||
rgbsps_set(LED_IND_CAPSLOCK, THEME_COLOR_CAPSLOCK);
|
||||
@ -1316,6 +1316,7 @@ void turn_off_capslock(void) {
|
||||
}
|
||||
rgbsps_send();
|
||||
}
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
@ -69,22 +69,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, _______, _______, _______),
|
||||
};
|
||||
|
||||
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
||||
return true;
|
||||
}
|
||||
|
||||
void matrix_init_user(void) {
|
||||
|
||||
}
|
||||
|
||||
void matrix_scan_user(void) {
|
||||
|
||||
}
|
||||
|
||||
void led_set_user(uint8_t usb_led) {
|
||||
if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
|
||||
bool led_update_user(led_t led_state) {
|
||||
if (led_state.caps_lock) {
|
||||
rgblight_enable_noeeprom();
|
||||
} else {
|
||||
rgblight_disable_noeeprom();
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
@ -43,8 +43,8 @@ static void check_light_layer(layer_state_t state) {
|
||||
last_checked_layer = true;
|
||||
}
|
||||
|
||||
static void check_light_led(uint8_t leds) {
|
||||
if (IS_LED_ON(leds, USB_LED_CAPS_LOCK)) {
|
||||
static void check_light_led(led_t led_state) {
|
||||
if (led_state.caps_lock) {
|
||||
caps_light();
|
||||
} else if (IS_LAYER_ON(L_FN)) {
|
||||
fn_light();
|
||||
@ -57,7 +57,7 @@ static void check_light_led(uint8_t leds) {
|
||||
static void inline check_light(void) {
|
||||
last_checked_layer
|
||||
? check_light_layer(layer_state)
|
||||
: check_light_led(host_keyboard_leds());
|
||||
: check_light_led(host_keyboard_led_state());
|
||||
}
|
||||
|
||||
void eeconfig_init_keymap(void) {
|
||||
|
@ -79,11 +79,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
||||
return true;
|
||||
}
|
||||
|
||||
void led_set_user(uint8_t usb_led) {
|
||||
if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
|
||||
bool led_update_user(led_t led_state) {
|
||||
if (led_state.caps_lock) {
|
||||
setPinOutput(B2);
|
||||
writePinLow(B2);
|
||||
} else {
|
||||
setPinInput(B2);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
@ -56,12 +56,13 @@ layer_state_t layer_state_set_user(layer_state_t state) {
|
||||
return state;
|
||||
}
|
||||
|
||||
void led_set_user(uint8_t usb_led) {
|
||||
if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
|
||||
bool led_update_user(led_t led_state) {
|
||||
if (led_state.caps_lock) {
|
||||
rgblight_mode_noeeprom(RGBLIGHT_MODE_ALTERNATING);
|
||||
} else {
|
||||
layer_state_set_user(layer_state);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
void myrgb_toggle(void) {
|
||||
|
@ -39,10 +39,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
),
|
||||
};
|
||||
|
||||
void led_set_user(uint8_t usb_led) {
|
||||
if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
|
||||
bool led_update_user(led_t led_state) {
|
||||
if (led_state.caps_lock) {
|
||||
writePinLow(B1);
|
||||
} else {
|
||||
writePinHigh(B1);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
@ -165,7 +165,7 @@ if(IS_LAYER_ON(NSSL)) {
|
||||
|
||||
//capslock leds
|
||||
|
||||
if (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) {
|
||||
if (host_keyboard_led_state().caps_lock) {
|
||||
rgb_matrix_set_color_all(50, 15.6, 0);
|
||||
}
|
||||
|
||||
|
@ -64,12 +64,13 @@ layer_state_t layer_state_set_user(layer_state_t state) {
|
||||
return state;
|
||||
}
|
||||
|
||||
void led_set_user(uint8_t usb_led) {
|
||||
if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
|
||||
bool led_update_user(led_t led_state) {
|
||||
if (led_state.caps_lock) {
|
||||
rgblight_mode_noeeprom(RGBLIGHT_MODE_ALTERNATING);
|
||||
} else {
|
||||
layer_state_set_user(layer_state);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
void myrgb_toggle(void) {
|
||||
|
@ -64,12 +64,13 @@ layer_state_t layer_state_set_user(layer_state_t state) {
|
||||
return state;
|
||||
}
|
||||
|
||||
void led_set_user(uint8_t usb_led) {
|
||||
if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
|
||||
bool led_update_user(led_t led_state) {
|
||||
if (led_state.caps_lock) {
|
||||
rgblight_mode_noeeprom(RGBLIGHT_MODE_ALTERNATING);
|
||||
} else {
|
||||
layer_state_set_user(layer_state);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
void myrgb_toggle(void) {
|
||||
|
@ -100,10 +100,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
),
|
||||
};
|
||||
|
||||
void led_set_user(uint8_t usb_led) {
|
||||
if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
|
||||
bool led_update_user(led_t led_state) {
|
||||
if (led_state.caps_lock) {
|
||||
writePinLow(E6);
|
||||
} else {
|
||||
writePinHigh(E6);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
@ -49,11 +49,12 @@ EE_CLR, _______, _______, _______, _______,
|
||||
)
|
||||
};
|
||||
|
||||
void led_set_user(uint8_t usb_led) {
|
||||
bool led_update_user(led_t led_state) {
|
||||
// Turn LED On/Off for Caps Lock
|
||||
if (host_keyboard_leds() & (1 << USB_LED_CAPS_LOCK)) {
|
||||
if (led_state.caps_lock) {
|
||||
the50_led_on();
|
||||
} else {
|
||||
the50_led_off();
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
@ -69,11 +69,12 @@ EE_CLR, _______, _______, _______, _______,
|
||||
)
|
||||
};
|
||||
|
||||
void led_set_user(uint8_t usb_led) {
|
||||
bool led_update_user(led_t led_state) {
|
||||
// Turn LED On/Off for Caps Lock
|
||||
if (host_keyboard_leds() & (1 << USB_LED_CAPS_LOCK)) {
|
||||
if (led_state.caps_lock) {
|
||||
the50_led_on();
|
||||
} else {
|
||||
the50_led_off();
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
@ -52,12 +52,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
|
||||
};
|
||||
|
||||
void led_set_user(uint8_t usb_led) {
|
||||
if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
|
||||
bool led_update_user(led_t led_state) {
|
||||
if (led_state.caps_lock) {
|
||||
setPinOutput(B6);
|
||||
writePinHigh(B6);
|
||||
} else {
|
||||
setPinInput(B6);
|
||||
writePinLow(B6);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
@ -70,8 +70,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
|
||||
};
|
||||
|
||||
void led_set_user(uint8_t usb_led) {
|
||||
if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
|
||||
bool led_update_user(led_t led_state) {
|
||||
if (led_state.caps_lock) {
|
||||
setPinOutput(B6);
|
||||
writePinHigh(B6);
|
||||
}
|
||||
@ -79,4 +79,5 @@ void led_set_user(uint8_t usb_led) {
|
||||
setPinInput(B6);
|
||||
writePinLow(B6);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user