From ec33203403fbe044a6b4678c610711ff7583d2ea Mon Sep 17 00:00:00 2001 From: OneOfEleven Date: Mon, 2 Oct 2023 10:05:15 +0100 Subject: [PATCH] Update RADIO_InitInfo() so that things match up rather than fixed numerical constants --- app/app.h | 1 + firmware.bin | Bin 50404 -> 50404 bytes firmware.packed.bin | Bin 50422 -> 50422 bytes frequencies.h | 26 ++++++++++++++++++++++++-- functions.c | 1 + radio.c | 2 +- radio.h | 29 +---------------------------- settings.h | 7 +------ 8 files changed, 29 insertions(+), 37 deletions(-) diff --git a/app/app.h b/app/app.h index 2e6febd..f71765d 100644 --- a/app/app.h +++ b/app/app.h @@ -20,6 +20,7 @@ #include #include "functions.h" +#include "frequencies.h" #include "radio.h" void APP_EndTransmission(void); diff --git a/firmware.bin b/firmware.bin index 90f34ca6cdf6a414d4e45404a9645ad0fe8d973c..593416683ae342b26bf46be2c77de224e08264e2 100644 GIT binary patch delta 43 scmaFT$^4{~c|(B^(<7G6MM4pC*o~9T(@ZSQHeXzKgc;76v&lmU0CQRpGynhq delta 43 scmaFT$^4{~c|(B^(-F?iMM4pC*i#J>6AcqBHeXzKgc;76v&lmU0C_(Uu>b%7 diff --git a/firmware.packed.bin b/firmware.packed.bin index c249d17b21408bd0c33d8499f5596eaca65dce0a..0dcef7002e480ac21c7fc8770a2dc67efb41c9a1 100644 GIT binary patch delta 59 zcmV-B0L1_Hi39eD1F&!s0!=itauSpc2YdI122|o%vkf54jt8<~6`O7mr?cU%!~+Li RZ_L*&+yAqyvPcpFw@LF48btsA delta 59 zcmV-B0L1_Hi39eD1F&!s0&6+5auSpc2Q8$~0a3bFvkf54jtAs2L!4_#sk7m(!~+Kl RJetregYmPhvPcpF$wA;n87lw) diff --git a/frequencies.h b/frequencies.h index 7202518..36b4c8f 100644 --- a/frequencies.h +++ b/frequencies.h @@ -19,7 +19,7 @@ #include -#include "radio.h" +//#include "radio.h" extern const uint32_t bx_start1_Hz; extern const uint32_t bx_stop1_Hz; @@ -38,9 +38,31 @@ enum FREQUENCY_Band_t BAND6_400MHz, BAND7_470MHz }; - typedef enum FREQUENCY_Band_t FREQUENCY_Band_t; +#if 0 + enum STEP_Setting_t { + STEP_2_5kHz = 0, + STEP_5_0kHz, + STEP_6_25kHz, + STEP_10_0kHz, + STEP_12_5kHz, + STEP_25_0kHz, + STEP_8_33kHz + }; +#else + enum STEP_Setting_t { + STEP_1_25kHz = 0, + STEP_2_5kHz, + STEP_6_25kHz, + STEP_10_0kHz, + STEP_12_5kHz, + STEP_25_0kHz, + STEP_8_33kHz + }; +#endif +typedef enum STEP_Setting_t STEP_Setting_t; + extern const uint32_t LowerLimitFrequencyBandTable[7]; extern const uint32_t MiddleFrequencyBandTable[7]; extern const uint32_t UpperLimitFrequencyBandTable[7]; diff --git a/functions.c b/functions.c index 389018d..01fb967 100644 --- a/functions.c +++ b/functions.c @@ -28,6 +28,7 @@ #include "driver/bk4819.h" #include "driver/gpio.h" #include "driver/system.h" +#include "frequencies.h" #include "functions.h" #include "helper/battery.h" #include "misc.h" diff --git a/radio.c b/radio.c index 5a5bbe2..4b2c14e 100644 --- a/radio.c +++ b/radio.c @@ -122,7 +122,7 @@ void RADIO_InitInfo(VFO_Info_t *pInfo, const uint8_t ChannelSave, const uint32_t pInfo->SCANLIST1_PARTICIPATION = true; pInfo->SCANLIST2_PARTICIPATION = true; pInfo->STEP_SETTING = STEP_12_5kHz; - pInfo->StepFrequency = 2500; + pInfo->StepFrequency = StepFrequencyTable[pInfo->STEP_SETTING]; pInfo->CHANNEL_SAVE = ChannelSave; pInfo->FrequencyReverse = false; pInfo->OUTPUT_POWER = OUTPUT_POWER_LOW; diff --git a/radio.h b/radio.h index ecfe98a..34d973e 100644 --- a/radio.h +++ b/radio.h @@ -21,6 +21,7 @@ #include #include "dcs.h" +#include "frequencies.h" enum { MR_CH_BAND_MASK = 0x0F << 0, @@ -47,35 +48,8 @@ enum PTT_ID_t { PTT_ID_EOT, PTT_ID_BOTH }; - typedef enum PTT_ID_t PTT_ID_t; -#if 0 - enum STEP_Setting_t - { - STEP_2_5kHz, - STEP_5_0kHz, - STEP_6_25kHz, - STEP_10_0kHz, - STEP_12_5kHz, - STEP_25_0kHz, - STEP_8_33kHz - }; -#else - enum STEP_Setting_t - { - STEP_1_25kHz, - STEP_2_5kHz, - STEP_6_25kHz, - STEP_10_0kHz, - STEP_12_5kHz, - STEP_25_0kHz, - STEP_8_33kHz - }; -#endif - -typedef enum STEP_Setting_t STEP_Setting_t; - enum VfoState_t { VFO_STATE_NORMAL = 0, @@ -86,7 +60,6 @@ enum VfoState_t VFO_STATE_ALARM, VFO_STATE_VOLTAGE_HIGH }; - typedef enum VfoState_t VfoState_t; typedef struct diff --git a/settings.h b/settings.h index 47dcdb3..d3795e9 100644 --- a/settings.h +++ b/settings.h @@ -20,6 +20,7 @@ #include #include +#include "frequencies.h" #include "radio.h" enum POWER_OnDisplayMode_t { @@ -28,7 +29,6 @@ enum POWER_OnDisplayMode_t { POWER_ON_DISPLAY_MODE_VOLTAGE, POWER_ON_DISPLAY_MODE_NONE }; - typedef enum POWER_OnDisplayMode_t POWER_OnDisplayMode_t; enum { @@ -90,7 +90,6 @@ enum { VOICE_PROMPT_CHINESE, VOICE_PROMPT_ENGLISH }; - typedef enum VOICE_Prompt_t VOICE_Prompt_t; #endif @@ -98,7 +97,6 @@ enum ALARM_Mode_t { ALARM_MODE_SITE = 0, ALARM_MODE_TONE }; - typedef enum ALARM_Mode_t ALARM_Mode_t; enum ROGER_Mode_t { @@ -106,7 +104,6 @@ enum ROGER_Mode_t { ROGER_MODE_ROGER, ROGER_MODE_MDC }; - typedef enum ROGER_Mode_t ROGER_Mode_t; enum CHANNEL_DisplayMode_t { @@ -115,7 +112,6 @@ enum CHANNEL_DisplayMode_t { MDF_NAME, MDF_NAME_FREQ }; - typedef enum CHANNEL_DisplayMode_t CHANNEL_DisplayMode_t; typedef struct { @@ -226,7 +222,6 @@ typedef struct { VFO_Info_t VfoInfo[2]; } EEPROM_Config_t; - extern EEPROM_Config_t gEeprom; #ifdef ENABLE_FMRADIO