mirror/uv-k5-firmware
2
0
Fork 1
mirror of https://github.com/DualTachyon/uv-k5-firmware.git synced 2024-11-27 08:59:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed potential sign issues.

Browse Source
This commit is contained in:
Dual Tachyon 2023-08-28 13:37:16 +01:00
parent 8e854d4c4b
commit e9bf76c3cf
9 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/app.c
View File

@ -1435,7 +1435,7 @@ void FUN_000075b0(void)
g_20000464 = 0; g_20000464 = 0;
} }
void APP_ChangeStepDirectionMaybe(bool bFlag, uint8_t Direction) void APP_ChangeStepDirectionMaybe(bool bFlag, int8_t Direction)
{ {
RADIO_ConfigureTX(); RADIO_ConfigureTX();
g_20000410 = gInfoCHAN_A->CHANNEL_SAVE; g_20000410 = gInfoCHAN_A->CHANNEL_SAVE;

2
app/main.c
View File

@ -10,7 +10,7 @@
extern void APP_SwitchToFM(void); extern void APP_SwitchToFM(void);
extern void FUN_0000773c(void); extern void FUN_0000773c(void);
extern void APP_SetFrequencyByStep(VFO_Info_t *pInfo, int8_t Step); extern void APP_SetFrequencyByStep(VFO_Info_t *pInfo, int8_t Step);
extern void APP_ChangeStepDirectionMaybe(bool bFlag, uint8_t Direction); extern void APP_ChangeStepDirectionMaybe(bool bFlag, int8_t Direction);
extern void APP_CycleOutputPower(void); extern void APP_CycleOutputPower(void);
extern void APP_FlipVoxSwitch(void); extern void APP_FlipVoxSwitch(void);

4
app/menu.c
View File

@ -72,7 +72,7 @@ static const VOICE_ID_t MenuVoices[] = {
VOICE_ID_INVALID, VOICE_ID_INVALID,
}; };
static void FUN_000074f8(uint8_t Direction) static void FUN_000074f8(int8_t Direction)
{ {
g_20000381 = 1; g_20000381 = 1;
gMenuScrollDirection = Direction; gMenuScrollDirection = Direction;
@ -988,7 +988,7 @@ void MENU_Key_STAR(bool bKeyPressed, bool bKeyHeld)
if (gInfoCHAN_A->CHANNEL_SAVE < 207 && !gInfoCHAN_A->IsAM) { if (gInfoCHAN_A->CHANNEL_SAVE < 207 && !gInfoCHAN_A->IsAM) {
if (gMenuCursor == MENU_R_CTCS || gMenuCursor == MENU_R_DCS) { if (gMenuCursor == MENU_R_CTCS || gMenuCursor == MENU_R_DCS) {
if (g_20000381 == 0) { if (g_20000381 == 0) {
FUN_000074f8(0x01); FUN_000074f8(1);
gRequestDisplayScreen = DISPLAY_MENU; gRequestDisplayScreen = DISPLAY_MENU;
AUDIO_SetVoiceID(0,VOICE_ID_SCANNING_BEGIN); AUDIO_SetVoiceID(0,VOICE_ID_SCANNING_BEGIN);
AUDIO_PlaySingleVoice(1); AUDIO_PlaySingleVoice(1);

6
frequencies.c
View File

@ -113,12 +113,12 @@ uint32_t FREQUENCY_CalculateOutputPower(uint8_t TxpLow, uint8_t TxpMid, uint8_t
return TxpMid + ((TxpHigh - TxpMid) * (Frequency - Middle)) / (UpperLimit - Middle); return TxpMid + ((TxpHigh - TxpMid) * (Frequency - Middle)) / (UpperLimit - Middle);
} }
uint32_t FREQUENCY_FloorToStep(uint32_t Frequency, uint32_t Step, uint32_t Base) uint32_t FREQUENCY_FloorToStep(uint32_t Upper, int32_t Step, uint32_t Lower)
{ {
uint32_t Index; uint32_t Index;
Index = (Frequency - Base) / Step; Index = (Upper - Lower) / Step;
return Base + (Step * Index); return Lower + (Step * Index);
} }
int FREQUENCY_Check(VFO_Info_t *pInfo) int FREQUENCY_Check(VFO_Info_t *pInfo)

2
frequencies.h
View File

@ -40,7 +40,7 @@ extern const uint16_t StepFrequencyTable[6];
FREQUENCY_Band_t FREQUENCY_GetBand(uint32_t Frequency); FREQUENCY_Band_t FREQUENCY_GetBand(uint32_t Frequency);
uint32_t FREQUENCY_CalculateOutputPower(uint8_t TxpLow, uint8_t TxpMid, uint8_t TxpHigh, uint32_t LowerLimit, uint32_t Middle, uint32_t UpperLimit, uint32_t Frequency); uint32_t FREQUENCY_CalculateOutputPower(uint8_t TxpLow, uint8_t TxpMid, uint8_t TxpHigh, uint32_t LowerLimit, uint32_t Middle, uint32_t UpperLimit, uint32_t Frequency);
uint32_t FREQUENCY_FloorToStep(uint32_t Frequency, uint32_t Step, uint32_t Base); uint32_t FREQUENCY_FloorToStep(uint32_t Upper, int32_t Step, uint32_t Lower);
int FREQUENCY_Check(VFO_Info_t *pInfo); int FREQUENCY_Check(VFO_Info_t *pInfo);
#endif #endif

4
gui.c
View File

@ -170,7 +170,7 @@ static const char gSubMenu_F_LOCK[6][4] = {
GUI_DisplayType_t gScreenToDisplay; GUI_DisplayType_t gScreenToDisplay;
bool gIsInSubMenu; bool gIsInSubMenu;
volatile uint8_t gStepDirection; volatile int8_t gStepDirection;
GUI_DisplayType_t gRequestDisplayScreen; GUI_DisplayType_t gRequestDisplayScreen;
uint8_t g_200003BA; uint8_t g_200003BA;
uint8_t g_200003BB; uint8_t g_200003BB;
@ -181,7 +181,7 @@ bool gAskToSave;
bool gAskToDelete; bool gAskToDelete;
uint8_t gMenuCursor; uint8_t gMenuCursor;
uint8_t gMenuScrollDirection; int8_t gMenuScrollDirection;
uint32_t gSubMenuSelection; uint32_t gSubMenuSelection;
void GUI_DisplayBatteryLevel(uint8_t BatteryLevel) void GUI_DisplayBatteryLevel(uint8_t BatteryLevel)

4
gui.h
View File

@ -93,7 +93,7 @@ enum {
extern GUI_DisplayType_t gScreenToDisplay; extern GUI_DisplayType_t gScreenToDisplay;
extern bool gIsInSubMenu; extern bool gIsInSubMenu;
extern volatile uint8_t gStepDirection; extern volatile int8_t gStepDirection;
extern GUI_DisplayType_t gRequestDisplayScreen; extern GUI_DisplayType_t gRequestDisplayScreen;
extern uint8_t g_200003BA; extern uint8_t g_200003BA;
extern uint8_t g_200003BB; extern uint8_t g_200003BB;
@ -104,7 +104,7 @@ extern bool gAskToSave;
extern bool gAskToDelete; extern bool gAskToDelete;
extern uint8_t gMenuCursor; extern uint8_t gMenuCursor;
extern uint8_t gMenuScrollDirection; extern int8_t gMenuScrollDirection;
extern uint32_t gSubMenuSelection; extern uint32_t gSubMenuSelection;
void GUI_DisplayBatteryLevel(uint8_t BatteryLevel); void GUI_DisplayBatteryLevel(uint8_t BatteryLevel);

2
radio.c
View File

@ -81,7 +81,7 @@ bool RADIO_CheckValidChannel(uint8_t Channel, bool bCheckScanList, uint8_t VFO)
return true; return true;
} }
uint8_t RADIO_FindNextChannel(uint8_t Channel, uint8_t Direction, bool bCheckScanList, uint8_t VFO) uint8_t RADIO_FindNextChannel(uint8_t Channel, int8_t Direction, bool bCheckScanList, uint8_t VFO)
{ {
uint8_t i; uint8_t i;

2
radio.h
View File

@ -93,7 +93,7 @@ extern DCS_CodeType_t gCopyOfCodeType;
extern uint8_t gCode; extern uint8_t gCode;
bool RADIO_CheckValidChannel(uint8_t ChNum, bool bCheckScanList, uint8_t RadioNum); bool RADIO_CheckValidChannel(uint8_t ChNum, bool bCheckScanList, uint8_t RadioNum);
uint8_t RADIO_FindNextChannel(uint8_t ChNum, uint8_t Direction, bool bCheckScanList, uint8_t RadioNum); uint8_t RADIO_FindNextChannel(uint8_t ChNum, int8_t Direction, bool bCheckScanList, uint8_t RadioNum);
void RADIO_InitInfo(VFO_Info_t *pInfo, uint8_t ChannelSave, uint8_t ChIndex, uint32_t Frequency); void RADIO_InitInfo(VFO_Info_t *pInfo, uint8_t ChannelSave, uint8_t ChIndex, uint32_t Frequency);
void RADIO_ConfigureChannel(uint8_t RadioNum, uint32_t Arg); void RADIO_ConfigureChannel(uint8_t RadioNum, uint32_t Arg);
void RADIO_ConfigureSquelchAndOutputPower(VFO_Info_t *pInfo); void RADIO_ConfigureSquelchAndOutputPower(VFO_Info_t *pInfo);