More unneeded definitions removed

This commit is contained in:
Bertrand Songis
2019-08-20 18:04:19 +02:00
parent 487a76e8ba
commit 2ce17f3b68
45 changed files with 37 additions and 197 deletions
+1 -1
View File
@@ -37,7 +37,7 @@ const MenuHandlerFunc menuTabModel[] = {
#if defined(LUA_MODEL_SCRIPTS)
menuModelCustomScripts,
#endif
CASE_FRSKY(menuModelTelemetryFrsky)
menuModelTelemetry,
menuModelDisplay
};
+2 -2
View File
@@ -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);
+2 -2
View File
@@ -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;
+1 -1
View File
@@ -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;