mirror of
https://github.com/OneOfEleven/uv-k5-firmware-custom.git
synced 2025-06-19 22:58:04 +03:00
Variable rename
This commit is contained in:
12
app/menu.c
12
app/menu.c
@ -44,8 +44,8 @@
|
|||||||
VOICE_ID_CTCSS,
|
VOICE_ID_CTCSS,
|
||||||
VOICE_ID_DCS,
|
VOICE_ID_DCS,
|
||||||
VOICE_ID_CTCSS,
|
VOICE_ID_CTCSS,
|
||||||
VOICE_ID_FREQUENCY_DIRECTION,
|
VOICE_ID_TX_OFFSET_FREQUENCY_DIRECTION,
|
||||||
VOICE_ID_OFFSET_FREQUENCY,
|
VOICE_ID_TX_OFFSET_FREQUENCY,
|
||||||
VOICE_ID_CHANNEL_BANDWIDTH,
|
VOICE_ID_CHANNEL_BANDWIDTH,
|
||||||
VOICE_ID_SCRAMBLER_ON,
|
VOICE_ID_SCRAMBLER_ON,
|
||||||
VOICE_ID_BUSY_LOCKOUT,
|
VOICE_ID_BUSY_LOCKOUT,
|
||||||
@ -367,12 +367,12 @@ void MENU_AcceptSetting(void)
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
case MENU_SFT_D:
|
case MENU_SFT_D:
|
||||||
gTxVfo->FREQUENCY_DEVIATION_SETTING = gSubMenuSelection;
|
gTxVfo->TX_OFFSET_FREQUENCY_DIRECTION = gSubMenuSelection;
|
||||||
gRequestSaveChannel = 1;
|
gRequestSaveChannel = 1;
|
||||||
return;
|
return;
|
||||||
|
|
||||||
case MENU_OFFSET:
|
case MENU_OFFSET:
|
||||||
gTxVfo->FREQUENCY_OF_DEVIATION = gSubMenuSelection;
|
gTxVfo->TX_OFFSET_FREQUENCY = gSubMenuSelection;
|
||||||
gRequestSaveChannel = 1;
|
gRequestSaveChannel = 1;
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@ -738,11 +738,11 @@ void MENU_ShowCurrentSetting(void)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case MENU_SFT_D:
|
case MENU_SFT_D:
|
||||||
gSubMenuSelection = gTxVfo->FREQUENCY_DEVIATION_SETTING;
|
gSubMenuSelection = gTxVfo->TX_OFFSET_FREQUENCY_DIRECTION;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case MENU_OFFSET:
|
case MENU_OFFSET:
|
||||||
gSubMenuSelection = gTxVfo->FREQUENCY_OF_DEVIATION;
|
gSubMenuSelection = gTxVfo->TX_OFFSET_FREQUENCY;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case MENU_W_N:
|
case MENU_W_N:
|
||||||
|
@ -375,7 +375,7 @@ static void CMD_052F(const uint8_t *pBuffer)
|
|||||||
gEeprom.VfoInfo[0].FrequencyReverse = false;
|
gEeprom.VfoInfo[0].FrequencyReverse = false;
|
||||||
gEeprom.VfoInfo[0].pRX = &gEeprom.VfoInfo[0].ConfigRX;
|
gEeprom.VfoInfo[0].pRX = &gEeprom.VfoInfo[0].ConfigRX;
|
||||||
gEeprom.VfoInfo[0].pTX = &gEeprom.VfoInfo[0].ConfigTX;
|
gEeprom.VfoInfo[0].pTX = &gEeprom.VfoInfo[0].ConfigTX;
|
||||||
gEeprom.VfoInfo[0].FREQUENCY_DEVIATION_SETTING = FREQUENCY_DEVIATION_OFF;
|
gEeprom.VfoInfo[0].TX_OFFSET_FREQUENCY_DIRECTION = TX_OFFSET_FREQUENCY_DIRECTION_OFF;
|
||||||
gEeprom.VfoInfo[0].DTMF_PTT_ID_TX_MODE = PTT_ID_OFF;
|
gEeprom.VfoInfo[0].DTMF_PTT_ID_TX_MODE = PTT_ID_OFF;
|
||||||
gEeprom.VfoInfo[0].DTMF_DECODING_ENABLE = false;
|
gEeprom.VfoInfo[0].DTMF_DECODING_ENABLE = false;
|
||||||
|
|
||||||
|
4
audio.h
4
audio.h
@ -77,8 +77,8 @@ void AUDIO_PlayBeep(BEEP_Type_t Beep);
|
|||||||
VOICE_ID_TRANSMIT_OVER_TIME = 0x1CU,
|
VOICE_ID_TRANSMIT_OVER_TIME = 0x1CU,
|
||||||
VOICE_ID_BACKLIGHT_SELECTION = 0x1DU,
|
VOICE_ID_BACKLIGHT_SELECTION = 0x1DU,
|
||||||
VOICE_ID_VOX = 0x1EU,
|
VOICE_ID_VOX = 0x1EU,
|
||||||
VOICE_ID_FREQUENCY_DIRECTION = 0x1FU,
|
VOICE_ID_TX_OFFSET_FREQUENCY_DIRECTION = 0x1FU,
|
||||||
VOICE_ID_OFFSET_FREQUENCY = 0x20U,
|
VOICE_ID_TX_OFFSET_FREQUENCY = 0x20U,
|
||||||
VOICE_ID_TRANSMITING_MEMORY = 0x21U,
|
VOICE_ID_TRANSMITING_MEMORY = 0x21U,
|
||||||
VOICE_ID_RECEIVING_MEMORY = 0x22U,
|
VOICE_ID_RECEIVING_MEMORY = 0x22U,
|
||||||
VOICE_ID_EMERGENCY_CALL = 0x23U,
|
VOICE_ID_EMERGENCY_CALL = 0x23U,
|
||||||
|
36
board.c
36
board.c
@ -43,15 +43,27 @@
|
|||||||
#include "settings.h"
|
#include "settings.h"
|
||||||
#include "sram-overlay.h"
|
#include "sram-overlay.h"
|
||||||
|
|
||||||
|
#ifndef ARRAY_SIZE
|
||||||
|
#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
|
||||||
|
#endif
|
||||||
|
|
||||||
static const uint32_t gDefaultFrequencyTable[] =
|
static const uint32_t gDefaultFrequencyTable[] =
|
||||||
{
|
{
|
||||||
14502500,
|
14500000, //
|
||||||
14552500,
|
14550000, //
|
||||||
43477500,
|
43300000, //
|
||||||
43502500,
|
43320000, //
|
||||||
43697500
|
43350000 //
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// BAND1_50MHz
|
||||||
|
// BAND2_108MHz
|
||||||
|
// BAND3_136MHz
|
||||||
|
// BAND4_174MHz
|
||||||
|
// BAND5_350MHz
|
||||||
|
// BAND6_400MHz
|
||||||
|
// BAND7_470MHz
|
||||||
|
|
||||||
void BOARD_FLASH_Init(void)
|
void BOARD_FLASH_Init(void)
|
||||||
{
|
{
|
||||||
FLASH_Init(FLASH_READ_MODE_1_CYCLE);
|
FLASH_Init(FLASH_READ_MODE_1_CYCLE);
|
||||||
@ -515,7 +527,7 @@ void BOARD_EEPROM_Init(void)
|
|||||||
// 0F30..0F3F
|
// 0F30..0F3F
|
||||||
EEPROM_ReadBuffer(0x0F30, gCustomAesKey, sizeof(gCustomAesKey));
|
EEPROM_ReadBuffer(0x0F30, gCustomAesKey, sizeof(gCustomAesKey));
|
||||||
bHasCustomAesKey = false;
|
bHasCustomAesKey = false;
|
||||||
for (i = 0; i < 4; i++)
|
for (i = 0; i < ARRAY_SIZE(gCustomAesKey); i++)
|
||||||
{
|
{
|
||||||
if (gCustomAesKey[i] != 0xFFFFFFFFu)
|
if (gCustomAesKey[i] != 0xFFFFFFFFu)
|
||||||
{
|
{
|
||||||
@ -579,10 +591,11 @@ void BOARD_EEPROM_LoadMoreSettings(void)
|
|||||||
|
|
||||||
void BOARD_FactoryReset(bool bIsAll)
|
void BOARD_FactoryReset(bool bIsAll)
|
||||||
{
|
{
|
||||||
uint8_t Template[8];
|
|
||||||
uint16_t i;
|
uint16_t i;
|
||||||
|
uint8_t Template[8];
|
||||||
|
|
||||||
memset(Template, 0xFF, sizeof(Template));
|
memset(Template, 0xFF, sizeof(Template));
|
||||||
|
|
||||||
for (i = 0x0C80; i < 0x1E00; i += 8)
|
for (i = 0x0C80; i < 0x1E00; i += 8)
|
||||||
{
|
{
|
||||||
if (
|
if (
|
||||||
@ -599,15 +612,18 @@ void BOARD_FactoryReset(bool bIsAll)
|
|||||||
!(i >= 0x0E40 && i < 0x0E70) && // FM Channels
|
!(i >= 0x0E40 && i < 0x0E70) && // FM Channels
|
||||||
!(i >= 0x0E88 && i < 0x0E90) // FM settings
|
!(i >= 0x0E88 && i < 0x0E90) // FM settings
|
||||||
))
|
))
|
||||||
) {
|
)
|
||||||
|
{
|
||||||
EEPROM_WriteBuffer(i, Template);
|
EEPROM_WriteBuffer(i, Template);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (bIsAll)
|
if (bIsAll)
|
||||||
{
|
{
|
||||||
RADIO_InitInfo(gRxVfo, FREQ_CHANNEL_FIRST + 5, 5, 43300000);
|
RADIO_InitInfo(gRxVfo, FREQ_CHANNEL_FIRST + BAND6_400MHz, BAND6_400MHz, 43350000);
|
||||||
for (i = 0; i < 5; i++)
|
|
||||||
|
// set the first few memory channels
|
||||||
|
for (i = 0; i < ARRAY_SIZE(gDefaultFrequencyTable); i++)
|
||||||
{
|
{
|
||||||
const uint32_t Frequency = gDefaultFrequencyTable[i];
|
const uint32_t Frequency = gDefaultFrequencyTable[i];
|
||||||
gRxVfo->ConfigRX.Frequency = Frequency;
|
gRxVfo->ConfigRX.Frequency = Frequency;
|
||||||
|
BIN
firmware.bin
BIN
firmware.bin
Binary file not shown.
Binary file not shown.
@ -32,7 +32,7 @@ enum FREQUENCY_Band_t
|
|||||||
BAND4_174MHz,
|
BAND4_174MHz,
|
||||||
BAND5_350MHz,
|
BAND5_350MHz,
|
||||||
BAND6_400MHz,
|
BAND6_400MHz,
|
||||||
BAND7_470MHz,
|
BAND7_470MHz
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef enum FREQUENCY_Band_t FREQUENCY_Band_t;
|
typedef enum FREQUENCY_Band_t FREQUENCY_Band_t;
|
||||||
|
10
misc.h
10
misc.h
@ -29,11 +29,11 @@
|
|||||||
|
|
||||||
enum {
|
enum {
|
||||||
MR_CHANNEL_FIRST = 0,
|
MR_CHANNEL_FIRST = 0,
|
||||||
MR_CHANNEL_LAST = 199U,
|
MR_CHANNEL_LAST = 199u,
|
||||||
FREQ_CHANNEL_FIRST = 200U,
|
FREQ_CHANNEL_FIRST = 200u,
|
||||||
FREQ_CHANNEL_LAST = 206U,
|
FREQ_CHANNEL_LAST = 206u,
|
||||||
NOAA_CHANNEL_FIRST = 207U,
|
NOAA_CHANNEL_FIRST = 207u,
|
||||||
NOAA_CHANNEL_LAST = 216U
|
NOAA_CHANNEL_LAST = 216u
|
||||||
};
|
};
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
|
41
radio.c
41
radio.c
@ -128,7 +128,7 @@ void RADIO_InitInfo(VFO_Info_t *pInfo, uint8_t ChannelSave, uint8_t Band, uint32
|
|||||||
pInfo->ConfigTX.Frequency = Frequency;
|
pInfo->ConfigTX.Frequency = Frequency;
|
||||||
pInfo->pRX = &pInfo->ConfigRX;
|
pInfo->pRX = &pInfo->ConfigRX;
|
||||||
pInfo->pTX = &pInfo->ConfigTX;
|
pInfo->pTX = &pInfo->ConfigTX;
|
||||||
pInfo->FREQUENCY_OF_DEVIATION = 1000000;
|
pInfo->TX_OFFSET_FREQUENCY = 1000000;
|
||||||
#ifdef ENABLE_COMPANDER
|
#ifdef ENABLE_COMPANDER
|
||||||
pInfo->Compander = false;
|
pInfo->Compander = false;
|
||||||
#endif
|
#endif
|
||||||
@ -155,10 +155,10 @@ void RADIO_ConfigureChannel(uint8_t VFO, uint32_t Arg)
|
|||||||
if (!gSetting_350EN)
|
if (!gSetting_350EN)
|
||||||
{
|
{
|
||||||
if (gEeprom.FreqChannel[VFO] == 204)
|
if (gEeprom.FreqChannel[VFO] == 204)
|
||||||
gEeprom.FreqChannel[VFO] = 205;
|
gEeprom.FreqChannel[VFO]++;
|
||||||
|
|
||||||
if (gEeprom.ScreenChannel[VFO] == 204)
|
if (gEeprom.ScreenChannel[VFO] == 204)
|
||||||
gEeprom.ScreenChannel[VFO] = 205;
|
gEeprom.ScreenChannel[VFO]++;
|
||||||
}
|
}
|
||||||
|
|
||||||
Channel = gEeprom.ScreenChannel[VFO];
|
Channel = gEeprom.ScreenChannel[VFO];
|
||||||
@ -250,7 +250,7 @@ void RADIO_ConfigureChannel(uint8_t VFO, uint32_t Arg)
|
|||||||
Tmp = Data[3] & 0x0F;
|
Tmp = Data[3] & 0x0F;
|
||||||
if (Tmp > 2)
|
if (Tmp > 2)
|
||||||
Tmp = 0;
|
Tmp = 0;
|
||||||
gEeprom.VfoInfo[VFO].FREQUENCY_DEVIATION_SETTING = Tmp;
|
gEeprom.VfoInfo[VFO].TX_OFFSET_FREQUENCY_DIRECTION = Tmp;
|
||||||
gEeprom.VfoInfo[VFO].AM_CHANNEL_MODE = !!(Data[3] & 0x10);
|
gEeprom.VfoInfo[VFO].AM_CHANNEL_MODE = !!(Data[3] & 0x10);
|
||||||
|
|
||||||
Tmp = Data[6];
|
Tmp = Data[6];
|
||||||
@ -321,10 +321,10 @@ void RADIO_ConfigureChannel(uint8_t VFO, uint32_t Arg)
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
const uint8_t d4 = Data[4];
|
const uint8_t d4 = Data[4];
|
||||||
gEeprom.VfoInfo[VFO].FrequencyReverse = !!(d4 & 0x01);
|
gEeprom.VfoInfo[VFO].FrequencyReverse = !!((d4 >> 0) & 1u);
|
||||||
gEeprom.VfoInfo[VFO].CHANNEL_BANDWIDTH = !!(d4 & 0x02);
|
gEeprom.VfoInfo[VFO].CHANNEL_BANDWIDTH = !!((d4 >> 1) & 1u);
|
||||||
gEeprom.VfoInfo[VFO].OUTPUT_POWER = (d4 >> 2) & 0x03;
|
gEeprom.VfoInfo[VFO].OUTPUT_POWER = ((d4 >> 2) & 3u);
|
||||||
gEeprom.VfoInfo[VFO].BUSY_CHANNEL_LOCK = !!(d4 & 0x10);
|
gEeprom.VfoInfo[VFO].BUSY_CHANNEL_LOCK = !!((d4 >> 4) & 1u);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Data[5] == 0xFF)
|
if (Data[5] == 0xFF)
|
||||||
@ -334,8 +334,8 @@ void RADIO_ConfigureChannel(uint8_t VFO, uint32_t Arg)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
gEeprom.VfoInfo[VFO].DTMF_DECODING_ENABLE = !!(Data[5] & 0x01);
|
gEeprom.VfoInfo[VFO].DTMF_DECODING_ENABLE = !!((Data[5] >> 0) & 1u);
|
||||||
gEeprom.VfoInfo[VFO].DTMF_PTT_ID_TX_MODE = (Data[5] >> 1) & 0x03;
|
gEeprom.VfoInfo[VFO].DTMF_PTT_ID_TX_MODE = ((Data[5] >> 1) & 3u);
|
||||||
}
|
}
|
||||||
|
|
||||||
struct
|
struct
|
||||||
@ -348,7 +348,7 @@ void RADIO_ConfigureChannel(uint8_t VFO, uint32_t Arg)
|
|||||||
pRadio->ConfigRX.Frequency = Info.Frequency;
|
pRadio->ConfigRX.Frequency = Info.Frequency;
|
||||||
if (Info.Offset >= 100000000)
|
if (Info.Offset >= 100000000)
|
||||||
Info.Offset = 1000000;
|
Info.Offset = 1000000;
|
||||||
gEeprom.VfoInfo[VFO].FREQUENCY_OF_DEVIATION = Info.Offset;
|
gEeprom.VfoInfo[VFO].TX_OFFSET_FREQUENCY = Info.Offset;
|
||||||
}
|
}
|
||||||
|
|
||||||
Frequency = pRadio->ConfigRX.Frequency;
|
Frequency = pRadio->ConfigRX.Frequency;
|
||||||
@ -365,10 +365,10 @@ void RADIO_ConfigureChannel(uint8_t VFO, uint32_t Arg)
|
|||||||
pRadio->ConfigRX.Frequency = Frequency;
|
pRadio->ConfigRX.Frequency = Frequency;
|
||||||
|
|
||||||
if (Frequency >= 10800000 && Frequency < 13600000)
|
if (Frequency >= 10800000 && Frequency < 13600000)
|
||||||
gEeprom.VfoInfo[VFO].FREQUENCY_DEVIATION_SETTING = FREQUENCY_DEVIATION_OFF;
|
gEeprom.VfoInfo[VFO].TX_OFFSET_FREQUENCY_DIRECTION = TX_OFFSET_FREQUENCY_DIRECTION_OFF;
|
||||||
else
|
else
|
||||||
if (!IS_MR_CHANNEL(Channel))
|
if (!IS_MR_CHANNEL(Channel))
|
||||||
gEeprom.VfoInfo[VFO].FREQUENCY_OF_DEVIATION = FREQUENCY_FloorToStep(gEeprom.VfoInfo[VFO].FREQUENCY_OF_DEVIATION, gEeprom.VfoInfo[VFO].StepFrequency, 0);
|
gEeprom.VfoInfo[VFO].TX_OFFSET_FREQUENCY = FREQUENCY_FloorToStep(gEeprom.VfoInfo[VFO].TX_OFFSET_FREQUENCY, gEeprom.VfoInfo[VFO].StepFrequency, 0);
|
||||||
|
|
||||||
RADIO_ApplyOffset(pRadio);
|
RADIO_ApplyOffset(pRadio);
|
||||||
|
|
||||||
@ -397,8 +397,7 @@ void RADIO_ConfigureChannel(uint8_t VFO, uint32_t Arg)
|
|||||||
pConfig->Frequency = 43300000;
|
pConfig->Frequency = 43300000;
|
||||||
}
|
}
|
||||||
|
|
||||||
// if (gEeprom.VfoInfo[VFO].Band == BAND2_108MHz && gEeprom.VfoInfo[VFO].AM_CHANNEL_MODE)
|
if (gEeprom.VfoInfo[VFO].AM_CHANNEL_MODE)
|
||||||
if (gEeprom.VfoInfo[VFO].AM_CHANNEL_MODE) // allow AM on any frequency
|
|
||||||
{
|
{
|
||||||
gEeprom.VfoInfo[VFO].IsAM = true;
|
gEeprom.VfoInfo[VFO].IsAM = true;
|
||||||
gEeprom.VfoInfo[VFO].SCRAMBLING_TYPE = 0;
|
gEeprom.VfoInfo[VFO].SCRAMBLING_TYPE = 0;
|
||||||
@ -466,15 +465,15 @@ void RADIO_ApplyOffset(VFO_Info_t *pInfo)
|
|||||||
{
|
{
|
||||||
uint32_t Frequency = pInfo->ConfigRX.Frequency;
|
uint32_t Frequency = pInfo->ConfigRX.Frequency;
|
||||||
|
|
||||||
switch (pInfo->FREQUENCY_DEVIATION_SETTING)
|
switch (pInfo->TX_OFFSET_FREQUENCY_DIRECTION)
|
||||||
{
|
{
|
||||||
case FREQUENCY_DEVIATION_OFF:
|
case TX_OFFSET_FREQUENCY_DIRECTION_OFF:
|
||||||
break;
|
break;
|
||||||
case FREQUENCY_DEVIATION_ADD:
|
case TX_OFFSET_FREQUENCY_DIRECTION_ADD:
|
||||||
Frequency += pInfo->FREQUENCY_OF_DEVIATION;
|
Frequency += pInfo->TX_OFFSET_FREQUENCY;
|
||||||
break;
|
break;
|
||||||
case FREQUENCY_DEVIATION_SUB:
|
case TX_OFFSET_FREQUENCY_DIRECTION_SUB:
|
||||||
Frequency -= pInfo->FREQUENCY_OF_DEVIATION;
|
Frequency -= pInfo->TX_OFFSET_FREQUENCY;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
18
radio.h
18
radio.h
@ -23,14 +23,14 @@
|
|||||||
#include "dcs.h"
|
#include "dcs.h"
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
MR_CH_SCANLIST1 = (1U << 7),
|
MR_CH_SCANLIST1 = (1u << 7),
|
||||||
MR_CH_SCANLIST2 = (1U << 6),
|
MR_CH_SCANLIST2 = (1u << 6),
|
||||||
MR_CH_BAND_MASK = 0x0FU,
|
MR_CH_BAND_MASK = 0x0Fu
|
||||||
};
|
};
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
RADIO_CHANNEL_UP = 0x01U,
|
RADIO_CHANNEL_UP = 0x01u,
|
||||||
RADIO_CHANNEL_DOWN = 0xFFU,
|
RADIO_CHANNEL_DOWN = 0xFFu,
|
||||||
};
|
};
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
@ -56,7 +56,7 @@ typedef enum PTT_ID_t PTT_ID_t;
|
|||||||
STEP_10_0kHz,
|
STEP_10_0kHz,
|
||||||
STEP_12_5kHz,
|
STEP_12_5kHz,
|
||||||
STEP_25_0kHz,
|
STEP_25_0kHz,
|
||||||
STEP_8_33kHz,
|
STEP_8_33kHz
|
||||||
};
|
};
|
||||||
#else
|
#else
|
||||||
enum STEP_Setting_t
|
enum STEP_Setting_t
|
||||||
@ -67,7 +67,7 @@ typedef enum PTT_ID_t PTT_ID_t;
|
|||||||
STEP_10_0kHz,
|
STEP_10_0kHz,
|
||||||
STEP_12_5kHz,
|
STEP_12_5kHz,
|
||||||
STEP_25_0kHz,
|
STEP_25_0kHz,
|
||||||
STEP_8_33kHz,
|
STEP_8_33kHz
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -100,10 +100,10 @@ typedef struct VFO_Info_t
|
|||||||
FREQ_Config_t ConfigTX;
|
FREQ_Config_t ConfigTX;
|
||||||
FREQ_Config_t *pRX;
|
FREQ_Config_t *pRX;
|
||||||
FREQ_Config_t *pTX;
|
FREQ_Config_t *pTX;
|
||||||
uint32_t FREQUENCY_OF_DEVIATION;
|
uint32_t TX_OFFSET_FREQUENCY;
|
||||||
uint16_t StepFrequency;
|
uint16_t StepFrequency;
|
||||||
uint8_t CHANNEL_SAVE;
|
uint8_t CHANNEL_SAVE;
|
||||||
uint8_t FREQUENCY_DEVIATION_SETTING;
|
uint8_t TX_OFFSET_FREQUENCY_DIRECTION;
|
||||||
uint8_t SquelchOpenRSSIThresh;
|
uint8_t SquelchOpenRSSIThresh;
|
||||||
uint8_t SquelchOpenNoiseThresh;
|
uint8_t SquelchOpenNoiseThresh;
|
||||||
uint8_t SquelchCloseGlitchThresh;
|
uint8_t SquelchCloseGlitchThresh;
|
||||||
|
@ -196,13 +196,13 @@ void SETTINGS_SaveChannel(uint8_t Channel, uint8_t VFO, const VFO_Info_t *pVFO,
|
|||||||
uint8_t State8[8];
|
uint8_t State8[8];
|
||||||
|
|
||||||
State32[0] = pVFO->ConfigRX.Frequency;
|
State32[0] = pVFO->ConfigRX.Frequency;
|
||||||
State32[1] = pVFO->FREQUENCY_OF_DEVIATION;
|
State32[1] = pVFO->TX_OFFSET_FREQUENCY;
|
||||||
EEPROM_WriteBuffer(OffsetVFO + 0, State32);
|
EEPROM_WriteBuffer(OffsetVFO + 0, State32);
|
||||||
|
|
||||||
State8[0] = pVFO->ConfigRX.Code;
|
State8[0] = pVFO->ConfigRX.Code;
|
||||||
State8[1] = pVFO->ConfigTX.Code;
|
State8[1] = pVFO->ConfigTX.Code;
|
||||||
State8[2] = (pVFO->ConfigTX.CodeType << 4) | pVFO->ConfigRX.CodeType;
|
State8[2] = (pVFO->ConfigTX.CodeType << 4) | pVFO->ConfigRX.CodeType;
|
||||||
State8[3] = (pVFO->AM_CHANNEL_MODE << 4) | pVFO->FREQUENCY_DEVIATION_SETTING;
|
State8[3] = (pVFO->AM_CHANNEL_MODE << 4) | pVFO->TX_OFFSET_FREQUENCY_DIRECTION;
|
||||||
State8[4] = 0
|
State8[4] = 0
|
||||||
| (pVFO->BUSY_CHANNEL_LOCK << 4)
|
| (pVFO->BUSY_CHANNEL_LOCK << 4)
|
||||||
| (pVFO->OUTPUT_POWER << 2)
|
| (pVFO->OUTPUT_POWER << 2)
|
||||||
|
@ -59,9 +59,9 @@ enum {
|
|||||||
};
|
};
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
FREQUENCY_DEVIATION_OFF = 0,
|
TX_OFFSET_FREQUENCY_DIRECTION_OFF = 0,
|
||||||
FREQUENCY_DEVIATION_ADD,
|
TX_OFFSET_FREQUENCY_DIRECTION_ADD,
|
||||||
FREQUENCY_DEVIATION_SUB
|
TX_OFFSET_FREQUENCY_DIRECTION_SUB
|
||||||
};
|
};
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
|
@ -445,9 +445,9 @@ void UI_DisplayMain(void)
|
|||||||
|
|
||||||
if (gEeprom.VfoInfo[vfo_num].ConfigRX.Frequency != gEeprom.VfoInfo[vfo_num].ConfigTX.Frequency)
|
if (gEeprom.VfoInfo[vfo_num].ConfigRX.Frequency != gEeprom.VfoInfo[vfo_num].ConfigTX.Frequency)
|
||||||
{ // show the TX offset symbol
|
{ // show the TX offset symbol
|
||||||
if (gEeprom.VfoInfo[vfo_num].FREQUENCY_DEVIATION_SETTING == FREQUENCY_DEVIATION_ADD)
|
if (gEeprom.VfoInfo[vfo_num].TX_OFFSET_FREQUENCY_DIRECTION == TX_OFFSET_FREQUENCY_DIRECTION_ADD)
|
||||||
memcpy(pLine1 + display_width + 54, BITMAP_Add, sizeof(BITMAP_Add));
|
memcpy(pLine1 + display_width + 54, BITMAP_Add, sizeof(BITMAP_Add));
|
||||||
if (gEeprom.VfoInfo[vfo_num].FREQUENCY_DEVIATION_SETTING == FREQUENCY_DEVIATION_SUB)
|
if (gEeprom.VfoInfo[vfo_num].TX_OFFSET_FREQUENCY_DIRECTION == TX_OFFSET_FREQUENCY_DIRECTION_SUB)
|
||||||
memcpy(pLine1 + display_width + 54, BITMAP_Sub, sizeof(BITMAP_Sub));
|
memcpy(pLine1 + display_width + 54, BITMAP_Sub, sizeof(BITMAP_Sub));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
#ifdef GIT_HASH
|
#ifdef GIT_HASH
|
||||||
#define VER GIT_HASH
|
#define VER GIT_HASH
|
||||||
#else
|
#else
|
||||||
#define VER "230914"
|
#define VER "230915"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
const char Version[] = "OEFW-"VER;
|
const char Version[] = "OEFW-"VER;
|
||||||
|
@ -13,7 +13,7 @@ del /S /Q *.o >nul 2>nul
|
|||||||
del /S /Q *.d >nul 2>nul
|
del /S /Q *.d >nul 2>nul
|
||||||
|
|
||||||
::python -m pip install --upgrade pip crcmod
|
::python -m pip install --upgrade pip crcmod
|
||||||
fw-pack.py firmware.bin 230914 firmware.packed.bin
|
fw-pack.py firmware.bin 230915 firmware.packed.bin
|
||||||
|
|
||||||
::arm-none-eabi-size firmware
|
::arm-none-eabi-size firmware
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user