mirrors/uv-k5-firmware-custom
0
Fork 0
mirror of https://github.com/OneOfEleven/uv-k5-firmware-custom.git synced 2025-04-29 14:51:26 +03:00
Code Issues Releases Activity

More commenting around the BK chip registers

Browse Source
This commit is contained in:
OneOfEleven 2023-09-18 16:58:36 +01:00
parent f55c63e2af
commit 39c0f0afac
6 changed files with 118 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

123
app/app.c
View File

@ -174,7 +174,7 @@ static void APP_HandleIncoming(void)
// let the user see DW is not active // let the user see DW is not active
gDualWatchActive = false; gDualWatchActive = false;
gUpdateStatus = true; gUpdateStatus = true;
return; return;
} }
} }
@ -400,7 +400,7 @@ void APP_StartListening(FUNCTION_Type_t Function)
if (gFmRadioMode) if (gFmRadioMode)
BK1080_Init(0, false); BK1080_Init(0, false);
#endif #endif
gVFO_RSSI_Level[gEeprom.RX_CHANNEL == 0] = 0; gVFO_RSSI_Level[gEeprom.RX_CHANNEL == 0] = 0;
GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH); GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
@ -460,36 +460,93 @@ void APP_StartListening(FUNCTION_Type_t Function)
} }
if (gRxVfo->IsAM) if (gRxVfo->IsAM)
{ { // AM
// RX AF level // RX AF level
BK4819_WriteRegister(BK4819_REG_48, 0xB3A8);
// help improve AM RX audio by reducing the PGA gain
// //
// I think the solution is to set the RX AGC to limit the front end/I.F gain // REG_48 <15:12> 11 ??????
//
// REG_48 <11:10> 0 AF Rx Gain-1
// 0 = 0dB
// 1 = -6dB
// 2 = -12dB
// 3 = -18dB
//
// REG_48 <9:4> 60 AF Rx Gain-2 -26dB ~ 5.5dB 0.5dB/step
// 63 = max
// 0 = mute
//
// REG_48 <3:0> 15 AF DAC Gain (after Gain-1 and Gain-2)
// 15 = max
// 0 = min
// approx 2dB/step
//
BK4819_WriteRegister(BK4819_REG_48,
#if 0
(11u << 12) | // ???
( 0u << 10) | // AF Rx Gain-1
(gEeprom.VOLUME_GAIN << 4) | // AF Rx Gain-2
(gEeprom.DAC_GAIN << 0)); // AF DAC Gain (after Gain-1 and Gain-2)
#else
(11u << 12) | // ???
( 0u << 10) | // AF Rx Gain-1
(63u << 4) | // AF Rx Gain-2
(15u << 0)); // AF DAC Gain (after Gain-1 and Gain-2)
#endif
BK4819_WriteRegister(0x4B, BK4819_ReadRegister(0x4B) & ~(1u << 5)); // enable RX ALC
// help improve AM RX distorted audio by reducing the PGA gain (still bad with stronger signals
//
// I think the proper solution is to set the RX AGC to limit the front end/I.F gain
// //
// LNA_SHORT .. 0dB // LNA_SHORT .. 0dB
// LNA ........ 14dB // LNA ........ 14dB
// MIXER ...... 0dB // MIXER ...... 0dB
// PGA ........ -15dB // PGA ........ -15dB
// // LNA SHORT LNA MIXER PGA
BK4819_WriteRegister(BK4819_REG_13, (3u << 8) | (2u << 5) | (3u << 3) | (3u << 0)); BK4819_WriteRegister(BK4819_REG_13, (3u << 8) | (2u << 5) | (3u << 3) | (3u << 0));
gNeverUsed = 0; gNeverUsed = 0;
} }
else else
{ { // FM
// RX AF level // RX AF level
BK4819_WriteRegister(BK4819_REG_48, 0xB000 | (gEeprom.VOLUME_GAIN << 4) | (gEeprom.DAC_GAIN << 0)); //
// REG_48 <15:12> 11 ??????
//
// REG_48 <11:10> 0 AF Rx Gain-1
// 0 = 0dB
// 1 = -6dB
// 2 = -12dB
// 3 = -18dB
//
// REG_48 <9:4> 60 AF Rx Gain-2 -26dB ~ 5.5dB 0.5dB/step
// 63 = max
// 0 = mute
//
// REG_48 <3:0> 15 AF DAC Gain (after Gain-1 and Gain-2)
// 15 = max
// 0 = min
// approx 2dB/step
//
BK4819_WriteRegister(BK4819_REG_48,
(11u << 12) | // ???
( 0u << 10) | // AF Rx Gain-1
(gEeprom.VOLUME_GAIN << 4) | // AF Rx Gain-2
(gEeprom.DAC_GAIN << 0)); // AF DAC Gain (after Gain-1 and Gain-2)
BK4819_WriteRegister(0x4B, BK4819_ReadRegister(0x4B) | (1u << 5)); // disable RX ALC
// LNA_SHORT .. 0dB // LNA_SHORT .. 0dB
// LNA ........ 14dB // LNA ........ 14dB
// MIXER ...... 0dB // MIXER ...... 0dB
// PGA ........ -3dB // PGA ........ -3dB
// // LNA SHORT LNA MIXER PGA
BK4819_WriteRegister(BK4819_REG_13, (3u << 8) | (2u << 5) | (3u << 3) | (6u << 0)); BK4819_WriteRegister(BK4819_REG_13, (3u << 8) | (2u << 5) | (3u << 3) | (6u << 0));
} }
#ifdef ENABLE_VOICE #ifdef ENABLE_VOICE
if (gVoiceWriteIndex == 0) if (gVoiceWriteIndex == 0)
#endif #endif
@ -678,10 +735,10 @@ void APP_CheckRadioInterrupts(void)
// const uint8_t ctcss_shift = BK4819_GetCTCShift(); // const uint8_t ctcss_shift = BK4819_GetCTCShift();
// if (ctcss_shift > 0) // if (ctcss_shift > 0)
// g_CTCSS_Lost = true; // g_CTCSS_Lost = true;
if (interrupt_status_bits & BK4819_REG_02_DTMF_5TONE_FOUND) if (interrupt_status_bits & BK4819_REG_02_DTMF_5TONE_FOUND)
{ // save the new DTMF RX'ed character { // save the new DTMF RX'ed character
// fetch the RX'ed char // fetch the RX'ed char
const char c = DTMF_GetCharacter(BK4819_GetDTMF_5TONE_Code()); const char c = DTMF_GetCharacter(BK4819_GetDTMF_5TONE_Code());
if (c != 0xff) if (c != 0xff)
@ -692,7 +749,7 @@ void APP_CheckRadioInterrupts(void)
if (gDTMF_WriteIndex >= sizeof(gDTMF_Received)) if (gDTMF_WriteIndex >= sizeof(gDTMF_Received))
memmove(gDTMF_Received, &gDTMF_Received[1], gDTMF_WriteIndex-- - 1); memmove(gDTMF_Received, &gDTMF_Received[1], gDTMF_WriteIndex-- - 1);
gDTMF_Received[gDTMF_WriteIndex++] = c; gDTMF_Received[gDTMF_WriteIndex++] = c;
if (gCurrentFunction == FUNCTION_RECEIVE) if (gCurrentFunction == FUNCTION_RECEIVE)
{ {
#ifdef ENABLE_DTMF_DECODER #ifdef ENABLE_DTMF_DECODER
@ -705,7 +762,7 @@ void APP_CheckRadioInterrupts(void)
gDTMF_ReceivedSaved[len] = '\0'; gDTMF_ReceivedSaved[len] = '\0';
gUpdateDisplay = true; gUpdateDisplay = true;
#endif #endif
DTMF_HandleRequest(); DTMF_HandleRequest();
} }
} }
@ -1016,7 +1073,7 @@ void APP_Update(void)
gScheduleFM = false; gScheduleFM = false;
} }
#endif #endif
if (gEeprom.VOX_SWITCH) if (gEeprom.VOX_SWITCH)
APP_HandleVox(); APP_HandleVox();
@ -1186,7 +1243,7 @@ void APP_CheckKeys(void)
{ // PTT pressed { // PTT pressed
if (++gPttDebounceCounter >= 3) // 30ms if (++gPttDebounceCounter >= 3) // 30ms
{ // start transmitting { // start transmitting
boot_counter_10ms = 0; boot_counter_10ms = 0;
gPttDebounceCounter = 0; gPttDebounceCounter = 0;
gPttIsPressed = true; gPttIsPressed = true;
APP_ProcessKey(KEY_PTT, true, false); APP_ProcessKey(KEY_PTT, true, false);
@ -1236,7 +1293,7 @@ void APP_CheckKeys(void)
} }
// key is being held pressed // key is being held pressed
if (gDebounceCounter == key_repeat_delay_10ms) if (gDebounceCounter == key_repeat_delay_10ms)
{ // initial delay after pressed { // initial delay after pressed
if (Key == KEY_STAR || if (Key == KEY_STAR ||
@ -1315,7 +1372,7 @@ void APP_TimeSlice10ms(void)
if (gFmRadioCountdown_500ms > 0) if (gFmRadioCountdown_500ms > 0)
return; return;
#endif #endif
if (gFlashLightState == FLASHLIGHT_BLINK && (gFlashLightBlinkCounter & 15u) == 0) if (gFlashLightState == FLASHLIGHT_BLINK && (gFlashLightBlinkCounter & 15u) == 0)
GPIO_FlipBit(&GPIOC->DATA, GPIOC_PIN_FLASHLIGHT); GPIO_FlipBit(&GPIOC->DATA, GPIOC_PIN_FLASHLIGHT);
@ -1395,7 +1452,7 @@ void APP_TimeSlice10ms(void)
} }
} }
#endif #endif
if (gScreenToDisplay == DISPLAY_SCANNER) if (gScreenToDisplay == DISPLAY_SCANNER)
{ {
uint32_t Result; uint32_t Result;
@ -1555,7 +1612,7 @@ void APP_TimeSlice500ms(void)
if (gKeyInputCountdown > 0) if (gKeyInputCountdown > 0)
if (--gKeyInputCountdown == 0) if (--gKeyInputCountdown == 0)
cancelUserInputModes(); cancelUserInputModes();
// Skipped authentic device check // Skipped authentic device check
#ifdef ENABLE_FMRADIO #ifdef ENABLE_FMRADIO
@ -1565,7 +1622,7 @@ void APP_TimeSlice500ms(void)
return; return;
} }
#endif #endif
if (gReducedService) if (gReducedService)
{ {
BOARD_ADC_GetBatteryInfo(&gBatteryCurrentVoltage, &gBatteryCurrent); BOARD_ADC_GetBatteryInfo(&gBatteryCurrentVoltage, &gBatteryCurrent);
@ -1673,7 +1730,7 @@ void APP_TimeSlice500ms(void)
} }
} }
#endif #endif
if (gLowBattery) if (gLowBattery)
{ {
gLowBatteryBlink = ++gLowBatteryCountdown & 1; gLowBatteryBlink = ++gLowBatteryCountdown & 1;
@ -1846,7 +1903,7 @@ static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
// const bool backlight_was_on = (gBacklightCountdown > 0 || gEeprom.BACKLIGHT >= 5); // const bool backlight_was_on = (gBacklightCountdown > 0 || gEeprom.BACKLIGHT >= 5);
const bool backlight_was_on = GPIO_CheckBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT); const bool backlight_was_on = GPIO_CheckBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT);
if (Key == KEY_EXIT && !backlight_was_on) if (Key == KEY_EXIT && !backlight_was_on)
{ // just turn the light on for now { // just turn the light on for now
BACKLIGHT_TurnOn(); BACKLIGHT_TurnOn();
@ -1892,7 +1949,7 @@ static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
gFlagSaveFM = false; gFlagSaveFM = false;
} }
#endif #endif
if (gFlagSaveChannel) if (gFlagSaveChannel)
{ {
SETTINGS_SaveChannel(gTxVfo->CHANNEL_SAVE, gEeprom.TX_CHANNEL, gTxVfo, gFlagSaveChannel); SETTINGS_SaveChannel(gTxVfo->CHANNEL_SAVE, gEeprom.TX_CHANNEL, gTxVfo, gFlagSaveChannel);
@ -2013,7 +2070,7 @@ static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
{ {
if (gCurrentFunction == FUNCTION_TRANSMIT) if (gCurrentFunction == FUNCTION_TRANSMIT)
{ // transmitting { // transmitting
#ifdef ENABLE_ALARM #ifdef ENABLE_ALARM
if (gAlarmState == ALARM_STATE_OFF) if (gAlarmState == ALARM_STATE_OFF)
#endif #endif
@ -2099,27 +2156,27 @@ static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
bKeyHeld = false; // allow the channel setting to be saved bKeyHeld = false; // allow the channel setting to be saved
#endif #endif
break; break;
#ifdef ENABLE_FMRADIO #ifdef ENABLE_FMRADIO
case DISPLAY_FM: case DISPLAY_FM:
FM_ProcessKeys(Key, bKeyPressed, bKeyHeld); FM_ProcessKeys(Key, bKeyPressed, bKeyHeld);
break; break;
#endif #endif
case DISPLAY_MENU: case DISPLAY_MENU:
MENU_ProcessKeys(Key, bKeyPressed, bKeyHeld); MENU_ProcessKeys(Key, bKeyPressed, bKeyHeld);
break; break;
case DISPLAY_SCANNER: case DISPLAY_SCANNER:
SCANNER_ProcessKeys(Key, bKeyPressed, bKeyHeld); SCANNER_ProcessKeys(Key, bKeyPressed, bKeyHeld);
break; break;
#ifdef ENABLE_AIRCOPY #ifdef ENABLE_AIRCOPY
case DISPLAY_AIRCOPY: case DISPLAY_AIRCOPY:
AIRCOPY_ProcessKeys(Key, bKeyPressed, bKeyHeld); AIRCOPY_ProcessKeys(Key, bKeyPressed, bKeyHeld);
break; break;
#endif #endif
case DISPLAY_INVALID: case DISPLAY_INVALID:
default: default:
break; break;
@ -2186,7 +2243,7 @@ Skip:
gRequestSaveFM = false; gRequestSaveFM = false;
} }
#endif #endif
if (gRequestSaveVFO) if (gRequestSaveVFO)
{ {
if (!bKeyHeld) if (!bKeyHeld)

26
driver/bk4819.c
View File

@ -58,8 +58,30 @@ void BK4819_Init(void)
BK4819_WriteRegister(BK4819_REG_7D, 0xE940); BK4819_WriteRegister(BK4819_REG_7D, 0xE940);
// RX AF level // RX AF level
BK4819_WriteRegister(BK4819_REG_48, 0xB3A8); //
// REG_48 <15:12> 11 ??????
//
// REG_48 <11:10> 0 AF Rx Gain-1
// 0 = 0dB
// 1 = -6dB
// 2 = -12dB
// 3 = -18dB
//
// REG_48 <9:4> 60 AF Rx Gain-2 -26dB ~ 5.5dB 0.5dB/step
// 63 = max
// 0 = mute
//
// REG_48 <3:0> 15 AF DAC Gain (after Gain-1 and Gain-2)
// 15 = max
// 0 = min
// approx 2dB/step
//
BK4819_WriteRegister(BK4819_REG_48, // 0xB3A8); // 1011 00 111010 1000
(11u << 12) | // ???
( 0u << 10) | // AF Rx Gain-1
(58u << 4) | // AF Rx Gain-2
( 8u << 0)); // AF DAC Gain (after Gain-1 and Gain-2)
const uint8_t dtmf_coeffs[] = {0x6F,0x6B,0x67,0x62,0x50,0x47,0x3A,0x2C,0x41,0x37,0x25,0x17,0xE4,0xCB,0xB5,0x9F}; const uint8_t dtmf_coeffs[] = {0x6F,0x6B,0x67,0x62,0x50,0x47,0x3A,0x2C,0x41,0x37,0x25,0x17,0xE4,0xCB,0xB5,0x9F};
for (unsigned int i = 0; i < ARRAY_SIZE(dtmf_coeffs); i++) for (unsigned int i = 0; i < ARRAY_SIZE(dtmf_coeffs); i++)
BK4819_WriteRegister(BK4819_REG_09, (i << 12) | dtmf_coeffs[i]); BK4819_WriteRegister(BK4819_REG_09, (i << 12) | dtmf_coeffs[i]);

BIN
firmware
View File

Binary file not shown.

BIN
firmware.bin
View File

Binary file not shown.

BIN
firmware.packed.bin
View File

Binary file not shown.

8
ui/main.c
View File

@ -138,19 +138,19 @@ void UI_DisplayMain(void)
// highlight the selected/used VFO with a marker // highlight the selected/used VFO with a marker
if (!single_vfo && bIsSameVfo) if (!single_vfo && bIsSameVfo)
memmove(pLine0 + 2, BITMAP_VFO_Default, sizeof(BITMAP_VFO_Default)); memmove(pLine0 + 0, BITMAP_VFO_Default, sizeof(BITMAP_VFO_Default));
else else
if (gEeprom.CROSS_BAND_RX_TX != CROSS_BAND_OFF) if (gEeprom.CROSS_BAND_RX_TX != CROSS_BAND_OFF)
memmove(pLine0 + 2, BITMAP_VFO_NotDefault, sizeof(BITMAP_VFO_NotDefault)); memmove(pLine0 + 0, BITMAP_VFO_NotDefault, sizeof(BITMAP_VFO_NotDefault));
} }
else else
if (!single_vfo) if (!single_vfo)
{ // highlight the selected/used VFO with a marker { // highlight the selected/used VFO with a marker
if (bIsSameVfo) if (bIsSameVfo)
memmove(pLine0 + 2, BITMAP_VFO_Default, sizeof(BITMAP_VFO_Default)); memmove(pLine0 + 0, BITMAP_VFO_Default, sizeof(BITMAP_VFO_Default));
else else
//if (gEeprom.CROSS_BAND_RX_TX != CROSS_BAND_OFF) //if (gEeprom.CROSS_BAND_RX_TX != CROSS_BAND_OFF)
memmove(pLine0 + 2, BITMAP_VFO_NotDefault, sizeof(BITMAP_VFO_NotDefault)); memmove(pLine0 + 0, BITMAP_VFO_NotDefault, sizeof(BITMAP_VFO_NotDefault));
} }
uint32_t SomeValue = 0; uint32_t SomeValue = 0;