From 9f9f313b32716860641a2093e900aa68a0c47028 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Fri, 19 Jul 2019 13:58:06 +0200 Subject: [PATCH] Cosmetics --- radio/src/gui/common/stdlcd/model_module_options.cpp | 2 +- radio/src/gui/common/stdlcd/radio_sdmanager.cpp | 2 +- radio/src/gui/common/stdlcd/radio_tools.cpp | 8 ++++---- radio/src/pulses/pxx2.h | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/radio/src/gui/common/stdlcd/model_module_options.cpp b/radio/src/gui/common/stdlcd/model_module_options.cpp index 3a60cefe5..441f5123c 100644 --- a/radio/src/gui/common/stdlcd/model_module_options.cpp +++ b/radio/src/gui/common/stdlcd/model_module_options.cpp @@ -50,7 +50,7 @@ enum { ITEM_MODULE_SETTINGS_COUNT }; -#define IF_MODULE_OPTIONS(option, count) uint8_t(isModuleOptionAvailable(modelId, option) ? count : HIDDEN_ROW) +#define IF_MODULE_OPTIONS(option, count) uint8_t(isPXX2ModuleOptionAvailable(modelId, option) ? count : HIDDEN_ROW) bool isPowerAvailable(int value) { diff --git a/radio/src/gui/common/stdlcd/radio_sdmanager.cpp b/radio/src/gui/common/stdlcd/radio_sdmanager.cpp index 76625de93..56b47b1b9 100644 --- a/radio/src/gui/common/stdlcd/radio_sdmanager.cpp +++ b/radio/src/gui/common/stdlcd/radio_sdmanager.cpp @@ -103,7 +103,7 @@ void onUpdateStateChanged() if (reusableBuffer.sdManager.otaUpdateInformation.step == BIND_INFO_REQUEST) { uint8_t modelId = reusableBuffer.sdManager.otaUpdateInformation.receiverInformation.modelID; if (modelId > 0 && modelId < DIM(PXX2ReceiversNames)) { - if (isReceiverOptionAvailable(modelId, RECEIVER_OPTION_OTA)) { + if (isPXX2ReceiverOptionAvailable(modelId, RECEIVER_OPTION_OTA)) { POPUP_CONFIRMATION(getPXX2ReceiverName(modelId), onUpdateConfirmation); char *tmp = strAppend(reusableBuffer.sdManager.otaReceiverVersion, TR_CURRENT_VERSION); tmp = strAppendUnsigned(tmp, 1 + reusableBuffer.sdManager.otaUpdateInformation.receiverInformation.swVersion.major); diff --git a/radio/src/gui/common/stdlcd/radio_tools.cpp b/radio/src/gui/common/stdlcd/radio_tools.cpp index 97b92e8bd..051f092e0 100644 --- a/radio/src/gui/common/stdlcd/radio_tools.cpp +++ b/radio/src/gui/common/stdlcd/radio_tools.cpp @@ -131,16 +131,16 @@ void menuRadioTools(event_t event) uint8_t index = 0; #if defined(PXX2) - if (isModuleOptionAvailable(reusableBuffer.hardwareAndSettings.modules[INTERNAL_MODULE].information.modelID, MODULE_OPTION_SPECTRUM_ANALYSER)) + if (isPXX2ModuleOptionAvailable(reusableBuffer.hardwareAndSettings.modules[INTERNAL_MODULE].information.modelID, MODULE_OPTION_SPECTRUM_ANALYSER)) addRadioModuleTool(index++, STR_SPECTRUM_ANALYSER_INT, menuRadioSpectrumAnalyser, INTERNAL_MODULE); - if (isModuleOptionAvailable(reusableBuffer.hardwareAndSettings.modules[INTERNAL_MODULE].information.modelID, MODULE_OPTION_POWER_METER)) + if (isPXX2ModuleOptionAvailable(reusableBuffer.hardwareAndSettings.modules[INTERNAL_MODULE].information.modelID, MODULE_OPTION_POWER_METER)) addRadioModuleTool(index++, STR_POWER_METER_INT, menuRadioPowerMeter, INTERNAL_MODULE); - if (isModuleOptionAvailable(reusableBuffer.hardwareAndSettings.modules[EXTERNAL_MODULE].information.modelID, MODULE_OPTION_SPECTRUM_ANALYSER)) + if (isPXX2ModuleOptionAvailable(reusableBuffer.hardwareAndSettings.modules[EXTERNAL_MODULE].information.modelID, MODULE_OPTION_SPECTRUM_ANALYSER)) addRadioModuleTool(index++, STR_SPECTRUM_ANALYSER_EXT, menuRadioSpectrumAnalyser, EXTERNAL_MODULE); - if (isModuleOptionAvailable(reusableBuffer.hardwareAndSettings.modules[EXTERNAL_MODULE].information.modelID, MODULE_OPTION_POWER_METER)) + if (isPXX2ModuleOptionAvailable(reusableBuffer.hardwareAndSettings.modules[EXTERNAL_MODULE].information.modelID, MODULE_OPTION_POWER_METER)) addRadioModuleTool(index++, STR_POWER_METER_EXT, menuRadioPowerMeter, EXTERNAL_MODULE); #endif diff --git a/radio/src/pulses/pxx2.h b/radio/src/pulses/pxx2.h index a857acbb3..09e5728e4 100644 --- a/radio/src/pulses/pxx2.h +++ b/radio/src/pulses/pxx2.h @@ -127,7 +127,7 @@ inline uint8_t getPXX2ModuleOptions(uint8_t modelId) return PXX2ModuleOptions[0]; } -inline bool isModuleOptionAvailable(uint8_t modelId, uint8_t option) +inline bool isPXX2ModuleOptionAvailable(uint8_t modelId, uint8_t option) { return getPXX2ModuleOptions(modelId) & (1 << option); } @@ -223,7 +223,7 @@ inline uint8_t getPXX2ReceiverOptions(uint8_t modelId) return PXX2ReceiverOptions[0]; } -inline bool isReceiverOptionAvailable(uint8_t modelId, uint8_t option) +inline bool isPXX2ReceiverOptionAvailable(uint8_t modelId, uint8_t option) { return getPXX2ReceiverOptions(modelId) & (1 << option); }