diff --git a/radio/src/dataconstants.h b/radio/src/dataconstants.h index 4056675a66..a1db5ebddb 100644 --- a/radio/src/dataconstants.h +++ b/radio/src/dataconstants.h @@ -859,9 +859,7 @@ enum ResetFunctionParam { FUNC_RESET_TIMER2, FUNC_RESET_TIMER3, FUNC_RESET_FLIGHT, -#if defined(TELEMETRY_FRSKY) FUNC_RESET_TELEMETRY, -#endif FUNC_RESET_PARAM_FIRST_TELEM, FUNC_RESET_PARAM_LAST_TELEM = FUNC_RESET_PARAM_FIRST_TELEM + MAX_TELEMETRY_SENSORS, FUNC_RESET_PARAMS_COUNT, diff --git a/radio/src/functions.cpp b/radio/src/functions.cpp index fa4af1fb83..bd840fc4ae 100644 --- a/radio/src/functions.cpp +++ b/radio/src/functions.cpp @@ -194,11 +194,9 @@ void evalFunctions(const CustomFunctionData * functions, CustomFunctionsContext mainRequestFlags |= (1 << REQUEST_FLIGHT_RESET); // on systems with threads flightReset() must not be called from the mixers thread! } break; -#if defined(TELEMETRY_FRSKY) case FUNC_RESET_TELEMETRY: telemetryReset(); break; -#endif } if (CFN_PARAM(cfn)>=FUNC_RESET_PARAM_FIRST_TELEM) { uint8_t item = CFN_PARAM(cfn)-FUNC_RESET_PARAM_FIRST_TELEM; @@ -338,7 +336,7 @@ void evalFunctions(const CustomFunctionData * functions, CustomFunctionsContext } #endif -#if defined(TELEMETRY_FRSKY) && defined(VARIO) +#if defined(VARIO) case FUNC_VARIO: newActiveFunctions |= (1 << FUNCTION_VARIO); break; diff --git a/radio/src/gui/128x64/gui.h b/radio/src/gui/128x64/gui.h index 0bbd830736..be69f27f74 100644 --- a/radio/src/gui/128x64/gui.h +++ b/radio/src/gui/128x64/gui.h @@ -309,11 +309,7 @@ void showAlertBox(const char * title, const char * text, const char * action , u #define LOAD_MODEL_BITMAP() #define IS_MAIN_VIEW_DISPLAYED() menuHandlers[0] == menuMainView -#if defined(TELEMETRY_FRSKY) #define IS_TELEMETRY_VIEW_DISPLAYED() menuHandlers[0] == menuViewTelemetryFrsky -#else -#define IS_TELEMETRY_VIEW_DISPLAYED() false -#endif #define IS_OTHER_VIEW_DISPLAYED() false void editCurveRef(coord_t x, coord_t y, CurveRef & curve, event_t event, LcdFlags flags); diff --git a/radio/src/gui/128x64/menus.h b/radio/src/gui/128x64/menus.h index 94f21a27c6..4f1428a6f5 100644 --- a/radio/src/gui/128x64/menus.h +++ b/radio/src/gui/128x64/menus.h @@ -101,7 +101,7 @@ enum MenuModelIndexes { #if defined(LUA_MODEL_SCRIPTS) MENU_MODEL_CUSTOM_SCRIPTS, #endif - CASE_FRSKY(MENU_MODEL_TELEMETRY_FRSKY) + MENU_MODEL_TELEMETRY, MENU_MODEL_DISPLAY, MENU_MODEL_PAGES_COUNT }; @@ -124,7 +124,7 @@ void menuModelGVars(event_t event); void menuModelLogicalSwitches(event_t event); void menuModelSpecialFunctions(event_t event); void menuModelCustomScripts(event_t event); -void menuModelTelemetryFrsky(event_t event); +void menuModelTelemetry(event_t event); void menuModelSensor(event_t event); void menuModelDisplay(event_t event); void menuModelTemplates(event_t event); @@ -144,7 +144,7 @@ static const MenuHandlerFunc menuTabModel[] = { #if defined(LUA_MODEL_SCRIPTS) menuModelCustomScripts, #endif - CASE_FRSKY(menuModelTelemetryFrsky) + menuModelTelemetry, menuModelDisplay, }; diff --git a/radio/src/gui/128x64/model_logical_switches.cpp b/radio/src/gui/128x64/model_logical_switches.cpp index 5bc3227f0e..90fc084813 100644 --- a/radio/src/gui/128x64/model_logical_switches.cpp +++ b/radio/src/gui/128x64/model_logical_switches.cpp @@ -154,7 +154,6 @@ void menuModelLogicalSwitchOne(event_t event) INCDEC_ENABLE_CHECK(isSourceAvailable); } else { -#if defined(TELEMETRY_FRSKY) if (v1_val >= MIXSRC_FIRST_TELEM) { drawSourceCustomValue(CSWONE_2ND_COLUMN, y, v1_val, convertLswTelemValue(cs), attr|LEFT); v2_max = maxTelemValue(v1_val - MIXSRC_FIRST_TELEM + 1); @@ -171,7 +170,6 @@ void menuModelLogicalSwitchOne(event_t event) } } else -#endif // TELEMETRY_FRSKY { LcdFlags lf = attr | LEFT; getMixSrcRange(v1_val, v2_min, v2_max, &lf); diff --git a/radio/src/gui/128x64/model_telemetry.cpp b/radio/src/gui/128x64/model_telemetry.cpp index 03f189211d..04a6a26c93 100644 --- a/radio/src/gui/128x64/model_telemetry.cpp +++ b/radio/src/gui/128x64/model_telemetry.cpp @@ -118,9 +118,9 @@ void onDeleteAllSensorsConfirm(const char * result) } } -void menuModelTelemetryFrsky(event_t event) +void menuModelTelemetry(event_t event) { - MENU(STR_MENUTELEMETRY, menuTabModel, MENU_MODEL_TELEMETRY_FRSKY, HEADER_LINE+ITEM_TELEMETRY_MAX, { HEADER_LINE_COLUMNS TELEMETRY_TYPE_ROWS RSSI_ROWS SENSORS_ROWS VARIO_ROWS }); + MENU(STR_MENUTELEMETRY, menuTabModel, MENU_MODEL_TELEMETRY, HEADER_LINE+ITEM_TELEMETRY_MAX, { HEADER_LINE_COLUMNS TELEMETRY_TYPE_ROWS RSSI_ROWS SENSORS_ROWS VARIO_ROWS }); uint8_t sub = menuVerticalPosition - HEADER_LINE; diff --git a/radio/src/gui/128x64/radio_setup.cpp b/radio/src/gui/128x64/radio_setup.cpp index b273bb736b..ec9207dacc 100644 --- a/radio/src/gui/128x64/radio_setup.cpp +++ b/radio/src/gui/128x64/radio_setup.cpp @@ -529,7 +529,7 @@ void menuRadioSetup(event_t event) break; #endif -#if defined(TELEMETRY_FRSKY) && defined(GPS) +#if defined(GPS) case ITEM_RADIO_SETUP_TIMEZONE: lcdDrawTextAlignedLeft(y, STR_TIMEZONE); lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.timezone, attr|LEFT); diff --git a/radio/src/gui/128x64/view_main.cpp b/radio/src/gui/128x64/view_main.cpp index 653db74b7f..9510b38b12 100644 --- a/radio/src/gui/128x64/view_main.cpp +++ b/radio/src/gui/128x64/view_main.cpp @@ -47,15 +47,12 @@ #define TRIM_LH_POS (TRIM_LH_X-4*FW) #define TRIM_RH_NEG (TRIM_RH_X+1*FW) #define TRIM_RH_POS (TRIM_RH_X-4*FW) -#if defined(TELEMETRY_FRSKY) #define RSSSI_X (30) #define RSSSI_Y (31) #define RSSI_MAX 105 -#endif #define TRIM_LEN 23 -#if defined(TELEMETRY_FRSKY) void drawRSSIGauge() { uint8_t bar = (RSSI_MAX - g_model.rssiAlarms.getWarningRssi()) / 4; @@ -66,7 +63,6 @@ void drawRSSIGauge() } } } -#endif void drawPotsBars() { @@ -276,15 +272,11 @@ void onMainViewMenu(const char *result) POPUP_MENU_ADD_ITEM(STR_RESET_TIMER1); POPUP_MENU_ADD_ITEM(STR_RESET_TIMER2); POPUP_MENU_ADD_ITEM(STR_RESET_TIMER3); -#if defined(TELEMETRY_FRSKY) POPUP_MENU_ADD_ITEM(STR_RESET_TELEMETRY); -#endif } -#if defined(TELEMETRY_FRSKY) else if (result == STR_RESET_TELEMETRY) { telemetryReset(); } -#endif else if (result == STR_RESET_FLIGHT) { flightReset(); } @@ -385,11 +377,7 @@ void menuMainView(event_t event) #endif case EVT_KEY_TELEMETRY: -#if defined(TELEMETRY_FRSKY) chainMenu(menuViewTelemetryFrsky); -#else - chainMenu(menuStatisticsDebug); -#endif killEvents(event); break; @@ -419,12 +407,10 @@ void menuMainView(event_t event) // Trims sliders displayTrims(mode); -#if defined(TELEMETRY_FRSKY) // RSSI gauge if (TELEMETRY_RSSI() > 0) { drawRSSIGauge(); } -#endif } if (view_base < VIEW_INPUTS) { diff --git a/radio/src/gui/212x64/menu_model.cpp b/radio/src/gui/212x64/menu_model.cpp index 94829aee51..11e58a68c2 100644 --- a/radio/src/gui/212x64/menu_model.cpp +++ b/radio/src/gui/212x64/menu_model.cpp @@ -37,7 +37,7 @@ const MenuHandlerFunc menuTabModel[] = { #if defined(LUA_MODEL_SCRIPTS) menuModelCustomScripts, #endif - CASE_FRSKY(menuModelTelemetryFrsky) + menuModelTelemetry, menuModelDisplay }; diff --git a/radio/src/gui/212x64/menus.h b/radio/src/gui/212x64/menus.h index 2bbba412f5..cbbd43fd1f 100644 --- a/radio/src/gui/212x64/menus.h +++ b/radio/src/gui/212x64/menus.h @@ -94,7 +94,7 @@ enum MenuModelIndexes { #if defined(LUA_MODEL_SCRIPTS) MENU_MODEL_CUSTOM_SCRIPTS, #endif - MENU_MODEL_TELEMETRY_FRSKY, + MENU_MODEL_TELEMETRY, MENU_MODEL_DISPLAY, MENU_MODEL_PAGES_COUNT }; @@ -117,7 +117,7 @@ void menuModelGVars(event_t event); void menuModelLogicalSwitches(event_t event); void menuModelSpecialFunctions(event_t event); void menuModelCustomScripts(event_t event); -void menuModelTelemetryFrsky(event_t event); +void menuModelTelemetry(event_t event); void menuModelSensor(event_t event); void menuModelDisplay(event_t event); diff --git a/radio/src/gui/212x64/model_telemetry.cpp b/radio/src/gui/212x64/model_telemetry.cpp index e989411f95..dd82a492d9 100644 --- a/radio/src/gui/212x64/model_telemetry.cpp +++ b/radio/src/gui/212x64/model_telemetry.cpp @@ -99,9 +99,9 @@ void onDeleteAllSensorsConfirm(const char * result) } } -void menuModelTelemetryFrsky(event_t event) +void menuModelTelemetry(event_t event) { - MENU(STR_MENUTELEMETRY, menuTabModel, MENU_MODEL_TELEMETRY_FRSKY, HEADER_LINE+ITEM_TELEMETRY_MAX, { HEADER_LINE_COLUMNS TELEMETRY_TYPE_ROWS RSSI_ROWS SENSORS_ROWS VARIO_ROWS }); + MENU(STR_MENUTELEMETRY, menuTabModel, MENU_MODEL_TELEMETRY, HEADER_LINE+ITEM_TELEMETRY_MAX, { HEADER_LINE_COLUMNS TELEMETRY_TYPE_ROWS RSSI_ROWS SENSORS_ROWS VARIO_ROWS }); uint8_t sub = menuVerticalPosition - HEADER_LINE; diff --git a/radio/src/gui/212x64/radio_setup.cpp b/radio/src/gui/212x64/radio_setup.cpp index 27fe53f2be..9aef43bb90 100644 --- a/radio/src/gui/212x64/radio_setup.cpp +++ b/radio/src/gui/212x64/radio_setup.cpp @@ -484,7 +484,7 @@ void menuRadioSetup(event_t event) break; #endif -#if defined(TELEMETRY_FRSKY) && defined(GPS) +#if defined(GPS) case ITEM_RADIO_SETUP_LABEL_GPS: lcdDrawTextAlignedLeft(y, STR_GPS); break; diff --git a/radio/src/gui/480x272/menu_model.cpp b/radio/src/gui/480x272/menu_model.cpp index e03cf34a30..93a7710e54 100644 --- a/radio/src/gui/480x272/menu_model.cpp +++ b/radio/src/gui/480x272/menu_model.cpp @@ -36,7 +36,7 @@ const MenuHandlerFunc menuTabModel[] = { #if defined(LUA_MODEL_SCRIPTS) menuModelCustomScripts, #endif - CASE_FRSKY(menuModelTelemetryFrsky) + menuModelTelemetry }; void editCurveRef(coord_t x, coord_t y, CurveRef & curve, event_t event, LcdFlags attr); diff --git a/radio/src/gui/480x272/menus.h b/radio/src/gui/480x272/menus.h index ff97b08d1d..6bdabe2e4e 100644 --- a/radio/src/gui/480x272/menus.h +++ b/radio/src/gui/480x272/menus.h @@ -123,7 +123,7 @@ enum EnumTabModel { #if defined(LUA_MODEL_SCRIPTS) MENU_MODEL_CUSTOM_SCRIPTS, #endif - CASE_FRSKY(MENU_MODEL_TELEMETRY_FRSKY) + MENU_MODEL_TELEMETRY, MENU_MODEL_PAGES_COUNT }; @@ -177,7 +177,7 @@ bool menuModelGVars(event_t event); bool menuModelLogicalSwitches(event_t event); bool menuModelSpecialFunctions(event_t event); bool menuModelCustomScripts(event_t event); -bool menuModelTelemetryFrsky(event_t event); +bool menuModelTelemetry(event_t event); bool menuModelSensor(event_t event); bool menuModelExpoOne(event_t event); bool menuModelModuleOptions(event_t event); diff --git a/radio/src/gui/480x272/model_telemetry.cpp b/radio/src/gui/480x272/model_telemetry.cpp index 12e6b4cdfc..5cd57b1dc2 100644 --- a/radio/src/gui/480x272/model_telemetry.cpp +++ b/radio/src/gui/480x272/model_telemetry.cpp @@ -103,9 +103,9 @@ void onDeleteAllSensorsConfirm(const char * result) } } -bool menuModelTelemetryFrsky(event_t event) +bool menuModelTelemetry(event_t event) { - MENU(STR_MENUTELEMETRY, MODEL_ICONS, menuTabModel, MENU_MODEL_TELEMETRY_FRSKY, ITEM_TELEMETRY_MAX, { TELEMETRY_TYPE_ROWS RSSI_ROWS SENSORS_ROWS VARIO_ROWS }); + MENU(STR_MENUTELEMETRY, MODEL_ICONS, menuTabModel, MENU_MODEL_TELEMETRY, ITEM_TELEMETRY_MAX, { TELEMETRY_TYPE_ROWS RSSI_ROWS SENSORS_ROWS VARIO_ROWS }); for (uint8_t i=0; i= MIXSRC_FIRST_TELEM && source <= MIXSRC_LAST_TELEM) { div_t qr = div(source - MIXSRC_FIRST_TELEM, 3); result = isTelemetryFieldComparisonAvailable(qr.quot); } -#endif return result; } diff --git a/radio/src/io/frsky_sport.h b/radio/src/io/frsky_sport.h index dd648a8116..10a72af96d 100644 --- a/radio/src/io/frsky_sport.h +++ b/radio/src/io/frsky_sport.h @@ -23,7 +23,6 @@ #include "dataconstants.h" -#if defined(TELEMETRY_FRSKY_SPORT) PACK(union SportTelemetryPacket { struct { @@ -34,7 +33,6 @@ PACK(union SportTelemetryPacket }; uint8_t raw[8]; }); -#endif #if defined(STM32) bool isBootloader(const char * filename); diff --git a/radio/src/logs.cpp b/radio/src/logs.cpp index 822f5e7b4f..2ada6d7fd8 100644 --- a/radio/src/logs.cpp +++ b/radio/src/logs.cpp @@ -134,7 +134,6 @@ void writeHeader() f_puts("Time,", &g_oLogFile); #endif -#if defined(TELEMETRY_FRSKY) char label[TELEM_LABEL_LEN+7]; for (int i=0; ishow(); // Otherwise the main window gets centred across my two monitors, split down the middle. #endif -#if defined(TELEMETRY_FRSKY) && !defined(TELEMETRY_FRSKY_SPORT) - telemetryStreaming = 1; -#endif printf("Model size = %d\n", (int)sizeof(g_model)); diff --git a/radio/src/switches.cpp b/radio/src/switches.cpp index 3e76e3304a..8e62a3212b 100644 --- a/radio/src/switches.cpp +++ b/radio/src/switches.cpp @@ -285,7 +285,6 @@ bool getLogicalSwitch(uint8_t idx) } else { mixsrc_t v1 = ls->v1; -#if defined(TELEMETRY_FRSKY) // Telemetry if (v1 >= MIXSRC_FIRST_TELEM) { if (!TELEMETRY_STREAMING() || IS_FAI_FORBIDDEN(v1-1)) { @@ -303,17 +302,6 @@ bool getLogicalSwitch(uint8_t idx) else { y = calc100toRESX(ls->v2); } -#else - if (v1 >= MIXSRC_FIRST_TELEM) { - y = (int16_t)3 * (128+ls->v2); // it's a Timer - } - else if (v1 >= MIXSRC_GVAR1) { - y = ls->v2; // it's a GVAR - } - else { - y = calc100toRESX(ls->v2); - } -#endif switch (ls->func) { case LS_FUNC_VEQUAL: @@ -370,9 +358,7 @@ bool getLogicalSwitch(uint8_t idx) } } -#if defined(TELEMETRY_FRSKY) DurationAndDelayProcessing: -#endif if (ls->delay || ls->duration) { LogicalSwitchContext &context = lswFm[mixerCurrentFlightMode].lsw[idx]; diff --git a/radio/src/targets/common/arm/CMakeLists.txt b/radio/src/targets/common/arm/CMakeLists.txt index 6414685049..34f212475b 100644 --- a/radio/src/targets/common/arm/CMakeLists.txt +++ b/radio/src/targets/common/arm/CMakeLists.txt @@ -169,10 +169,10 @@ if(CROSSFIRE) endif() add_definitions(-DCPUARM) -add_definitions(-DTELEMETRY_FRSKY -DTELEMETRY_FRSKY_SPORT -DGPS) - +add_definitions(-DGPS) add_definitions(-DBOLD_FONT -DBATTGRAPH -DTHRTRACE) add_definitions(-DREQUIRED_SDCARD_VERSION="${SDCARD_VERSION}") + include_directories(${COOS_DIR} ${COOS_DIR}/kernel ${COOS_DIR}/portable) foreach(LANGUAGE ${TTS_LANGUAGES}) string(TOLOWER ${LANGUAGE} lang_lower) diff --git a/radio/src/targets/simu/opentxsimulator.cpp b/radio/src/targets/simu/opentxsimulator.cpp index e30e6e2ec5..bfdaae1fdb 100644 --- a/radio/src/targets/simu/opentxsimulator.cpp +++ b/radio/src/targets/simu/opentxsimulator.cpp @@ -316,17 +316,12 @@ void OpenTxSimulator::setTrainerTimeout(uint16_t ms) void OpenTxSimulator::sendTelemetry(const QByteArray data) { -#if defined(TELEMETRY_FRSKY_SPORT) //OTXS_DBG << data; sportProcessTelemetryPacket((uint8_t *)data.constData()); -#else - Q_UNUSED(data) -#endif } uint8_t OpenTxSimulator::getSensorInstance(uint16_t id, uint8_t defaultValue) { -#if defined(TELEMETRY_FRSKY_SPORT) for (int i = 0; i < MAX_TELEMETRY_SENSORS; i++) { if (isTelemetryFieldAvailable(i)) { TelemetrySensor * sensor = &g_model.telemetrySensors[i]; @@ -335,15 +330,11 @@ uint8_t OpenTxSimulator::getSensorInstance(uint16_t id, uint8_t defaultValue) } } } -#else - Q_UNUSED(id) -#endif return defaultValue; } uint16_t OpenTxSimulator::getSensorRatio(uint16_t id) { -#if defined(TELEMETRY_FRSKY_SPORT) for (int i = 0; i < MAX_TELEMETRY_SENSORS; i++) { if (isTelemetryFieldAvailable(i)) { TelemetrySensor * sensor = &g_model.telemetrySensors[i]; @@ -352,9 +343,6 @@ uint16_t OpenTxSimulator::getSensorRatio(uint16_t id) } } } -#else - Q_UNUSED(id) -#endif return 0; } @@ -378,9 +366,7 @@ const int OpenTxSimulator::getCapability(Capability cap) break; case CAP_TELEM_FRSKY_SPORT : - #ifdef TELEMETRY_FRSKY_SPORT ret = 1; - #endif break; } return ret; diff --git a/radio/src/targets/sky9x/aux_serial_driver.cpp b/radio/src/targets/sky9x/aux_serial_driver.cpp index 9d8f1978c1..e0b41fc6a7 100644 --- a/radio/src/targets/sky9x/aux_serial_driver.cpp +++ b/radio/src/targets/sky9x/aux_serial_driver.cpp @@ -109,7 +109,6 @@ extern "C" void UART0_IRQHandler() #define SECOND_UART_Configure(...) #endif -#if defined(TELEMETRY_FRSKY) void auxSerialTelemetryInit(unsigned int /*protocol*/) { SECOND_UART_Configure(FRSKY_D_BAUDRATE, Master_frequency); @@ -119,7 +118,6 @@ bool telemetrySecondPortReceive(uint8_t & data) { return auxSerialRxFifo.pop(data); } -#endif #if defined(DEBUG) && !defined(SIMU) void serialPrintf(const char*, ... ) {} diff --git a/radio/src/tasks.cpp b/radio/src/tasks.cpp index 449d61db58..7c3895598c 100644 --- a/radio/src/tasks.cpp +++ b/radio/src/tasks.cpp @@ -180,11 +180,9 @@ TASK_FUNCTION(mixerTask) } #endif -#if defined(TELEMETRY_FRSKY) DEBUG_TIMER_START(debugTimerTelemetryWakeup); telemetryWakeup(); DEBUG_TIMER_STOP(debugTimerTelemetryWakeup); -#endif if (heartbeat == HEART_WDT_CHECK) { wdt_reset(); diff --git a/radio/src/telemetry/frsky.cpp b/radio/src/telemetry/frsky.cpp index 6ae34863a3..0bf13e4076 100644 --- a/radio/src/telemetry/frsky.cpp +++ b/radio/src/telemetry/frsky.cpp @@ -100,13 +100,11 @@ bool pushFrskyTelemetryData(uint8_t data) } // switch -#if defined(TELEMETRY_FRSKY_SPORT) if (IS_FRSKY_SPORT_PROTOCOL() && telemetryRxBufferCount >= FRSKY_SPORT_PACKET_SIZE) { // end of frame detected dataState = STATE_DATA_IDLE; return true; } -#endif return false; } diff --git a/radio/src/telemetry/telemetry.h b/radio/src/telemetry/telemetry.h index 2c9a8f6927..d2f6dadc73 100644 --- a/radio/src/telemetry/telemetry.h +++ b/radio/src/telemetry/telemetry.h @@ -21,11 +21,7 @@ #ifndef _TELEMETRY_H_ #define _TELEMETRY_H_ -#if defined(TELEMETRY_FRSKY) - // FrSky Telemetry - #include "frsky.h" -#endif - +#include "frsky.h" #include "crossfire.h" #if defined(MULTIMODULE) #include "spektrum.h" diff --git a/radio/src/telemetry/telemetry_sensors.cpp b/radio/src/telemetry/telemetry_sensors.cpp index 8e4e728296..2b02b68456 100644 --- a/radio/src/telemetry/telemetry_sensors.cpp +++ b/radio/src/telemetry/telemetry_sensors.cpp @@ -501,16 +501,12 @@ int setTelemetryValue(TelemetryProtocol protocol, uint16_t id, uint8_t subId, ui int index = availableTelemetryIndex(); if (index >= 0) { switch (protocol) { -#if defined(TELEMETRY_FRSKY_SPORT) case TELEM_PROTO_FRSKY_SPORT: frskySportSetDefault(index, id, subId, instance); break; -#endif -#if defined(TELEMETRY_FRSKY) case TELEM_PROTO_FRSKY_D: frskyDSetDefault(index, id); break; -#endif #if defined(CROSSFIRE) case TELEM_PROTO_CROSSFIRE: crossfireSetDefault(index, id, instance); diff --git a/radio/src/tests/frsky.cpp b/radio/src/tests/frsky.cpp index 27c4cb0f94..e33668265c 100644 --- a/radio/src/tests/frsky.cpp +++ b/radio/src/tests/frsky.cpp @@ -21,17 +21,10 @@ #include "gtests.h" void frskyDProcessPacket(const uint8_t *packet); - -#if defined(TELEMETRY_FRSKY_SPORT) bool checkSportPacket(const uint8_t *packet); void sportProcessTelemetryPacket(const uint8_t * packet); bool checkSportPacket(const uint8_t *packet); -void frskyCalculateCellStats(void); -void displayVoltagesScreen(); -#endif - -#if defined(TELEMETRY_FRSKY) TEST(FrSky, TelemetryValueWithMinAveraging) { /* @@ -147,9 +140,6 @@ TEST(FrSky, Gps) EXPECT_EQ(telemetryItems[0].gps.longitude, 45341666); } -#endif // defined(TELEMETRY_FRSKY) - -#if defined(TELEMETRY_FRSKY_SPORT) TEST(FrSkySPORT, checkCrc) { // Packet downstream @@ -487,4 +477,3 @@ TEST(FrSkySPORT, frskyCurrent) EXPECT_EQ(telemetryItems[0].valueMax, 505); } -#endif //#if defined(TELEMETRY_FRSKY_SPORT) diff --git a/radio/src/tests/gtests.h b/radio/src/tests/gtests.h index 5be8b49bee..596b71283f 100644 --- a/radio/src/tests/gtests.h +++ b/radio/src/tests/gtests.h @@ -80,13 +80,11 @@ inline void MIXER_RESET() inline void TELEMETRY_RESET() { -#if defined(TELEMETRY_FRSKY) telemetryData.clear(); telemetryData.rssi.set(100); for (int i=0; i= 212 #define TR_FSW_RESET_TIMERS "Stopky1\0 ""Stopky2\0 ""Stopky3\0 " diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index 4984b8316a..c483aaf0a2 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -261,11 +261,7 @@ #define LEN_VFSWRESET TR("\004", "\011") -#if defined(TELEMETRY_FRSKY) - #define TR_FSW_RESET_TELEM TR("Telm", "Telemetrie") -#else - #define TR_FSW_RESET_TELEM -#endif +#define TR_FSW_RESET_TELEM TR("Telm", "Telemetrie") #if LCD_W >= 212 #define TR_FSW_RESET_TIMERS "Timer 1\0 ""Timer 2\0 ""Timer 3\0 " diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index fcc500307b..0442da53c3 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -257,15 +257,11 @@ #define TR_SF_SCREENSHOT "Screenshot" #define TR_SF_RESERVE "[reserve]\0" -#define TR_VFSWFUNC TR_SF_SAFETY "Trainer\0 ""Inst. Trim""Reset\0 ""Set \0 " TR_ADJUST_GVAR "Volume\0 " "SetFailsfe" "RangeCheck" "ModuleBind" TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_SF_RESERVE TR_SF_PLAY_SCRIPT TR_SF_RESERVE TR_SF_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "Backlight\0" TR_SF_SCREENSHOT TR_SF_TEST +#define TR_VFSWFUNC TR_SF_SAFETY "Trainer\0 ""Inst. Trim""Reset\0 ""Set \0 " TR_ADJUST_GVAR "Volume\0 " "SetFailsfe" "RangeCheck" "ModuleBind" TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_SF_RESERVE TR_SF_PLAY_SCRIPT TR_SF_RESERVE TR_SF_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "Backlight\0" TR_SF_SCREENSHOT TR_SF_TEST #define LEN_VFSWRESET TR("\004", "\011") -#if defined(TELEMETRY_FRSKY) - #define TR_FSW_RESET_TELEM TR("Telm", "Telemetry") -#else - #define TR_FSW_RESET_TELEM -#endif +#define TR_FSW_RESET_TELEM TR("Telm", "Telemetry") #if LCD_W >= 212 #define TR_FSW_RESET_TIMERS "Timer 1\0 ""Timer 2\0 ""Timer 3\0 " diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 269a19ab51..22864e0b7c 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -259,11 +259,7 @@ #define LEN_VFSWRESET TR("\004", "\011") -#if defined(TELEMETRY_FRSKY) - #define TR_FSW_RESET_TELEM TR("Telm", "Telemetry") -#else - #define TR_FSW_RESET_TELEM -#endif +#define TR_FSW_RESET_TELEM TR("Telm", "Telemetry") #if defined(PCBTARANIS) #define TR_FSW_RESET_TIMERS "Timer 1\0 ""Timer 2\0 ""Timer 3\0 " diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 4c2565282a..b4d2948f04 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -259,11 +259,7 @@ #define LEN_VFSWRESET TR("\004", "\011") -#if defined(TELEMETRY_FRSKY) - #define TR_FSW_RESET_TELEM TR("Telm", "Telemetry") -#else - #define TR_FSW_RESET_TELEM -#endif +#define TR_FSW_RESET_TELEM TR("Telm", "Telemetry") #if defined(PCBTARANIS) #define TR_FSW_RESET_TIMERS "Timer 1\0 ""Timer 2\0 ""Timer 3\0 " diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 1c232036ff..68c4c739f9 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -261,11 +261,7 @@ #define LEN_VFSWRESET TR("\004", "\012") -#if defined(TELEMETRY_FRSKY) - #define TR_FSW_RESET_TELEM TR("Télm", "Télémétrie") -#else - #define TR_FSW_RESET_TELEM -#endif +#define TR_FSW_RESET_TELEM TR("Télm", "Télémétrie") #if LCD_W >= 212 #define TR_FSW_RESET_TIMERS "Chrono 1\0 ""Chrono 2\0 ""Chrono 3\0 " diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 73639d8e21..e529780f5f 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -261,11 +261,7 @@ #define LEN_VFSWRESET TR("\004", "\011") -#if defined(TELEMETRY_FRSKY) - #define TR_FSW_RESET_TELEM TR("Telm", "Telemetr.") -#else - #define TR_FSW_RESET_TELEM -#endif +#define TR_FSW_RESET_TELEM TR("Telm", "Telemetr.") #if LCD_W >= 212 #define TR_FSW_RESET_TIMERS "Timer 1\0 ""Timer 2\0 ""Timer 3\0 " diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index ed6394015b..4546754e78 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -262,11 +262,7 @@ #define LEN_VFSWRESET TR("\004", "\012") -#if defined(TELEMETRY_FRSKY) - #define TR_FSW_RESET_TELEM TR("Telm", "Telemetrie") -#else - #define TR_FSW_RESET_TELEM -#endif +#define TR_FSW_RESET_TELEM TR("Telm", "Telemetrie") #if LCD_W >= 212 #define TR_FSW_RESET_TIMERS "Timer 1\0 ""Timer 2\0 ""Timer 3\0 " diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index dcdd5f3ea2..f89f0fdca2 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -262,11 +262,7 @@ #define LEN_VFSWRESET TR("\004", "\011") /*9 decimal*/ -#if defined(TELEMETRY_FRSKY) - #define TR_FSW_RESET_TELEM TR("Telm", "Telemetra") -#else - #define TR_FSW_RESET_TELEM -#endif +#define TR_FSW_RESET_TELEM TR("Telm", "Telemetra") #if LCD_W >= 212 #define TR_FSW_RESET_TIMERS "Timer 1\0 ""Timer 2\0 ""Timer 3\0 " diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 734c11a82e..dba497fb6b 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -258,11 +258,7 @@ #define LEN_VFSWRESET TR("\004", "\011") -#if defined(TELEMETRY_FRSKY) - #define TR_FSW_RESET_TELEM TR("Telm", "Telemetry") -#else - #define TR_FSW_RESET_TELEM -#endif +#define TR_FSW_RESET_TELEM TR("Telm", "Telemetry") #if defined(PCBTARANIS) #define TR_FSW_RESET_TIMERS "Timer 1\0 ""Timer 2\0 ""Timer 3\0 " diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index f2f76dce6d..13667aacb9 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -259,11 +259,7 @@ #define LEN_VFSWRESET TR("\004", "\011") -#if defined(TELEMETRY_FRSKY) - #define TR_FSW_RESET_TELEM TR("Telm", "Telemetry") -#else - #define TR_FSW_RESET_TELEM -#endif +#define TR_FSW_RESET_TELEM TR("Telm", "Telemetry") #if defined(PCBTARANIS) #define TR_FSW_RESET_TIMERS "Timer 1\0 ""Timer 2\0 ""Timer 3\0 "