0
mirror of https://github.com/OneOfEleven/uv-k5-firmware-custom.git synced 2025-06-19 06:39:49 +03:00

fix dual watch bug + other stuff

This commit is contained in:
OneOfEleven
2023-11-02 10:00:51 +00:00
parent b0f105572a
commit 2638d803c0
47 changed files with 1880 additions and 2385 deletions

View File

@ -20,11 +20,11 @@
#include "settings.h"
// this is decremented once every 500ms
uint16_t g_backlight_count_down = 0;
uint16_t g_backlight_tick_500ms = 0;
uint16_t backlight_ticks(void)
{
switch (g_eeprom.backlight)
switch (g_eeprom.config.setting.backlight_time)
{
case 1: return 2 * 5; // 5 sec
case 2: return 2 * 10; // 10 sec
@ -41,14 +41,14 @@ void backlight_turn_on(const uint16_t min_ticks)
{
if (min_ticks > 0)
{
if (g_backlight_count_down < min_ticks)
g_backlight_count_down = min_ticks;
if (g_backlight_tick_500ms < min_ticks)
g_backlight_tick_500ms = min_ticks;
GPIO_SetBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT);
}
else
if (g_eeprom.backlight > 0)
if (g_eeprom.config.setting.backlight_time > 0)
{
GPIO_SetBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT);
g_backlight_count_down = backlight_ticks();
g_backlight_tick_500ms = backlight_ticks();
}
}