darkkirb/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse source
This commit is contained in:
QMK Bot 2022-10-13 07:15:38 +00:00
commit 9227c04a8d
5 changed files with 11 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
keyboards/wilba_tech/wt_main.c
View file

@ -115,14 +115,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record)
return process_record_user(keycode, record); return process_record_user(keycode, record);
} }
void led_set_kb(uint8_t usb_led)
{
#if RGB_BACKLIGHT_ENABLED || MONO_BACKLIGHT_ENABLED
backlight_set_indicator_state(usb_led);
#endif // RGB_BACKLIGHT_ENABLED || MONO_BACKLIGHT_ENABLED
led_set_user(usb_led);
}
void suspend_power_down_kb(void) void suspend_power_down_kb(void)
{ {
#if RGB_BACKLIGHT_ENABLED || MONO_BACKLIGHT_ENABLED #if RGB_BACKLIGHT_ENABLED || MONO_BACKLIGHT_ENABLED

24
keyboards/wilba_tech/wt_mono_backlight.c
View file

@ -53,7 +53,6 @@ backlight_config g_config = {
}; };
bool g_suspend_state = false; bool g_suspend_state = false;
uint8_t g_indicator_state = 0;
// Global tick at 20 Hz // Global tick at 20 Hz
uint32_t g_tick = 0; uint32_t g_tick = 0;
@ -118,11 +117,6 @@ void backlight_set_suspend_state(bool state)
g_suspend_state = state; g_suspend_state = state;
} }
void backlight_set_indicator_state(uint8_t state)
{
g_indicator_state = state;
}
void backlight_set_brightness_all( uint8_t value ) void backlight_set_brightness_all( uint8_t value )
{ {
IS31FL3736_mono_set_brightness_all( value ); IS31FL3736_mono_set_brightness_all( value );
@ -168,7 +162,9 @@ void backlight_effect_indicators(void)
#if defined(MONO_BACKLIGHT_WT75_A) #if defined(MONO_BACKLIGHT_WT75_A)
HSV hsv = { .h = g_config.color_1.h, .s = g_config.color_1.s, .v = g_config.brightness }; HSV hsv = { .h = g_config.color_1.h, .s = g_config.color_1.s, .v = g_config.brightness };
RGB rgb = hsv_to_rgb( hsv ); RGB rgb = hsv_to_rgb( hsv );
// G8, H8, I8 -> (6*8+7) (7*8+7), (8*8+7) // SW7,CS8 = (6*8+7) = 55
// SW8,CS8 = (7*8+7) = 63
// SW9,CS8 = (8*8+7) = 71
IS31FL3736_mono_set_brightness(55, rgb.r); IS31FL3736_mono_set_brightness(55, rgb.r);
IS31FL3736_mono_set_brightness(63, rgb.g); IS31FL3736_mono_set_brightness(63, rgb.g);
IS31FL3736_mono_set_brightness(71, rgb.b); IS31FL3736_mono_set_brightness(71, rgb.b);
@ -183,20 +179,20 @@ defined(MONO_BACKLIGHT_WT75_A) || \
defined(MONO_BACKLIGHT_WT75_B) || \ defined(MONO_BACKLIGHT_WT75_B) || \
defined(MONO_BACKLIGHT_WT75_C) || \ defined(MONO_BACKLIGHT_WT75_C) || \
defined(MONO_BACKLIGHT_WT80_A) defined(MONO_BACKLIGHT_WT80_A)
if ( g_indicator_state & (1<<USB_LED_CAPS_LOCK) ) { if ( host_keyboard_led_state().caps_lock ) {
// Caps Lock: D1 -> (4*8+0) // SW3,CS1 = (2*8+0) = 16
IS31FL3736_mono_set_brightness(32, 255); IS31FL3736_mono_set_brightness(16, 255);
} }
#endif #endif
#if defined(MONO_BACKLIGHT_WT80_A) #if defined(MONO_BACKLIGHT_WT80_A)
if ( g_indicator_state & (1<<USB_LED_SCROLL_LOCK) ) { if ( host_keyboard_led_state().scroll_lock ) {
// Scroll Lock: G7 -> (6*8+6) // SW7,CS7 = (6*8+6) = 54
IS31FL3736_mono_set_brightness(54, 255); IS31FL3736_mono_set_brightness(54, 255);
} }
#endif #endif
#if defined(MONO_BACKLIGHT_WT75_C) #if defined(MONO_BACKLIGHT_WT75_C)
if ( g_indicator_state & (1<<USB_LED_SCROLL_LOCK) ) { if ( host_keyboard_led_state().scroll_lock ) {
// Scroll Lock: G8 -> (6*8+7) // SW7,CS8 = (6*8+7) = 55
IS31FL3736_mono_set_brightness(55, 255); IS31FL3736_mono_set_brightness(55, 255);
} }
#endif #endif

1
keyboards/wilba_tech/wt_mono_backlight.h
View file

@ -56,7 +56,6 @@ void backlight_timer_enable(void);
void backlight_timer_disable(void); void backlight_timer_disable(void);
void backlight_set_suspend_state(bool state); void backlight_set_suspend_state(bool state);
void backlight_set_indicator_state(uint8_t state);
// This should not be called from an interrupt // This should not be called from an interrupt
// (eg. from a timer interrupt). // (eg. from a timer interrupt).

9
keyboards/wilba_tech/wt_rgb_backlight.c
View file

@ -144,7 +144,6 @@ backlight_config g_config = {
}; };
bool g_suspend_state = false; bool g_suspend_state = false;
uint8_t g_indicator_state = 0;
// Global tick at 20 Hz // Global tick at 20 Hz
uint32_t g_tick = 0; uint32_t g_tick = 0;
@ -1982,11 +1981,6 @@ void backlight_set_suspend_state(bool state)
g_suspend_state = state; g_suspend_state = state;
} }
void backlight_set_indicator_state(uint8_t state)
{
g_indicator_state = state;
}
void backlight_effect_rgb_test(void) void backlight_effect_rgb_test(void)
{ {
// Mask out bits 4 and 5 // Mask out bits 4 and 5
@ -2425,8 +2419,7 @@ void backlight_effect_indicators_set_colors( uint8_t index, HS color )
// colors already set // colors already set
void backlight_effect_indicators(void) void backlight_effect_indicators(void)
{ {
if ( g_config.caps_lock_indicator.index != 255 && if ( g_config.caps_lock_indicator.index != 255 && host_keyboard_led_state().caps_lock )
( g_indicator_state & (1<<USB_LED_CAPS_LOCK) ) )
{ {
backlight_effect_indicators_set_colors( g_config.caps_lock_indicator.index, g_config.caps_lock_indicator.color ); backlight_effect_indicators_set_colors( g_config.caps_lock_indicator.index, g_config.caps_lock_indicator.color );
} }

1
keyboards/wilba_tech/wt_rgb_backlight.h
View file

@ -81,7 +81,6 @@ void backlight_timer_enable(void);
void backlight_timer_disable(void); void backlight_timer_disable(void);
void backlight_set_suspend_state(bool state); void backlight_set_suspend_state(bool state);
void backlight_set_indicator_state(uint8_t state);
// This should not be called from an interrupt // This should not be called from an interrupt
// (eg. from a timer interrupt). // (eg. from a timer interrupt).