BRNSystems/brnQuanFW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

REFACTORING: Fixed correct BK4819 GPIO pin names

Browse Source
This commit is contained in:
Krzysiek Egzmont
2023-10-18 17:24:56 +02:00
parent b9f9566158
commit 13b41abce6
7 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/aircopy.c
View File

@@ -57,7 +57,7 @@ void AIRCOPY_SendMessage(void)
BK4819_SendFSKData(g_FSK_Buffer); BK4819_SendFSKData(g_FSK_Buffer);
BK4819_SetupPowerAmplifier(0, 0); BK4819_SetupPowerAmplifier(0, 0);
BK4819_ToggleGpioOut(BK4819_GPIO5_PIN1, false); BK4819_ToggleGpioOut(BK4819_GPIO1_PIN29, false);
gAircopySendCountdown = 30; gAircopySendCountdown = 30;
} }

12
app/app.c
View File

@@ -783,13 +783,13 @@ void APP_CheckRadioInterrupts(void)
if (interrupt_status_bits & BK4819_REG_02_SQUELCH_LOST) if (interrupt_status_bits & BK4819_REG_02_SQUELCH_LOST)
{ {
g_SquelchLost = true; g_SquelchLost = true;
BK4819_ToggleGpioOut(BK4819_GPIO0_PIN28_GREEN, true); BK4819_ToggleGpioOut(BK4819_GPIO6_PIN2_GREEN, true);
} }
if (interrupt_status_bits & BK4819_REG_02_SQUELCH_FOUND) if (interrupt_status_bits & BK4819_REG_02_SQUELCH_FOUND)
{ {
g_SquelchLost = false; g_SquelchLost = false;
BK4819_ToggleGpioOut(BK4819_GPIO0_PIN28_GREEN, false); BK4819_ToggleGpioOut(BK4819_GPIO6_PIN2_GREEN, false);
} }
#ifdef ENABLE_AIRCOPY #ifdef ENABLE_AIRCOPY
@@ -1127,7 +1127,7 @@ void APP_Update(void)
BK4819_DisableVox(); BK4819_DisableVox();
BK4819_Sleep(); BK4819_Sleep();
BK4819_ToggleGpioOut(BK4819_GPIO6_PIN2, false); BK4819_ToggleGpioOut(BK4819_GPIO0_PIN28, false);
// Authentic device checked removed // Authentic device checked removed
@@ -1375,9 +1375,9 @@ void APP_TimeSlice10ms(void)
RADIO_EnableCxCSS(); RADIO_EnableCxCSS();
BK4819_SetupPowerAmplifier(0, 0); BK4819_SetupPowerAmplifier(0, 0);
BK4819_ToggleGpioOut(BK4819_GPIO5_PIN1, false); BK4819_ToggleGpioOut(BK4819_GPIO1_PIN29, false);
BK4819_Enable_AfDac_DiscMode_TxDsp(); BK4819_Enable_AfDac_DiscMode_TxDsp();
BK4819_ToggleGpioOut(BK4819_GPIO1_PIN29_RED, false); BK4819_ToggleGpioOut(BK4819_GPIO5_PIN1_RED, false);
GUI_DisplayScreen(); GUI_DisplayScreen();
} }
@@ -1387,7 +1387,7 @@ void APP_TimeSlice10ms(void)
GUI_DisplayScreen(); GUI_DisplayScreen();
BK4819_ToggleGpioOut(BK4819_GPIO1_PIN29_RED, true); BK4819_ToggleGpioOut(BK4819_GPIO5_PIN1_RED, true);
RADIO_SetTxParameters(); RADIO_SetTxParameters();
BK4819_TransmitTone(true, 500); BK4819_TransmitTone(true, 500);
SYSTEM_DelayMs(2); SYSTEM_DelayMs(2);

6
app/spectrum.c
View File

@@ -323,7 +323,7 @@ static void ToggleAudio(bool on) {
static void ToggleRX(bool on) { static void ToggleRX(bool on) {
isListening = on; isListening = on;
BK4819_ToggleGpioOut(BK4819_GPIO0_PIN28_GREEN, on); BK4819_ToggleGpioOut(BK4819_GPIO6_PIN2_GREEN, on);
ToggleAudio(on); ToggleAudio(on);
ToggleAFDAC(on); ToggleAFDAC(on);
@@ -905,8 +905,8 @@ void OnKeyDownStill(KEY_Code_t key) {
break; break;
case KEY_PTT: case KEY_PTT:
// TODO: start transmit // TODO: start transmit
/* BK4819_ToggleGpioOut(BK4819_GPIO0_PIN28_GREEN, false); /* BK4819_ToggleGpioOut(BK4819_GPIO6_PIN2_GREEN, false);
BK4819_ToggleGpioOut(BK4819_GPIO1_PIN29_RED, true); */ BK4819_ToggleGpioOut(BK4819_GPIO5_PIN1_RED, true); */
break; break;
case KEY_MENU: case KEY_MENU:
if (menuState == ARRAY_SIZE(registerSpecs) - 1) { if (menuState == ARRAY_SIZE(registerSpecs) - 1) {

11
driver/bk4819-regs.h
View File

@@ -95,13 +95,12 @@ enum BK4819_REGISTER_t {
typedef enum BK4819_REGISTER_t BK4819_REGISTER_t; typedef enum BK4819_REGISTER_t BK4819_REGISTER_t;
enum BK4819_GPIO_PIN_t { enum BK4819_GPIO_PIN_t {
BK4819_GPIO6_PIN2 = 0, BK4819_GPIO0_PIN28 = 0,
BK4819_GPIO5_PIN1 = 1, BK4819_GPIO1_PIN29 = 1,
BK4819_GPIO4_PIN32 = 2,
BK4819_GPIO3_PIN31 = 3, BK4819_GPIO3_PIN31 = 3,
BK4819_GPIO2_PIN30 = 4, BK4819_GPIO4_PIN32 = 4,
BK4819_GPIO1_PIN29_RED = 5, BK4819_GPIO5_PIN1_RED = 5,
BK4819_GPIO0_PIN28_GREEN = 6, BK4819_GPIO6_PIN2_GREEN = 6,
}; };
typedef enum BK4819_GPIO_PIN_t BK4819_GPIO_PIN_t; typedef enum BK4819_GPIO_PIN_t BK4819_GPIO_PIN_t;

8
driver/bk4819.c
View File

@@ -844,18 +844,18 @@ void BK4819_PickRXFilterPathBasedOnFrequency(uint32_t Frequency)
{ {
if (Frequency < 28000000) if (Frequency < 28000000)
{ {
BK4819_ToggleGpioOut(BK4819_GPIO2_PIN30, true); BK4819_ToggleGpioOut(BK4819_GPIO4_PIN32, true);
BK4819_ToggleGpioOut(BK4819_GPIO3_PIN31, false); BK4819_ToggleGpioOut(BK4819_GPIO3_PIN31, false);
} }
else else
if (Frequency == 0xFFFFFFFF) if (Frequency == 0xFFFFFFFF)
{ {
BK4819_ToggleGpioOut(BK4819_GPIO2_PIN30, false); BK4819_ToggleGpioOut(BK4819_GPIO4_PIN32, false);
BK4819_ToggleGpioOut(BK4819_GPIO3_PIN31, false); BK4819_ToggleGpioOut(BK4819_GPIO3_PIN31, false);
} }
else else
{ {
BK4819_ToggleGpioOut(BK4819_GPIO2_PIN30, false); BK4819_ToggleGpioOut(BK4819_GPIO4_PIN32, false);
BK4819_ToggleGpioOut(BK4819_GPIO3_PIN31, true); BK4819_ToggleGpioOut(BK4819_GPIO3_PIN31, true);
} }
} }
@@ -1198,7 +1198,7 @@ void BK4819_Conditional_RX_TurnOn_and_GPIO6_Enable(void)
{ {
if (gRxIdleMode) if (gRxIdleMode)
{ {
BK4819_ToggleGpioOut(BK4819_GPIO6_PIN2, true); BK4819_ToggleGpioOut(BK4819_GPIO0_PIN28, true);
BK4819_RX_TurnOn(); BK4819_RX_TurnOn();
} }
} }

4
functions.c
View File

@@ -145,7 +145,7 @@ void FUNCTION_Select(FUNCTION_Type_t Function)
BK4819_DisableVox(); BK4819_DisableVox();
BK4819_Sleep(); BK4819_Sleep();
BK4819_ToggleGpioOut(BK4819_GPIO6_PIN2, false); BK4819_ToggleGpioOut(BK4819_GPIO0_PIN28, false);
gUpdateStatus = true; gUpdateStatus = true;
@@ -204,7 +204,7 @@ void FUNCTION_Select(FUNCTION_Type_t Function)
RADIO_SetTxParameters(); RADIO_SetTxParameters();
// turn the RED LED on // turn the RED LED on
BK4819_ToggleGpioOut(BK4819_GPIO1_PIN29_RED, true); BK4819_ToggleGpioOut(BK4819_GPIO5_PIN1_RED, true);
DTMF_Reply(); DTMF_Reply();

12
radio.c
View File

@@ -578,7 +578,7 @@ void RADIO_SetupRegisters(bool bSwitchToFunction0)
gEnableSpeaker = false; gEnableSpeaker = false;
BK4819_ToggleGpioOut(BK4819_GPIO0_PIN28_GREEN, false); BK4819_ToggleGpioOut(BK4819_GPIO6_PIN2_GREEN, false);
switch (Bandwidth) switch (Bandwidth)
{ {
@@ -596,11 +596,11 @@ void RADIO_SetupRegisters(bool bSwitchToFunction0)
break; break;
} }
BK4819_ToggleGpioOut(BK4819_GPIO1_PIN29_RED, false); BK4819_ToggleGpioOut(BK4819_GPIO5_PIN1_RED, false);
BK4819_SetupPowerAmplifier(0, 0); BK4819_SetupPowerAmplifier(0, 0);
BK4819_ToggleGpioOut(BK4819_GPIO5_PIN1, false); BK4819_ToggleGpioOut(BK4819_GPIO1_PIN29, false);
while (1) while (1)
{ {
@@ -634,7 +634,7 @@ void RADIO_SetupRegisters(bool bSwitchToFunction0)
BK4819_PickRXFilterPathBasedOnFrequency(Frequency); BK4819_PickRXFilterPathBasedOnFrequency(Frequency);
// what does this in do ? // what does this in do ?
BK4819_ToggleGpioOut(BK4819_GPIO6_PIN2, true); BK4819_ToggleGpioOut(BK4819_GPIO0_PIN28, true);
// AF RX Gain and DAC // AF RX Gain and DAC
BK4819_WriteRegister(BK4819_REG_48, 0xB3A8); // 1011 00 111010 1000 BK4819_WriteRegister(BK4819_REG_48, 0xB3A8); // 1011 00 111010 1000
@@ -828,7 +828,7 @@ void RADIO_SetTxParameters(void)
gEnableSpeaker = false; gEnableSpeaker = false;
BK4819_ToggleGpioOut(BK4819_GPIO6_PIN2, false); BK4819_ToggleGpioOut(BK4819_GPIO0_PIN28, false);
switch (Bandwidth) switch (Bandwidth)
{ {
@@ -857,7 +857,7 @@ void RADIO_SetTxParameters(void)
BK4819_PickRXFilterPathBasedOnFrequency(gCurrentVfo->pTX->Frequency); BK4819_PickRXFilterPathBasedOnFrequency(gCurrentVfo->pTX->Frequency);
BK4819_ToggleGpioOut(BK4819_GPIO5_PIN1, true); BK4819_ToggleGpioOut(BK4819_GPIO1_PIN29, true);
SYSTEM_DelayMs(5); SYSTEM_DelayMs(5);