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
@@ -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);
+2 -2
View File
@@ -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);
+2 -2
View File
@@ -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<NUM_BODY_LINES; i++) {
coord_t y = MENU_CONTENT_TOP + i*FH;