mirrors/uv-k5-firmware-custom
0
Fork 0
mirror of https://github.com/OneOfEleven/uv-k5-firmware-custom.git synced 2025-06-18 22:29:50 +03:00
Code Issues Releases Activity

Edited "D HOLD" times to include "STAY ON SCREEN" option

Browse Source
This commit is contained in:
OneOfEleven
2023-10-08 11:40:17 +01:00
parent 06c7d79b4b
commit 0547452589
24 changed files with 977 additions and 630 deletions
Download Patch File Download Diff File Expand all files Collapse all files

123
driver/bk4819.c
View File

@ -1478,33 +1478,78 @@ uint8_t BK4819_GetAfTxRx(void)
bool BK4819_GetFrequencyScanResult(uint32_t *pFrequency)
{
const uint16_t High = BK4819_ReadRegister(BK4819_REG_0D);
const bool Finished = (High & 0x8000) == 0;
if (Finished)
{
const uint16_t Low = BK4819_ReadRegister(BK4819_REG_0E);
*pFrequency = (uint32_t)((High & 0x7FF) << 16) | Low;
}
return Finished;
// **********
// REG_0D read only
//
// <15> frequency scan indicator
// 1 = busy
// 0 = finished
//
// <14:11> ???
//
// <10:0> frequency scan high 16 bits
//
// **********
// REG_0E read only
//
// <15:0> frequency scan low 16 bits
//
// **********
// (REG_0D <10:0> << 16) | (REG_0E <15:0>) .. unit is 10Hz
//
const uint16_t high = BK4819_ReadRegister(BK4819_REG_0D);
const uint16_t low = BK4819_ReadRegister(BK4819_REG_0E);
const bool finished = ((high >> 15) & 1u) == 0;
*pFrequency = ((uint32_t)(high & 0x07FF) << 16) | low;
return finished;
}
BK4819_CssScanResult_t BK4819_GetCxCSSScanResult(uint32_t *pCdcssFreq, uint16_t *pCtcssFreq)
{
uint16_t Low;
uint16_t High = BK4819_ReadRegister(BK4819_REG_69);
// **********
// REG_68 read only
//
// <15> CTCSS scan indicator
// 1 = busy
// 0 = found
//
// <12:0> CTCSS frequency (Hz)
// div by 20.64888 ... 13M / 26M XTAL
// div by 20.97152 ... 12.8M / 19.2M / 25.6M / 38.4M XTAL
//
// **********
// REG_69 read only
//
// <15> CDCSS scan indicator
// 1 = busy
// 0 = found
//
// <14> 23 or 24 bit CDCSS Indicator (BK4819v3)
// 1 = 24 bit
// 0 = 23 bit
//
// <11:0> CDCSS High 12 bits
//
// **********
// REG_6A read only
//
// <11:0> CDCSS Low 12 bits
//
//
const uint16_t High = BK4819_ReadRegister(BK4819_REG_69);
uint16_t Low;
if ((High & 0x8000) == 0)
{
if (((High >> 15) & 1u) == 0)
{ // CDCSS
Low = BK4819_ReadRegister(BK4819_REG_6A);
*pCdcssFreq = ((High & 0xFFF) << 12) | (Low & 0xFFF);
*pCdcssFreq = ((uint32_t)(High & 0xFFF) << 12) | (Low & 0xFFF);
return BK4819_CSS_RESULT_CDCSS;
}
Low = BK4819_ReadRegister(BK4819_REG_68);
if ((Low & 0x8000) == 0)
{
*pCtcssFreq = ((Low & 0x1FFF) * 4843) / 10000;
if (((Low >> 15) & 1u) == 0)
{ // CTCSS
*pCtcssFreq = ((uint32_t)(Low & 0x1FFF) * 4843) / 10000;
return BK4819_CSS_RESULT_CTCSS;
}
@ -1513,12 +1558,46 @@ BK4819_CssScanResult_t BK4819_GetCxCSSScanResult(uint32_t *pCdcssFreq, uint16_t
void BK4819_DisableFrequencyScan(void)
{
BK4819_WriteRegister(BK4819_REG_32, 0x0244);
// REG_32
//
// <15:14> 0 frequency scan time
// 0 = 0.2 sec
// 1 = 0.4 sec
// 2 = 0.8 sec
// 3 = 1.6 sec
//
// <13:1> ???
//
// <0> 0 frequency scan enable
// 1 = enable
// 0 = disable
//
BK4819_WriteRegister(BK4819_REG_32, // 0x0244); // 00 0000100100010 0
( 0u << 14) | // 0 frequency scan Time
(290u << 1) | // ???
( 0u << 0)); // 0 frequency scan enable
}
void BK4819_EnableFrequencyScan(void)
{
BK4819_WriteRegister(BK4819_REG_32, 0x0245); // 00 0000100100010 1
// REG_32
//
// <15:14> 0 frequency scan time
// 0 = 0.2 sec
// 1 = 0.4 sec
// 2 = 0.8 sec
// 3 = 1.6 sec
//
// <13:1> ???
//
// <0> 0 frequency scan enable
// 1 = enable
// 0 = disable
//
BK4819_WriteRegister(BK4819_REG_32, // 0x0245); // 00 0000100100010 1
( 0u << 14) | // 0 frequency scan time
(290u << 1) | // ???
( 1u << 0)); // 1 frequency scan enable
}
void BK4819_SetScanFrequency(uint32_t Frequency)
@ -1532,7 +1611,7 @@ void BK4819_SetScanFrequency(uint32_t Frequency)
// 0 = Disable
//
// <14> 0
// 1 = GPIO0Input for CDCSS
// 1 = GPIO-0 input for CDCSS
// 0 = Normal Mode (for BK4819 v3)
//
// <13> 0
@ -1547,8 +1626,8 @@ void BK4819_SetScanFrequency(uint32_t Frequency)
// 1 = 24bit
// 0 = 23bit
//
// <10> 0 1050HzDetectionMode
// 1 = 1050/4 Detect Enable, CTC1 should be set to 1050/4 Hz
// <10> 0 1050Hz detection mode
// 1 = 1050/4 detect enable, CTC1 should be set to 1050/4 Hz
//
// <9> 0 Auto CDCSS Bw Mode
// 1 = Disable

21
driver/keyboard.c
View File

@ -104,6 +104,8 @@ KEY_Code_t KEYBOARD_Poll(void)
for (unsigned int j = 0; j < ARRAY_SIZE(keyboard); j++)
{
uint16_t reg;
unsigned int i;
unsigned int k;
// Set all high
GPIOA->DATA |= 1u << GPIOA_PIN_KEYBOARD_4 |
@ -114,11 +116,22 @@ KEY_Code_t KEYBOARD_Poll(void)
// Clear the pin we are selecting
GPIOA->DATA &= keyboard[j].set_to_zero_mask;
// Wait for the pins to stabilize
SYSTICK_DelayUs(1);
// Read all 4 GPIO pins at once .. with de-noise, max of 8 sample loops
for (i = 0, k = 0, reg = 0; i < 3 && k < 8; i++, k++)
{
uint16_t reg2;
// Read all 4 GPIO pins at once
reg = GPIOA->DATA;
SYSTICK_DelayUs(1);
reg2 = GPIOA->DATA;
if (reg != reg2)
{ // noise
reg = reg2;
i = 0;
}
}
if (i < 3)
break; // noise is too bad
for (unsigned int i = 0; i < ARRAY_SIZE(keyboard[j].pins); i++)
{

29
driver/systick.c
View File

@ -29,26 +29,17 @@ void SYSTICK_Init(void)
void SYSTICK_DelayUs(uint32_t Delay)
{
uint32_t i;
uint32_t Start;
uint32_t Previous;
uint32_t Current;
uint32_t Delta;
i = 0;
Start = SysTick->LOAD;
Previous = SysTick->VAL;
const uint32_t ticks = Delay * gTickMultiplier;
uint32_t i = 0;
uint32_t Start = SysTick->LOAD;
uint32_t Previous = SysTick->VAL;
do {
do {
Current = SysTick->VAL;
} while (Current == Previous);
if (Current < Previous) {
Delta = -Current;
} else {
Delta = Start - Current;
}
i += Delta + Previous;
uint32_t Current;
uint32_t Delta;
while ((Current = SysTick->VAL) == Previous) {}
Delta = (Current < Previous) ? -Current : Start - Current;
i += Delta + Previous;
Previous = Current;
} while (i < Delay * gTickMultiplier);
} while (i < ticks);
}