0
mirror of https://github.com/OneOfEleven/uv-k5-firmware-custom.git synced 2025-06-18 22:29:50 +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();
}
}

View File

@ -19,7 +19,7 @@
#include <stdint.h>
extern uint16_t g_backlight_count_down;
extern uint16_t g_backlight_tick_500ms;
uint16_t backlight_ticks(void);
void backlight_turn_on(const uint16_t min_ticks);

View File

@ -128,11 +128,7 @@ void BK1080_Init(const uint16_t frequency, const bool initialise)
if (BK1080_freq_lower > lower)
BK1080_freq_lower = lower;
// if (BK1080_freq_lower > upper)
// BK1080_freq_lower = upper;
// if (BK1080_freq_upper < lower)
// BK1080_freq_upper = lower;
if (BK1080_freq_upper < upper)
BK1080_freq_upper = upper;
}
@ -239,7 +235,7 @@ void BK1080_SetFrequency(uint16_t Frequency)
BK1080_WriteRegister(BK1080_REG_05_SYSTEM_CONFIGURATION2, (SEEK_THRESHOLD << 8) | (band << 6) | (CHAN_SPACING << 4) | (VOLUME << 0));
BK1080_WriteRegister(BK1080_REG_03_CHANNEL, (uint16_t)channel);
SYSTEM_DelayMs(1);
// SYSTEM_DelayMs(1);
BK1080_WriteRegister(BK1080_REG_03_CHANNEL, (uint16_t)channel | (1u << 15));
}

View File

@ -215,11 +215,11 @@ void ST7565_Init(const bool full)
void ST7565_HardwareReset(void)
{
GPIO_SetBit(&GPIOB->DATA, GPIOB_PIN_ST7565_RES);
GPIO_SetBit( &GPIOB->DATA, GPIOB_PIN_ST7565_RES);
SYSTEM_DelayMs(1);
GPIO_ClearBit(&GPIOB->DATA, GPIOB_PIN_ST7565_RES);
SYSTEM_DelayMs(20);
GPIO_SetBit(&GPIOB->DATA, GPIOB_PIN_ST7565_RES);
GPIO_SetBit( &GPIOB->DATA, GPIOB_PIN_ST7565_RES);
SYSTEM_DelayMs(120);
}