From c75d873b91575de6ea73872fa224b90baa10f034 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Thu, 5 Jul 2018 10:59:12 +0200 Subject: [PATCH] Remove CASE_CPUARM and IF_CPUARM macros --- radio/src/crc16.cpp | 2 +- radio/src/gui/128x64/menus.h | 12 ++++---- radio/src/gui/128x64/model_inputs_mixes.cpp | 12 ++++---- radio/src/gui/128x64/model_setup.cpp | 28 +++++++++---------- radio/src/gui/128x64/model_telemetry.cpp | 2 +- radio/src/gui/128x64/radio_setup.cpp | 20 ++++++------- radio/src/gui/212x64/splash.cpp | 2 +- radio/src/gui/common/colorlcd/widgets.cpp | 2 +- radio/src/gui/screenshot.cpp | 2 +- radio/src/opentx.h | 3 -- .../common/arm/stm32/usbd_storage_msd.cpp | 2 +- radio/src/targets/horus/audio_spi_driver.cpp | 2 +- radio/src/targets/horus/gps_driver.cpp | 2 +- radio/src/targets/taranis/pwr_driver.cpp | 2 +- radio/src/telemetry/spektrum.cpp | 2 +- radio/src/tests/colorlcd.cpp | 2 +- radio/src/tests/lcd_480x272.cpp | 2 +- radio/src/translations/de.h.txt | 4 +-- radio/src/translations/en.h.txt | 10 +++---- radio/src/translations/es.h.txt | 4 +-- radio/src/translations/fi.h.txt | 4 +-- radio/src/translations/fr.h.txt | 10 +++---- radio/src/translations/it.h.txt | 4 +-- radio/src/translations/nl.h.txt | 10 +++---- radio/src/translations/pl.h.txt | 10 +++---- radio/src/translations/pt.h.txt | 4 +-- radio/src/translations/se.h.txt | 4 +-- 27 files changed, 80 insertions(+), 83 deletions(-) diff --git a/radio/src/crc16.cpp b/radio/src/crc16.cpp index bd4db574e..caa3c94b9 100644 --- a/radio/src/crc16.cpp +++ b/radio/src/crc16.cpp @@ -108,4 +108,4 @@ uint8_t crc8(const uint8_t * ptr, uint32_t len) crc = crc8tab[crc ^ *ptr++]; } return crc; -} \ No newline at end of file +} diff --git a/radio/src/gui/128x64/menus.h b/radio/src/gui/128x64/menus.h index f1fd1d2b4..fec7aba64 100644 --- a/radio/src/gui/128x64/menus.h +++ b/radio/src/gui/128x64/menus.h @@ -74,12 +74,12 @@ enum MenuRadioIndexes { MENU_RADIO_SETUP, CASE_SDCARD(MENU_RADIO_SD_MANAGER) - CASE_CPUARM(MENU_RADIO_SPECIAL_FUNCTIONS) + MENU_RADIO_SPECIAL_FUNCTIONS, MENU_RADIO_TRAINER, MENU_RADIO_VERSION, MENU_RADIO_SWITCHES_TEST, MENU_RADIO_ANALOGS_TEST, - CASE_CPUARM(MENU_RADIO_HARDWARE) + MENU_RADIO_HARDWARE, MENU_RADIO_CALIBRATION, MENU_RADIO_PAGES_COUNT }; @@ -97,12 +97,12 @@ void menuRadioCalibration(event_t event); static const MenuHandlerFunc menuTabGeneral[] PROGMEM = { menuRadioSetup, CASE_SDCARD(menuRadioSdManager) - CASE_CPUARM(menuRadioSpecialFunctions) + menuRadioSpecialFunctions, menuRadioTrainer, menuRadioVersion, menuRadioDiagKeys, menuRadioDiagAnalogs, - CASE_CPUARM(menuRadioHardware) + menuRadioHardware, menuRadioCalibration }; @@ -122,7 +122,7 @@ enum MenuModelIndexes { #endif CASE_FRSKY(MENU_MODEL_TELEMETRY_FRSKY) CASE_MAVLINK(MENU_MODEL_TELEMETRY_MAVLINK) - CASE_CPUARM(MENU_MODEL_DISPLAY) + MENU_MODEL_DISPLAY, CASE_TEMPLATES(MENU_MODEL_TEMPLATES) MENU_MODEL_PAGES_COUNT }; @@ -164,7 +164,7 @@ static const MenuHandlerFunc menuTabModel[] PROGMEM = { #endif CASE_FRSKY(menuModelTelemetryFrsky) CASE_MAVLINK(menuModelTelemetryMavlink) - CASE_CPUARM(menuModelDisplay) + menuModelDisplay, CASE_TEMPLATES(menuModelTemplates) }; diff --git a/radio/src/gui/128x64/model_inputs_mixes.cpp b/radio/src/gui/128x64/model_inputs_mixes.cpp index 47175bcfe..2a9a40c55 100644 --- a/radio/src/gui/128x64/model_inputs_mixes.cpp +++ b/radio/src/gui/128x64/model_inputs_mixes.cpp @@ -217,7 +217,7 @@ bool swapExpoMix(uint8_t expo, uint8_t &idx, uint8_t up) } enum ExposFields { - CASE_CPUARM(EXPO_FIELD_NAME) + EXPO_FIELD_NAME, EXPO_FIELD_WEIGHT, EXPO_FIELD_EXPO, CASE_CURVES(EXPO_FIELD_CURVE) @@ -234,7 +234,7 @@ void menuModelExpoOne(event_t event) ExpoData * ed = expoAddress(s_currIdx); drawSource(7*FW+FW/2, 0, MIXSRC_Rud+ed->chn, 0); - SUBMENU(STR_MENUINPUTS, EXPO_FIELD_MAX, {CASE_CPUARM(0) 0, 0, CASE_CURVES(CURVE_ROWS) CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0 /*, ...*/}); + SUBMENU(STR_MENUINPUTS, EXPO_FIELD_MAX, {0, 0, 0, CASE_CURVES(CURVE_ROWS) CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0 /*, ...*/}); int8_t sub = menuVerticalPosition; @@ -313,7 +313,7 @@ void menuModelExpoOne(event_t event) } enum MixFields { - CASE_CPUARM(MIX_FIELD_NAME) + MIX_FIELD_NAME, MIX_FIELD_SOURCE, MIX_FIELD_WEIGHT, MIX_FIELD_OFFSET, @@ -384,11 +384,11 @@ void menuModelMixOne(event_t event) #if defined(ROTARY_ENCODERS) if ((menuVerticalPosition == MIX_FIELD_TRIM && md2->srcRaw > NUM_STICKS) || (menuVerticalPosition == MIX_FIELD_CURVE && md2->curveMode == MODE_CURVE)) - SUBMENU_NOTITLE(MIX_FIELD_COUNT, {CASE_CPUARM(0) 0, 0, 0, 0, CASE_CURVES(0) CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0, 0 /*, ...*/}) + SUBMENU_NOTITLE(MIX_FIELD_COUNT, {0, 0, 0, 0, 0, CASE_CURVES(0) CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0, 0 /*, ...*/}) else - SUBMENU_NOTITLE(MIX_FIELD_COUNT, {CASE_CPUARM(0) 0, 0, 0, 1, CASE_CURVES(1) CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0, 0 /*, ...*/}); + SUBMENU_NOTITLE(MIX_FIELD_COUNT, {0, 0, 0, 0, 1, CASE_CURVES(1) CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0, 0 /*, ...*/}); #else - SUBMENU_NOTITLE(MIX_FIELD_COUNT, {CASE_CPUARM(0) 0, 0, 0, 1, CASE_CURVES(1) CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0, 0 /*, ...*/}); + SUBMENU_NOTITLE(MIX_FIELD_COUNT, {0, 0, 0, 0, 1, CASE_CURVES(1) CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0, 0 /*, ...*/}); #endif int8_t sub = menuVerticalPosition; diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index 71233c30f..a4d8a86fc 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/radio/src/gui/128x64/model_setup.cpp @@ -39,29 +39,29 @@ uint8_t getSwitchWarningsCount() enum MenuModelSetupItems { ITEM_MODEL_NAME, ITEM_MODEL_TIMER1, - CASE_CPUARM(ITEM_MODEL_TIMER1_NAME) + ITEM_MODEL_TIMER1_NAME, CASE_PERSISTENT_TIMERS(ITEM_MODEL_TIMER1_PERSISTENT) ITEM_MODEL_TIMER1_MINUTE_BEEP, ITEM_MODEL_TIMER1_COUNTDOWN_BEEP, ITEM_MODEL_TIMER2, - CASE_CPUARM(ITEM_MODEL_TIMER2_NAME) + ITEM_MODEL_TIMER2_NAME, CASE_PERSISTENT_TIMERS(ITEM_MODEL_TIMER2_PERSISTENT) ITEM_MODEL_TIMER2_MINUTE_BEEP, ITEM_MODEL_TIMER2_COUNTDOWN_BEEP, - CASE_CPUARM(ITEM_MODEL_TIMER3) - CASE_CPUARM(ITEM_MODEL_TIMER3_NAME) - CASE_CPUARM(ITEM_MODEL_TIMER3_PERSISTENT) - CASE_CPUARM(ITEM_MODEL_TIMER3_MINUTE_BEEP) - CASE_CPUARM(ITEM_MODEL_TIMER3_COUNTDOWN_BEEP) + ITEM_MODEL_TIMER3, + ITEM_MODEL_TIMER3_NAME, + ITEM_MODEL_TIMER3_PERSISTENT, + ITEM_MODEL_TIMER3_MINUTE_BEEP, + ITEM_MODEL_TIMER3_COUNTDOWN_BEEP, ITEM_MODEL_EXTENDED_LIMITS, ITEM_MODEL_EXTENDED_TRIMS, - CASE_CPUARM(ITEM_MODEL_DISPLAY_TRIMS) + ITEM_MODEL_DISPLAY_TRIMS, ITEM_MODEL_TRIM_INC, ITEM_MODEL_THROTTLE_REVERSED, ITEM_MODEL_THROTTLE_TRACE, ITEM_MODEL_THROTTLE_TRIM, - CASE_CPUARM(ITEM_MODEL_PREFLIGHT_LABEL) - CASE_CPUARM(ITEM_MODEL_CHECKLIST_DISPLAY) + ITEM_MODEL_PREFLIGHT_LABEL, + ITEM_MODEL_CHECKLIST_DISPLAY, ITEM_MODEL_THROTTLE_WARNING, ITEM_MODEL_SWITCHES_WARNING, #if defined(PCBTARANIS) @@ -69,7 +69,7 @@ enum MenuModelSetupItems { ITEM_MODEL_POTS_WARNING, #endif ITEM_MODEL_BEEP_CENTER, - CASE_CPUARM(ITEM_MODEL_USE_GLOBAL_FUNCTIONS) + ITEM_MODEL_USE_GLOBAL_FUNCTIONS, #if defined(PCBTARANIS) ITEM_MODEL_INTERNAL_MODULE_LABEL, ITEM_MODEL_INTERNAL_MODULE_MODE, @@ -252,8 +252,8 @@ void menuModelSetup(event_t event) 0, // Throttle reverse 0, // Throttle trace source 0, // Throttle trim - CASE_CPUARM(LABEL(PreflightCheck)) - CASE_CPUARM(0) // Checklist + LABEL(PreflightCheck), + 0, // Checklist 0, // Throttle warning SW_WARN_ROWS, // Switch warning POT_WARN_ITEMS(), // Pot warning @@ -279,7 +279,7 @@ void menuModelSetup(event_t event) EXTRA_MODULE_ROWS TRAINER_ROWS }); #else - MENU_TAB({ HEADER_LINE_COLUMNS 0, TIMER_ROWS, TIMER_ROWS, TIMER_ROWS, 0, 1, 0, 0, 0, 0, 0, CASE_CPUARM(LABEL(PreflightCheck)) CASE_CPUARM(0) 0, NUM_SWITCHES-1, NUM_STICKS+NUM_POTS+NUM_SLIDERS+NUM_ROTARY_ENCODERS-1, 0, + MENU_TAB({ HEADER_LINE_COLUMNS 0, TIMER_ROWS, TIMER_ROWS, TIMER_ROWS, 0, 1, 0, 0, 0, 0, 0, LABEL(PreflightCheck), 0, 0, NUM_SWITCHES-1, NUM_STICKS+NUM_POTS+NUM_SLIDERS+NUM_ROTARY_ENCODERS-1, 0, LABEL(ExternalModule), EXTERNAL_MODULE_MODE_ROWS, MULTIMODULE_SUBTYPE_ROWS(EXTERNAL_MODULE) diff --git a/radio/src/gui/128x64/model_telemetry.cpp b/radio/src/gui/128x64/model_telemetry.cpp index 65b79b95b..861ce008b 100644 --- a/radio/src/gui/128x64/model_telemetry.cpp +++ b/radio/src/gui/128x64/model_telemetry.cpp @@ -21,7 +21,7 @@ #include "opentx.h" enum MenuModelTelemetryFrskyItems { - CASE_CPUARM(ITEM_TELEMETRY_PROTOCOL_TYPE) + ITEM_TELEMETRY_PROTOCOL_TYPE, #if defined(REVX) ITEM_TELEMETRY_INVERTED_SERIAL, #endif diff --git a/radio/src/gui/128x64/radio_setup.cpp b/radio/src/gui/128x64/radio_setup.cpp index 9976a5cb0..ae13627d0 100644 --- a/radio/src/gui/128x64/radio_setup.cpp +++ b/radio/src/gui/128x64/radio_setup.cpp @@ -56,11 +56,11 @@ enum MenuRadioSetupItems { CASE_AUDIO(ITEM_SETUP_BEEP_MODE) CASE_BUZZER(ITEM_SETUP_BUZZER_MODE) CASE_VOICE(ITEM_SETUP_SPEAKER_VOLUME) - CASE_CPUARM(ITEM_SETUP_BEEP_VOLUME) + ITEM_SETUP_BEEP_VOLUME, ITEM_SETUP_BEEP_LENGTH, CASE_AUDIO(ITEM_SETUP_SPEAKER_PITCH) - CASE_CPUARM(ITEM_SETUP_WAV_VOLUME) - CASE_CPUARM(ITEM_SETUP_BACKGROUND_VOLUME) + ITEM_SETUP_WAV_VOLUME, + ITEM_SETUP_BACKGROUND_VOLUME, CASE_VARIO_CPUARM(ITEM_SETUP_VARIO_LABEL) CASE_VARIO_CPUARM(ITEM_SETUP_VARIO_VOLUME) CASE_VARIO_CPUARM(ITEM_SETUP_VARIO_PITCH) @@ -78,25 +78,25 @@ enum MenuRadioSetupItems { ITEM_SETUP_INACTIVITY_ALARM, ITEM_SETUP_MEMORY_WARNING, ITEM_SETUP_ALARM_WARNING, - CASE_CPUARM(ITEM_SETUP_RSSI_POWEROFF_ALARM) + ITEM_SETUP_RSSI_POWEROFF_ALARM, IF_ROTARY_ENCODERS(ITEM_SETUP_RE_NAVIGATION) ITEM_SETUP_BACKLIGHT_LABEL, ITEM_SETUP_BACKLIGHT_MODE, ITEM_SETUP_BACKLIGHT_DELAY, - CASE_CPUARM(ITEM_SETUP_BRIGHTNESS) + ITEM_SETUP_BRIGHTNESS, CASE_PWM_BACKLIGHT(ITEM_SETUP_BACKLIGHT_BRIGHTNESS_OFF) CASE_PWM_BACKLIGHT(ITEM_SETUP_BACKLIGHT_BRIGHTNESS_ON) ITEM_SETUP_FLASH_BEEP, CASE_SPLASH_PARAM(ITEM_SETUP_DISABLE_SPLASH) CASE_GPS(ITEM_SETUP_TIMEZONE) - CASE_CPUARM(ITEM_SETUP_ADJUST_RTC) + ITEM_SETUP_ADJUST_RTC, CASE_GPS(ITEM_SETUP_GPSFORMAT) CASE_PXX(ITEM_SETUP_COUNTRYCODE) - CASE_CPUARM(ITEM_SETUP_LANGUAGE) - CASE_CPUARM(ITEM_SETUP_IMPERIAL) + ITEM_SETUP_LANGUAGE, + ITEM_SETUP_IMPERIAL, IF_FAI_CHOICE(ITEM_SETUP_FAI) CASE_MAVLINK(ITEM_MAVLINK_BAUD) - CASE_CPUARM(ITEM_SETUP_SWITCHES_DELAY) + ITEM_SETUP_SWITCHES_DELAY, CASE_STM32(ITEM_SETUP_USB_MODE) ITEM_SETUP_RX_CHANNEL_ORD, ITEM_SETUP_STICK_MODE_LABELS, @@ -132,7 +132,7 @@ void menuRadioSetup(event_t event) } #endif - MENU(STR_MENURADIOSETUP, menuTabGeneral, MENU_RADIO_SETUP, HEADER_LINE+ITEM_SETUP_MAX, { HEADER_LINE_COLUMNS CASE_RTCLOCK(2) CASE_RTCLOCK(2) CASE_BATTGRAPH(1) LABEL(SOUND), CASE_AUDIO(0) CASE_BUZZER(0) CASE_VOICE(0) CASE_CPUARM(0) CASE_CPUARM(0) CASE_CPUARM(0) 0, CASE_AUDIO(0) CASE_VARIO_CPUARM(LABEL(VARIO)) CASE_VARIO_CPUARM(0) CASE_VARIO_CPUARM(0) CASE_VARIO_CPUARM(0) CASE_VARIO_CPUARM(0) CASE_HAPTIC(LABEL(HAPTIC)) CASE_HAPTIC(0) CASE_HAPTIC(0) CASE_HAPTIC(0) 0, LABEL(ALARMS), 0, CASE_CAPACITY(0) CASE_PCBSKY9X(0) 0, 0, 0, CASE_CPUARM(0) IF_ROTARY_ENCODERS(0) LABEL(BACKLIGHT), 0, 0, CASE_CPUARM(0) CASE_PWM_BACKLIGHT(0) CASE_PWM_BACKLIGHT(0) 0, CASE_SPLASH_PARAM(0) CASE_GPS(0) CASE_CPUARM(0) CASE_GPS(0) CASE_PXX(0) CASE_CPUARM(0) CASE_CPUARM(0) IF_FAI_CHOICE(0) CASE_MAVLINK(0) CASE_CPUARM(0) CASE_STM32(0) 0, COL_TX_MODE, 0, 1/*to force edit mode*/}); + MENU(STR_MENURADIOSETUP, menuTabGeneral, MENU_RADIO_SETUP, HEADER_LINE+ITEM_SETUP_MAX, { HEADER_LINE_COLUMNS CASE_RTCLOCK(2) CASE_RTCLOCK(2) CASE_BATTGRAPH(1) LABEL(SOUND), CASE_AUDIO(0) CASE_BUZZER(0) CASE_VOICE(0) 0, 0, 0, 0, CASE_AUDIO(0) CASE_VARIO_CPUARM(LABEL(VARIO)) CASE_VARIO_CPUARM(0) CASE_VARIO_CPUARM(0) CASE_VARIO_CPUARM(0) CASE_VARIO_CPUARM(0) CASE_HAPTIC(LABEL(HAPTIC)) CASE_HAPTIC(0) CASE_HAPTIC(0) CASE_HAPTIC(0) 0, LABEL(ALARMS), 0, CASE_CAPACITY(0) CASE_PCBSKY9X(0) 0, 0, 0, 0, IF_ROTARY_ENCODERS(0) LABEL(BACKLIGHT), 0, 0, 0, CASE_PWM_BACKLIGHT(0) CASE_PWM_BACKLIGHT(0) 0, CASE_SPLASH_PARAM(0) CASE_GPS(0) 0, CASE_GPS(0) CASE_PXX(0) 0, 0, IF_FAI_CHOICE(0) CASE_MAVLINK(0) 0, CASE_STM32(0) 0, COL_TX_MODE, 0, 1/*to force edit mode*/}); if (event == EVT_ENTRY) { reusableBuffer.generalSettings.stickMode = g_eeGeneral.stickMode; diff --git a/radio/src/gui/212x64/splash.cpp b/radio/src/gui/212x64/splash.cpp index 61889ad7e..94f81b530 100644 --- a/radio/src/gui/212x64/splash.cpp +++ b/radio/src/gui/212x64/splash.cpp @@ -56,4 +56,4 @@ void drawSecondSplash() lcdDrawBitmap(0, 0, splash2_lbm); lcdRefresh(); } -#endif \ No newline at end of file +#endif diff --git a/radio/src/gui/common/colorlcd/widgets.cpp b/radio/src/gui/common/colorlcd/widgets.cpp index e90f66b9e..97446d88c 100644 --- a/radio/src/gui/common/colorlcd/widgets.cpp +++ b/radio/src/gui/common/colorlcd/widgets.cpp @@ -92,4 +92,4 @@ void runFatalErrorScreen(const char * message) SIMU_SLEEP_NORET(1); } } -} \ No newline at end of file +} diff --git a/radio/src/gui/screenshot.cpp b/radio/src/gui/screenshot.cpp index 004563869..ae4dfe3c1 100644 --- a/radio/src/gui/screenshot.cpp +++ b/radio/src/gui/screenshot.cpp @@ -73,4 +73,4 @@ const char * writeScreenshot() f_close(&bmpFile); return NULL; -} \ No newline at end of file +} diff --git a/radio/src/opentx.h b/radio/src/opentx.h index 7123df398..b325b77da 100644 --- a/radio/src/opentx.h +++ b/radio/src/opentx.h @@ -45,9 +45,6 @@ #define CASE_PCBSKY9X(x) #endif - #define CASE_CPUARM(x) x, - #define IF_CPUARM(x) x - #if defined(STM32) #define CASE_STM32(x) x, #else diff --git a/radio/src/targets/common/arm/stm32/usbd_storage_msd.cpp b/radio/src/targets/common/arm/stm32/usbd_storage_msd.cpp index 074e990b8..b60e5da8f 100644 --- a/radio/src/targets/common/arm/stm32/usbd_storage_msd.cpp +++ b/radio/src/targets/common/arm/stm32/usbd_storage_msd.cpp @@ -612,4 +612,4 @@ int32_t fat12Write(const uint8_t * buffer, uint16_t sector, uint16_t count) } #endif return 0 ; -} \ No newline at end of file +} diff --git a/radio/src/targets/horus/audio_spi_driver.cpp b/radio/src/targets/horus/audio_spi_driver.cpp index 807f957cc..430090bb8 100644 --- a/radio/src/targets/horus/audio_spi_driver.cpp +++ b/radio/src/targets/horus/audio_spi_driver.cpp @@ -449,4 +449,4 @@ int32_t getVolume() return -1; // TODO } -#endif \ No newline at end of file +#endif diff --git a/radio/src/targets/horus/gps_driver.cpp b/radio/src/targets/horus/gps_driver.cpp index 37c6fa046..7a5e464c4 100644 --- a/radio/src/targets/horus/gps_driver.cpp +++ b/radio/src/targets/horus/gps_driver.cpp @@ -107,4 +107,4 @@ uint8_t gpsGetByte(uint8_t * byte) } #endif return result; -} \ No newline at end of file +} diff --git a/radio/src/targets/taranis/pwr_driver.cpp b/radio/src/targets/taranis/pwr_driver.cpp index 0bb6e28f4..d754d3473 100644 --- a/radio/src/targets/taranis/pwr_driver.cpp +++ b/radio/src/targets/taranis/pwr_driver.cpp @@ -117,4 +117,4 @@ void pwrResetHandler() if (WAS_RESET_BY_WATCHDOG_OR_SOFTWARE()) { pwrOn(); } -} \ No newline at end of file +} diff --git a/radio/src/telemetry/spektrum.cpp b/radio/src/telemetry/spektrum.cpp index a336c300a..dd3d9246f 100644 --- a/radio/src/telemetry/spektrum.cpp +++ b/radio/src/telemetry/spektrum.cpp @@ -489,4 +489,4 @@ void spektrumSetDefault(int index, uint16_t id, uint8_t subId, uint8_t instance) } storageDirty(EE_MODEL); -} \ No newline at end of file +} diff --git a/radio/src/tests/colorlcd.cpp b/radio/src/tests/colorlcd.cpp index 59d83c9e1..53643145a 100644 --- a/radio/src/tests/colorlcd.cpp +++ b/radio/src/tests/colorlcd.cpp @@ -51,4 +51,4 @@ TEST(color, ARGB) EXPECT_EQ(ARGB(128, 30, 40, 150), (uint16_t)0x8129); } -#endif \ No newline at end of file +#endif diff --git a/radio/src/tests/lcd_480x272.cpp b/radio/src/tests/lcd_480x272.cpp index 1cd8c2666..45352813c 100644 --- a/radio/src/tests/lcd_480x272.cpp +++ b/radio/src/tests/lcd_480x272.cpp @@ -171,4 +171,4 @@ TEST(Lcd_480x272, fonts) } -#endif \ No newline at end of file +#endif diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index a68ca2706..032538668 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -658,8 +658,8 @@ #define TR_SPLASHSCREEN TR("Startbild Ein", "Startbild Anzeigedauer") #define TR_THROTTLEWARNING TR("Gasalarm", INDENT "Gas Alarm") #define TR_SWITCHWARNING TR("Sch. Alarm", INDENT "Schalter-Alarm") -#define TR_POTWARNINGSTATE TR(IF_CPUARM(INDENT) "Pot&Slid.", INDENT "Pots & sliders") -#define TR_SLIDERWARNING TR(IF_CPUARM(INDENT) "Slid. pos.", INDENT "Slider positions") +#define TR_POTWARNINGSTATE TR(INDENT "Pot&Slid.", INDENT "Pots & sliders") +#define TR_SLIDERWARNING TR(INDENT "Slid. pos.", INDENT "Slider positions") #define TR_POTWARNING TR("Pot Warn.", INDENT "Poti-Warnung") #define TR_TIMEZONE TR("Zeitzone", "GPS-Zeitzone +/-Std") #define TR_ADJUST_RTC TR("Uhrzeit setzen", INDENT "Uhrzeit per GPS setzen") diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 83b23a155..32bc52c17 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -655,11 +655,11 @@ #define TR_BLOFFBRIGHTNESS INDENT "OFF brightness" #define TR_BLCOLOR INDENT "Color" #define TR_SPLASHSCREEN "Splash screen" -#define TR_THROTTLEWARNING TR(IF_CPUARM(INDENT) "T-Warning", INDENT "Throttle state") -#define TR_SWITCHWARNING TR(IF_CPUARM(INDENT) "S-Warning", INDENT "Switch positions") -#define TR_POTWARNINGSTATE TR(IF_CPUARM(INDENT) "Pot&Slid.", INDENT "Pots & sliders") -#define TR_SLIDERWARNING TR(IF_CPUARM(INDENT) "Slid. pos.", INDENT "Slider positions") -#define TR_POTWARNING TR(IF_CPUARM(INDENT) "Pot warn.", INDENT "Pot positions") +#define TR_THROTTLEWARNING TR(INDENT "T-Warning", INDENT "Throttle state") +#define TR_SWITCHWARNING TR(INDENT "S-Warning", INDENT "Switch positions") +#define TR_POTWARNINGSTATE TR(INDENT "Pot&Slid.", INDENT "Pots & sliders") +#define TR_SLIDERWARNING TR(INDENT "Slid. pos.", INDENT "Slider positions") +#define TR_POTWARNING TR(INDENT "Pot warn.", INDENT "Pot positions") #define TR_TIMEZONE TR("Time Zone", INDENT "Time zone") #define TR_ADJUST_RTC TR("Adjust RTC", INDENT "Adjust RTC") #define TR_GPS "GPS" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index e117eb24a..d8bfdd864 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -657,8 +657,8 @@ #define TR_SPLASHSCREEN "Ptalla.inicio" #define TR_THROTTLEWARNING TR("Aviso-A", INDENT "Aviso Acelerador") #define TR_SWITCHWARNING TR("Aviso-I", INDENT "Aviso Intrptor") -#define TR_POTWARNINGSTATE TR(IF_CPUARM(INDENT) "Pot&Slid.", INDENT "Pots & sliders") -#define TR_SLIDERWARNING TR(IF_CPUARM(INDENT) "Slid. pos.", INDENT "Slider positions") +#define TR_POTWARNINGSTATE TR(INDENT "Pot&Slid.", INDENT "Pots & sliders") +#define TR_SLIDERWARNING TR(INDENT "Slid. pos.", INDENT "Slider positions") #define TR_POTWARNING TR("Pot Warn.", INDENT "Pot Warning") #define TR_TIMEZONE TR("Zona Hora", "GPS Zona Hora") #define TR_ADJUST_RTC TR("Adjust RTC", INDENT "Adjust RTC") diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 57692afeb..dfb1a1dd8 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -649,8 +649,8 @@ #define TR_SPLASHSCREEN "Splash screen" #define TR_THROTTLEWARNING TR("T-Warning", INDENT "Throttle Warning") #define TR_SWITCHWARNING TR("S-Warning", INDENT "Switch Warning") -#define TR_POTWARNINGSTATE TR(IF_CPUARM(INDENT) "Pot&Slid.", INDENT "Pots & sliders") -#define TR_SLIDERWARNING TR(IF_CPUARM(INDENT) "Slid. pos.", INDENT "Slider positions") +#define TR_POTWARNINGSTATE TR(INDENT "Pot&Slid.", INDENT "Pots & sliders") +#define TR_SLIDERWARNING TR(INDENT "Slid. pos.", INDENT "Slider positions") #define TR_POTWARNING TR("Pot Warn.", INDENT "Pot Warning") #define TR_TIMEZONE TR("Time Zone","GPS Time zone") #define TR_ADJUST_RTC TR("Adjust RTC", INDENT "Adjust RTC") diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index c6ca483a2..3a2f210ee 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -664,11 +664,11 @@ #define TR_BLOFFBRIGHTNESS INDENT "Luminosité OFF" #define TR_BLCOLOR INDENT "Couleur" #define TR_SPLASHSCREEN "Logo d'accueil" -#define TR_THROTTLEWARNING TR(IF_CPUARM(INDENT) "Alerte gaz", INDENT "Alerte gaz") -#define TR_SWITCHWARNING TR(IF_CPUARM(INDENT) "Alerte int", INDENT "Pos. interrupteurs") -#define TR_POTWARNINGSTATE TR(IF_CPUARM(INDENT) "Pot&Slid.", INDENT "Pots & sliders") -#define TR_SLIDERWARNING TR(IF_CPUARM(INDENT) "Slid. pos.", INDENT "Slider positions") -#define TR_POTWARNING TR(IF_CPUARM(INDENT) "Alerte pot", INDENT "Pos. potentios") +#define TR_THROTTLEWARNING TR(INDENT "Alerte gaz", INDENT "Alerte gaz") +#define TR_SWITCHWARNING TR(INDENT "Alerte int", INDENT "Pos. interrupteurs") +#define TR_POTWARNINGSTATE TR(INDENT "Pot&Slid.", INDENT "Pots & sliders") +#define TR_SLIDERWARNING TR(INDENT "Slid. pos.", INDENT "Slider positions") +#define TR_POTWARNING TR(INDENT "Alerte pot", INDENT "Pos. potentios") #define TR_TIMEZONE "Fuseau horaire" #define TR_ADJUST_RTC TR("Ajust. RTC", INDENT "Ajust. heure auto") #define TR_GPS "GPS" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 561720446..cd29d9e46 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -655,8 +655,8 @@ #define TR_SPLASHSCREEN TR("Schermo avvio", "Schermata di avvio") #define TR_THROTTLEWARNING TR("All. Mot.", INDENT "Allarme Motore") #define TR_SWITCHWARNING TR("Avv. Int.", INDENT "Avviso Interr.") -#define TR_POTWARNINGSTATE TR(IF_CPUARM(INDENT) "Pot&Slid.", INDENT "Pots & sliders") -#define TR_SLIDERWARNING TR(IF_CPUARM(INDENT) "Slid. pos.", INDENT "Slider positions") +#define TR_POTWARNINGSTATE TR(INDENT "Pot&Slid.", INDENT "Pots & sliders") +#define TR_SLIDERWARNING TR(INDENT "Slid. pos.", INDENT "Slider positions") #define TR_POTWARNING TR("Avv. Pot.", INDENT "Avviso Pot.") #define TR_TIMEZONE "Ora locale" #define TR_ADJUST_RTC TR("Aggiusta RTC", INDENT "Aggiusta RTC") diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index e6ba578fd..624d38564 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -652,11 +652,11 @@ #define TR_BLOFFBRIGHTNESS INDENT "Uit-Helderheid" #define TR_BLCOLOR INDENT "Kleur" #define TR_SPLASHSCREEN "Startscherm Aan" -#define TR_THROTTLEWARNING TR(IF_CPUARM(INDENT) "T-Warning", INDENT "Throttle Status") -#define TR_SWITCHWARNING TR(IF_CPUARM(INDENT) "S-Warning", INDENT "Switch Posities") -#define TR_POTWARNINGSTATE TR(IF_CPUARM(INDENT) "Pot&Slid.", INDENT "Pots & sliders") -#define TR_SLIDERWARNING TR(IF_CPUARM(INDENT) "Slid. pos.", INDENT "Slider positions") -#define TR_POTWARNING TR(IF_CPUARM(INDENT) "Pot Warn.", INDENT "Pot Posities") +#define TR_THROTTLEWARNING TR(INDENT "T-Warning", INDENT "Throttle Status") +#define TR_SWITCHWARNING TR(INDENT "S-Warning", INDENT "Switch Posities") +#define TR_POTWARNINGSTATE TR(INDENT "Pot&Slid.", INDENT "Pots & sliders") +#define TR_SLIDERWARNING TR(INDENT "Slid. pos.", INDENT "Slider positions") +#define TR_POTWARNING TR(INDENT "Pot Warn.", INDENT "Pot Posities") #define TR_TIMEZONE TR("Tijdzone", "GPS-Tijdzone +/-Std") #define TR_ADJUST_RTC TR("Klok instellen", INDENT "Klok middels GPS instellen") #define TR_GPS "GPS" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 6a7de9cdb..dffda9b94 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -655,11 +655,11 @@ #define TR_BLOFFBRIGHTNESS INDENT"Jasność wył." #define TR_BLCOLOR INDENT "Color" #define TR_SPLASHSCREEN "Logo ekranu" -#define TR_THROTTLEWARNING TR(IF_CPUARM(INDENT)"OstrzGaz", INDENT "OstrzeżenieGaz") -#define TR_SWITCHWARNING TR(IF_CPUARM(INDENT) "OstrzPrzeł", INDENT "PozycjaPrzeł") -#define TR_POTWARNINGSTATE TR(IF_CPUARM(INDENT) "Pot&Slid.", INDENT "Pots & sliders") -#define TR_SLIDERWARNING TR(IF_CPUARM(INDENT) "Slid. pos.", INDENT "Slider positions") -#define TR_POTWARNING TR(IF_CPUARM(INDENT) "Ostrz.Poten.", INDENT "PozycjaPotencj.") +#define TR_THROTTLEWARNING TR(INDENT"OstrzGaz", INDENT "OstrzeżenieGaz") +#define TR_SWITCHWARNING TR(INDENT "OstrzPrzeł", INDENT "PozycjaPrzeł") +#define TR_POTWARNINGSTATE TR(INDENT "Pot&Slid.", INDENT "Pots & sliders") +#define TR_SLIDERWARNING TR(INDENT "Slid. pos.", INDENT "Slider positions") +#define TR_POTWARNING TR(INDENT "Ostrz.Poten.", INDENT "PozycjaPotencj.") #define TR_TIMEZONE TR("Strefa czasowa" ,"Strefa czasowa GPS") #define TR_ADJUST_RTC TR("RegulujRTC", INDENT "RegulujRTC") #define TR_GPS "GPS" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index dd7fba563..91a5b565b 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -656,8 +656,8 @@ #define TR_SPLASHSCREEN "Splash screen" #define TR_THROTTLEWARNING TR("Avisa Acel", INDENT "Avisa Acel") #define TR_SWITCHWARNING TR("Avisa Chav", INDENT "Avisa Chav") -#define TR_POTWARNINGSTATE TR(IF_CPUARM(INDENT) "Pot&Slid.", INDENT "Pots & sliders") -#define TR_SLIDERWARNING TR(IF_CPUARM(INDENT) "Slid. pos.", INDENT "Slider positions") +#define TR_POTWARNINGSTATE TR(INDENT "Pot&Slid.", INDENT "Pots & sliders") +#define TR_SLIDERWARNING TR(INDENT "Slid. pos.", INDENT "Slider positions") #define TR_POTWARNING TR("Pot Warn.", INDENT "Pot Warning") #define TR_TIMEZONE "Time Zone" #define TR_ADJUST_RTC TR("Adjust RTC", INDENT "Adjust RTC") diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index bc199bdbb..24ca10984 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -666,8 +666,8 @@ #define TR_BLCOLOR INDENT "Color" #define TR_THROTTLEWARNING TR("Gasvarning", INDENT "Gasvarning") #define TR_SWITCHWARNING TR("Bryt.varn.", INDENT "Brytarvarning") -#define TR_POTWARNINGSTATE TR(IF_CPUARM(INDENT) "Pot&Slid.", INDENT "Pots & sliders") -#define TR_SLIDERWARNING TR(IF_CPUARM(INDENT) "Slid. pos.", INDENT "Slider positions") +#define TR_POTWARNINGSTATE TR(INDENT "Pot&Slid.", INDENT "Pots & sliders") +#define TR_SLIDERWARNING TR(INDENT "Slid. pos.", INDENT "Slider positions") #define TR_POTWARNING TR("Rattvarn.", INDENT "Rattvarning") #define TR_TIMEZONE TR("Tidszon", "GPS Tidszon") #define TR_ADJUST_RTC TR("Adjust RTC", INDENT "Adjust RTC")