mirrors/uv-k5-firmware-custom
0
Fork 0
mirror of https://github.com/OneOfEleven/uv-k5-firmware-custom.git synced 2025-04-28 22:31:25 +03:00
Code Issues Releases Activity

Update RADIO_InitInfo() so that things match up rather than fixed numerical constants

Browse Source
This commit is contained in:
OneOfEleven 2023-10-02 10:05:15 +01:00
parent 3c7f496f3e
commit ec33203403
8 changed files with 29 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/app.h
View File

@ -20,6 +20,7 @@
#include <stdbool.h> #include <stdbool.h>
#include "functions.h" #include "functions.h"
#include "frequencies.h"
#include "radio.h" #include "radio.h"
void APP_EndTransmission(void); void APP_EndTransmission(void);

BIN
firmware.bin
View File

Binary file not shown.

BIN
firmware.packed.bin
View File

Binary file not shown.

26
frequencies.h
View File

@ -19,7 +19,7 @@
#include <stdint.h> #include <stdint.h>
#include "radio.h" //#include "radio.h"
extern const uint32_t bx_start1_Hz; extern const uint32_t bx_start1_Hz;
extern const uint32_t bx_stop1_Hz; extern const uint32_t bx_stop1_Hz;
@ -38,9 +38,31 @@ enum FREQUENCY_Band_t
BAND6_400MHz, BAND6_400MHz,
BAND7_470MHz BAND7_470MHz
}; };
typedef enum FREQUENCY_Band_t FREQUENCY_Band_t; 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 LowerLimitFrequencyBandTable[7];
extern const uint32_t MiddleFrequencyBandTable[7]; extern const uint32_t MiddleFrequencyBandTable[7];
extern const uint32_t UpperLimitFrequencyBandTable[7]; extern const uint32_t UpperLimitFrequencyBandTable[7];

1
functions.c
View File

@ -28,6 +28,7 @@
#include "driver/bk4819.h" #include "driver/bk4819.h"
#include "driver/gpio.h" #include "driver/gpio.h"
#include "driver/system.h" #include "driver/system.h"
#include "frequencies.h"
#include "functions.h" #include "functions.h"
#include "helper/battery.h" #include "helper/battery.h"
#include "misc.h" #include "misc.h"

2
radio.c
View File

@ -122,7 +122,7 @@ void RADIO_InitInfo(VFO_Info_t *pInfo, const uint8_t ChannelSave, const uint32_t
pInfo->SCANLIST1_PARTICIPATION = true; pInfo->SCANLIST1_PARTICIPATION = true;
pInfo->SCANLIST2_PARTICIPATION = true; pInfo->SCANLIST2_PARTICIPATION = true;
pInfo->STEP_SETTING = STEP_12_5kHz; pInfo->STEP_SETTING = STEP_12_5kHz;
pInfo->StepFrequency = 2500; pInfo->StepFrequency = StepFrequencyTable[pInfo->STEP_SETTING];
pInfo->CHANNEL_SAVE = ChannelSave; pInfo->CHANNEL_SAVE = ChannelSave;
pInfo->FrequencyReverse = false; pInfo->FrequencyReverse = false;
pInfo->OUTPUT_POWER = OUTPUT_POWER_LOW; pInfo->OUTPUT_POWER = OUTPUT_POWER_LOW;

29
radio.h
View File

@ -21,6 +21,7 @@
#include <stdint.h> #include <stdint.h>
#include "dcs.h" #include "dcs.h"
#include "frequencies.h"
enum { enum {
MR_CH_BAND_MASK = 0x0F << 0, MR_CH_BAND_MASK = 0x0F << 0,
@ -47,35 +48,8 @@ enum PTT_ID_t {
PTT_ID_EOT, PTT_ID_EOT,
PTT_ID_BOTH PTT_ID_BOTH
}; };
typedef enum PTT_ID_t PTT_ID_t; 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 enum VfoState_t
{ {
VFO_STATE_NORMAL = 0, VFO_STATE_NORMAL = 0,
@ -86,7 +60,6 @@ enum VfoState_t
VFO_STATE_ALARM, VFO_STATE_ALARM,
VFO_STATE_VOLTAGE_HIGH VFO_STATE_VOLTAGE_HIGH
}; };
typedef enum VfoState_t VfoState_t; typedef enum VfoState_t VfoState_t;
typedef struct typedef struct

7
settings.h
View File

@ -20,6 +20,7 @@
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h> #include <stdint.h>
#include "frequencies.h"
#include "radio.h" #include "radio.h"
enum POWER_OnDisplayMode_t { enum POWER_OnDisplayMode_t {
@ -28,7 +29,6 @@ enum POWER_OnDisplayMode_t {
POWER_ON_DISPLAY_MODE_VOLTAGE, POWER_ON_DISPLAY_MODE_VOLTAGE,
POWER_ON_DISPLAY_MODE_NONE POWER_ON_DISPLAY_MODE_NONE
}; };
typedef enum POWER_OnDisplayMode_t POWER_OnDisplayMode_t; typedef enum POWER_OnDisplayMode_t POWER_OnDisplayMode_t;
enum { enum {
@ -90,7 +90,6 @@ enum {
VOICE_PROMPT_CHINESE, VOICE_PROMPT_CHINESE,
VOICE_PROMPT_ENGLISH VOICE_PROMPT_ENGLISH
}; };
typedef enum VOICE_Prompt_t VOICE_Prompt_t; typedef enum VOICE_Prompt_t VOICE_Prompt_t;
#endif #endif
@ -98,7 +97,6 @@ enum ALARM_Mode_t {
ALARM_MODE_SITE = 0, ALARM_MODE_SITE = 0,
ALARM_MODE_TONE ALARM_MODE_TONE
}; };
typedef enum ALARM_Mode_t ALARM_Mode_t; typedef enum ALARM_Mode_t ALARM_Mode_t;
enum ROGER_Mode_t { enum ROGER_Mode_t {
@ -106,7 +104,6 @@ enum ROGER_Mode_t {
ROGER_MODE_ROGER, ROGER_MODE_ROGER,
ROGER_MODE_MDC ROGER_MODE_MDC
}; };
typedef enum ROGER_Mode_t ROGER_Mode_t; typedef enum ROGER_Mode_t ROGER_Mode_t;
enum CHANNEL_DisplayMode_t { enum CHANNEL_DisplayMode_t {
@ -115,7 +112,6 @@ enum CHANNEL_DisplayMode_t {
MDF_NAME, MDF_NAME,
MDF_NAME_FREQ MDF_NAME_FREQ
}; };
typedef enum CHANNEL_DisplayMode_t CHANNEL_DisplayMode_t; typedef enum CHANNEL_DisplayMode_t CHANNEL_DisplayMode_t;
typedef struct { typedef struct {
@ -226,7 +222,6 @@ typedef struct {
VFO_Info_t VfoInfo[2]; VFO_Info_t VfoInfo[2];
} EEPROM_Config_t; } EEPROM_Config_t;
extern EEPROM_Config_t gEeprom; extern EEPROM_Config_t gEeprom;
#ifdef ENABLE_FMRADIO #ifdef ENABLE_FMRADIO