zhangyuheng/custom-uv-k5-firmware
1
0
Fork 0
forked from mirror/uv-k5-firmware
Code Pull Requests Activity

Renamed GetRegister for consistency.

Browse Source
This commit is contained in:
Dual Tachyon 2023-09-07 20:15:32 +01:00
parent a538bf3324
commit 4362a03bc1
7 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/aircopy.c
View File

@ -65,7 +65,7 @@ void AIRCOPY_StorePacket(void)
gFSKWriteIndex = 0;
gUpdateDisplay = true;
Status = BK4819_GetRegister(BK4819_REG_0B);
Status = BK4819_ReadRegister(BK4819_REG_0B);
BK4819_PrepareFSKReceive();
// Doc says bit 4 should be 1 = CRC OK, 0 = CRC FAIL, but original firmware checks for FAIL.
if ((Status & 0x0010U) == 0 && g_FSK_Buffer[0] == 0xABCD && g_FSK_Buffer[35] == 0xDCBA) {

6
app/app.c
View File

@ -473,11 +473,11 @@ void APP_CheckRadioInterrupts(void)
return;
}
while (BK4819_GetRegister(BK4819_REG_0C) & 1U) {
while (BK4819_ReadRegister(BK4819_REG_0C) & 1U) {
uint16_t Mask;
BK4819_WriteRegister(BK4819_REG_02, 0);
Mask = BK4819_GetRegister(BK4819_REG_02);
Mask = BK4819_ReadRegister(BK4819_REG_02);
if (Mask & BK4819_REG_02_DTMF_5TONE_FOUND) {
gDTMF_RequestPending = true;
gDTMF_RecvTimeout = 5;
@ -539,7 +539,7 @@ void APP_CheckRadioInterrupts(void)
uint8_t i;
for (i = 0; i < 4; i++) {
g_FSK_Buffer[gFSKWriteIndex++] = BK4819_GetRegister(BK4819_REG_5F);
g_FSK_Buffer[gFSKWriteIndex++] = BK4819_ReadRegister(BK4819_REG_5F);
}
AIRCOPY_StorePacket();
}

6
app/uart.c
View File

@ -301,9 +301,9 @@ static void CMD_0527(void)
Reply.Header.ID = 0x0528;
Reply.Header.Size = sizeof(Reply.Data);
Reply.Data.RSSI = BK4819_GetRegister(BK4819_REG_67) & 0x01FF;
Reply.Data.ExNoiseIndicator = BK4819_GetRegister(BK4819_REG_65) & 0x007F;
Reply.Data.GlitchIndicator = BK4819_GetRegister(BK4819_REG_63);
Reply.Data.RSSI = BK4819_ReadRegister(BK4819_REG_67) & 0x01FF;
Reply.Data.ExNoiseIndicator = BK4819_ReadRegister(BK4819_REG_65) & 0x007F;
Reply.Data.GlitchIndicator = BK4819_ReadRegister(BK4819_REG_63);
SendReply(&Reply, sizeof(Reply));
}

2
audio.c
View File

@ -79,7 +79,7 @@ void AUDIO_PlayBeep(BEEP_Type_t Beep)
return;
}
ToneConfig = BK4819_GetRegister(BK4819_REG_71);
ToneConfig = BK4819_ReadRegister(BK4819_REG_71);
GPIO_ClearBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);

32
driver/bk4819.c
View File

@ -91,7 +91,7 @@ static uint16_t BK4819_ReadU16(void)
return Value;
}
uint16_t BK4819_GetRegister(BK4819_REGISTER_t Register)
uint16_t BK4819_ReadRegister(BK4819_REGISTER_t Register)
{
uint16_t Value;
@ -278,7 +278,7 @@ void BK4819_EnableVox(uint16_t VoxEnableThreshold, uint16_t VoxDisableThreshold)
//else if(voxamp<VoxDisableThreshold) (After Delay) VOX = 0;
uint16_t REG_31_Value;
REG_31_Value = BK4819_GetRegister(BK4819_REG_31);
REG_31_Value = BK4819_ReadRegister(BK4819_REG_31);
// 0xA000 is undocumented?
BK4819_WriteRegister(BK4819_REG_46, 0xA000 | (VoxEnableThreshold & 0x07FF));
// 0x1800 is undocumented?
@ -392,7 +392,7 @@ void BK4819_DisableScramble(void)
{
uint16_t Value;
Value = BK4819_GetRegister(BK4819_REG_31);
Value = BK4819_ReadRegister(BK4819_REG_31);
BK4819_WriteRegister(BK4819_REG_31, Value & 0xFFFD);
}
@ -400,7 +400,7 @@ void BK4819_EnableScramble(uint8_t Type)
{
uint16_t Value;
Value = BK4819_GetRegister(BK4819_REG_31);
Value = BK4819_ReadRegister(BK4819_REG_31);
BK4819_WriteRegister(BK4819_REG_31, Value | 2);
BK4819_WriteRegister(BK4819_REG_71, (Type * 0x0408) + 0x68DC);
}
@ -409,7 +409,7 @@ void BK4819_DisableVox(void)
{
uint16_t Value;
Value = BK4819_GetRegister(BK4819_REG_31);
Value = BK4819_ReadRegister(BK4819_REG_31);
BK4819_WriteRegister(BK4819_REG_31, Value & 0xFFFB);
}
@ -738,7 +738,7 @@ void BK4819_EnableCTCSS(void)
uint16_t BK4819_GetRSSI(void)
{
return BK4819_GetRegister(BK4819_REG_67) & 0x01FF;
return BK4819_ReadRegister(BK4819_REG_67) & 0x01FF;
}
bool BK4819_GetFrequencyScanResult(uint32_t *pFrequency)
@ -746,10 +746,10 @@ bool BK4819_GetFrequencyScanResult(uint32_t *pFrequency)
uint16_t High, Low;
bool Finished;
High = BK4819_GetRegister(BK4819_REG_0D);
High = BK4819_ReadRegister(BK4819_REG_0D);
Finished = (High & 0x8000) == 0;
if (Finished) {
Low = BK4819_GetRegister(BK4819_REG_0E);
Low = BK4819_ReadRegister(BK4819_REG_0E);
*pFrequency = (uint32_t)((High & 0x7FF) << 16) | Low;
}
@ -760,14 +760,14 @@ BK4819_CssScanResult_t BK4819_GetCxCSSScanResult(uint32_t *pCdcssFreq, uint16_t
{
uint16_t High, Low;
High = BK4819_GetRegister(BK4819_REG_69);
High = BK4819_ReadRegister(BK4819_REG_69);
if ((High & 0x8000) == 0) {
Low = BK4819_GetRegister(BK4819_REG_6A);
Low = BK4819_ReadRegister(BK4819_REG_6A);
*pCdcssFreq = ((High & 0xFFF) << 12) | (Low & 0xFFF);
return BK4819_CSS_RESULT_CDCSS;
}
Low = BK4819_GetRegister(BK4819_REG_68);
Low = BK4819_ReadRegister(BK4819_REG_68);
if ((Low & 0x8000) == 0) {
*pCtcssFreq = (Low & 0x1FFF) * 4843 / 10000;
return BK4819_CSS_RESULT_CTCSS;
@ -815,17 +815,17 @@ void BK4819_StopScan(void)
uint8_t BK4819_GetDTMF_5TONE_Code(void)
{
return (BK4819_GetRegister(BK4819_REG_0B) >> 8) & 0x0F;
return (BK4819_ReadRegister(BK4819_REG_0B) >> 8) & 0x0F;
}
uint8_t BK4819_GetCDCSSCodeType(void)
{
return (BK4819_GetRegister(BK4819_REG_0C) >> 14) & 3;
return (BK4819_ReadRegister(BK4819_REG_0C) >> 14) & 3;
}
uint8_t BK4819_GetCTCType(void)
{
return (BK4819_GetRegister(BK4819_REG_0C) >> 10) & 3;
return (BK4819_ReadRegister(BK4819_REG_0C) >> 10) & 3;
}
void BK4819_SendFSKData(uint16_t *pData)
@ -850,7 +850,7 @@ void BK4819_SendFSKData(uint16_t *pData)
BK4819_WriteRegister(BK4819_REG_59, 0x2868);
while (Timeout) {
if (BK4819_GetRegister(BK4819_REG_0C) & 1U) {
if (BK4819_ReadRegister(BK4819_REG_0C) & 1U) {
break;
}
SYSTEM_DelayMs(5);
@ -937,7 +937,7 @@ void BK4819_Enable_AfDac_DiscMode_TxDsp(void)
void BK4819_GetVoxAmp(uint16_t *pResult)
{
*pResult = BK4819_GetRegister(BK4819_REG_64) & 0x7FFF;
*pResult = BK4819_ReadRegister(BK4819_REG_64) & 0x7FFF;
}
void BK4819_SetScrambleFrequencyControlWord(uint32_t Frequency)

2
driver/bk4819.h
View File

@ -51,7 +51,7 @@ typedef enum BK4819_CssScanResult_t BK4819_CssScanResult_t;
extern bool gRxIdleMode;
void BK4819_Init(void);
uint16_t BK4819_GetRegister(BK4819_REGISTER_t Register);
uint16_t BK4819_ReadRegister(BK4819_REGISTER_t Register);
void BK4819_WriteRegister(BK4819_REGISTER_t Register, uint16_t Data);
void BK4819_WriteU8(uint8_t Data);
void BK4819_WriteU16(uint16_t Data);

2
radio.c
View File

@ -494,7 +494,7 @@ void RADIO_SetupRegisters(bool bSwitchToFunction0)
BK4819_ToggleGpioOut(BK4819_GPIO5_PIN1, false);
while (1) {
Status = BK4819_GetRegister(BK4819_REG_0C);
Status = BK4819_ReadRegister(BK4819_REG_0C);
if ((Status & 1U) == 0) { // INTERRUPT REQUEST
break;
}