From e4f845c844b790a889380028463a8932ce5c6aee Mon Sep 17 00:00:00 2001 From: philmoz Date: Wed, 20 Sep 2023 11:16:48 +1000 Subject: [PATCH] chore(radio): Fix some compiler warnings when building firmware (#4058) --- radio/src/gui/colorlcd/model_telemetry.cpp | 2 +- radio/src/gui/colorlcd/radio_diagkeys.cpp | 2 ++ radio/src/gui/colorlcd/radio_sdmanager.cpp | 2 +- radio/src/gui/colorlcd/view_text.cpp | 4 +--- radio/src/gui/common/stdlcd/radio_sdmanager.cpp | 2 +- radio/src/lua/interface.cpp | 2 ++ radio/src/storage/yaml/yaml_datastructs_funcs.cpp | 2 +- radio/src/targets/common/arm/stm32/f4/system_stm32f4xx.c | 1 + radio/src/telemetry/multi.cpp | 8 -------- 9 files changed, 10 insertions(+), 15 deletions(-) diff --git a/radio/src/gui/colorlcd/model_telemetry.cpp b/radio/src/gui/colorlcd/model_telemetry.cpp index e38bb624a..74879353d 100644 --- a/radio/src/gui/colorlcd/model_telemetry.cpp +++ b/radio/src/gui/colorlcd/model_telemetry.cpp @@ -286,7 +286,7 @@ class SensorButton : public Button { setNumIdState(); strAppend(s, g_model.telemetrySensors[index].label, TELEM_LABEL_LEN); - auto lbl = tsStyle.newName(lvobj, s); + tsStyle.newName(lvobj, s); box = tsStyle.newFreshCont(lvobj); fresh = tsStyle.newFreshIcon(box); diff --git a/radio/src/gui/colorlcd/radio_diagkeys.cpp b/radio/src/gui/colorlcd/radio_diagkeys.cpp index 8814e1906..d92d475ff 100644 --- a/radio/src/gui/colorlcd/radio_diagkeys.cpp +++ b/radio/src/gui/colorlcd/radio_diagkeys.cpp @@ -27,6 +27,7 @@ static const uint8_t _trimMap[MAX_TRIMS * 2] = {6, 7, 4, 5, 2, 3, 0, 1, 8, 9, 10, 11}; +#if !defined(PCBNV14) static EnumKeys get_ith_key(uint8_t i) { auto supported_keys = keysGetSupported(); @@ -40,6 +41,7 @@ static EnumKeys get_ith_key(uint8_t i) // we assume: i < keysGetMaxKeys() return (EnumKeys)0; } +#endif class RadioKeyDiagsWindow : public Window { diff --git a/radio/src/gui/colorlcd/radio_sdmanager.cpp b/radio/src/gui/colorlcd/radio_sdmanager.cpp index 6ff1de9f3..01c72cafa 100644 --- a/radio/src/gui/colorlcd/radio_sdmanager.cpp +++ b/radio/src/gui/colorlcd/radio_sdmanager.cpp @@ -500,11 +500,11 @@ void RadioSdManagerPage::fileAction(const char* path, const char* name, if (clipboard.type == CLIPBOARD_TYPE_SD_FILE) { menu->addLine(STR_PASTE, [=]() { static char lfn[FF_MAX_LFN + 1]; // TODO optimize that! + char destFileName[2 * CLIPBOARD_PATH_LEN + 1]; f_getcwd((TCHAR*)lfn, FF_MAX_LFN); // prevent copying to the same directory with the same name char* destNamePtr = clipboard.data.sd.filename; if (!strcmp(clipboard.data.sd.directory, lfn)) { - char destFileName[2 * CLIPBOARD_PATH_LEN + 1]; destNamePtr = strAppend(destFileName, FILE_COPY_PREFIX, CLIPBOARD_PATH_LEN); destNamePtr = strAppend(destNamePtr, clipboard.data.sd.filename, diff --git a/radio/src/gui/colorlcd/view_text.cpp b/radio/src/gui/colorlcd/view_text.cpp index 30a38428a..86d3f9936 100644 --- a/radio/src/gui/colorlcd/view_text.cpp +++ b/radio/src/gui/colorlcd/view_text.cpp @@ -213,8 +213,6 @@ void ViewTextWindow::onEvent(event_t event) #endif } -static void checkbox_event_handler(lv_event_t* e); - class ViewChecklistWindow : public ViewTextWindow { public: @@ -321,7 +319,7 @@ class ViewChecklistWindow : public ViewTextWindow size_t cur = 0; - for(int i=0; i 4 && (strncmp(val, trimSwitchNames[0], 4) == 0)) { - for (int i = 0; i < sizeof(trimSwitchNames)/sizeof(const char*); i += 1) { + for (size_t i = 0; i < sizeof(trimSwitchNames)/sizeof(const char*); i += 1) { if (strncmp(val, trimSwitchNames[i], val_len) == 0) { ival = SWSRC_FIRST_TRIM + i; break; diff --git a/radio/src/targets/common/arm/stm32/f4/system_stm32f4xx.c b/radio/src/targets/common/arm/stm32/f4/system_stm32f4xx.c index ec73f6d83..a46d4e4af 100644 --- a/radio/src/targets/common/arm/stm32/f4/system_stm32f4xx.c +++ b/radio/src/targets/common/arm/stm32/f4/system_stm32f4xx.c @@ -229,6 +229,7 @@ static void SetSysClock(void); void SystemInit(void) { #if defined(PCBFLYSKY) + extern void backlightLowInit( void ); backlightLowInit(); #endif /* FPU settings ------------------------------------------------------------*/ diff --git a/radio/src/telemetry/multi.cpp b/radio/src/telemetry/multi.cpp index cbfe35025..0ec330215 100644 --- a/radio/src/telemetry/multi.cpp +++ b/radio/src/telemetry/multi.cpp @@ -77,7 +77,6 @@ static MultiModuleStatus multiModuleStatus[NUM_MODULES] = {MultiModuleStatus(), static uint8_t multiBindStatus[NUM_MODULES] = {MULTI_BIND_NONE, MULTI_BIND_NONE}; static MultiBufferState multiTelemetryBufferState[NUM_MODULES]; -static uint16_t multiTelemetryLastRxTS[NUM_MODULES]; MultiModuleStatus &getMultiModuleStatus(uint8_t module) { @@ -104,11 +103,6 @@ void setMultiTelemetryBufferState(uint8_t module, MultiBufferState state) multiTelemetryBufferState[module] = state; } -static uint16_t& getMultiTelemetryLastRxTS(uint8_t module) -{ - return multiTelemetryLastRxTS[module]; -} - #else // !INTERNAL_MODULE_MULTI static MultiModuleStatus multiModuleStatus; @@ -597,8 +591,6 @@ void processMultiTelemetryData(uint8_t data, uint8_t module) { uint8_t * rxBuffer = getTelemetryRxBuffer(module); uint8_t &rxBufferCount = getTelemetryRxBufferCount(module); - - uint16_t &lastRxTS = getMultiTelemetryLastRxTS(module); // debugPrintf("State: %d, byte received %02X, buflen: %d\r\n", // getMultiTelemetryBufferState(module), data, rxBufferCount);