diff --git a/radio/src/gui/view_telemetry.cpp b/radio/src/gui/view_telemetry.cpp index 983e3d76f..ae273dae8 100644 --- a/radio/src/gui/view_telemetry.cpp +++ b/radio/src/gui/view_telemetry.cpp @@ -47,22 +47,6 @@ bar_threshold_t barsThresholds[THLD_MAX]; #endif -enum FrskyViews { - CASE_LUA(TELEMETRY_LUA_SCREEN_1) - CASE_LUA(TELEMETRY_LUA_SCREEN_2) - CASE_LUA(TELEMETRY_LUA_SCREEN_3) - CASE_LUA(TELEMETRY_LUA_SCREEN_4) - CASE_LUA(TELEMETRY_LUA_SCREEN_5) - CASE_LUA(TELEMETRY_LUA_SCREEN_6) - CASE_LUA(TELEMETRY_LUA_SCREEN_7) - TELEMETRY_CUSTOM_SCREEN_1, - TELEMETRY_CUSTOM_SCREEN_2, - CASE_CPUARM(TELEMETRY_CUSTOM_SCREEN_3) - TELEMETRY_VOLTAGES_SCREEN, - TELEMETRY_AFTER_FLIGHT_SCREEN, - FRSKY_VIEW_MAX = TELEMETRY_AFTER_FLIGHT_SCREEN -}; - uint8_t s_frsky_view = 0; #if LCD_W >= 212 diff --git a/radio/src/lua.cpp b/radio/src/lua.cpp index e58ce95c0..97772780a 100644 --- a/radio/src/lua.cpp +++ b/radio/src/lua.cpp @@ -1293,8 +1293,16 @@ void getTelemetryScriptPath(char * path, uint8_t index) { strcpy(path, SCRIPTS_PATH "/"); char * curs = strcat_modelname(path+sizeof(SCRIPTS_PATH), g_eeGeneral.currModel); - strcpy(curs, "/telemX.lua"); - curs[6] = '0' + index; + if (index == TELEMETRY_VOLTAGES_SCREEN) { + strcpy(curs, "/telempw.lua"); + } + else if (index == TELEMETRY_AFTER_FLIGHT_SCREEN) { + strcpy(curs, "/telemaf.lua"); + } + else { + strcpy(curs, "/telemX.lua"); + curs[6] = '1' + index; + } } bool luaLoadTelemetryScript(uint8_t index) @@ -1319,7 +1327,7 @@ bool isTelemetryScriptAvailable(uint8_t index) { for (int i=0; i= 212 diff --git a/radio/src/translations.h b/radio/src/translations.h index e7aba07c4..ccf5dc138 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -626,6 +626,7 @@ extern const pm_char STR_FLASH_BOOTLOADER[]; extern const pm_char STR_WRITING[]; extern const pm_char STR_CONFIRM_FORMAT[]; extern const pm_char STR_EEBACKUP[]; +extern const pm_char STR_TOO_MANY_LUA_SCRIPTS[]; extern const pm_char STR_BLCOLOR[]; #if defined(VOICE) && defined(CPUARM) diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 1f3bd4498..98070d55e 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -814,6 +814,7 @@ #define TR_INPUTS "Vstupy" #define TR_OUTPUTS "Výstupy" #define TR_EEBACKUP "\010[dlouze ENTER] zálohuje EEPROM" +#define TR_TO_MANY_LUA_SCRIPTS "Too many Lua scripts!" #if defined(MAVLINK) #define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index 0c7536e3c..96e5a1dcf 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -814,6 +814,7 @@ #define TR_INPUTS "Inputs" #define TR_OUTPUTS "Outputs" #define TR_EEBACKUP "\004[ENTER Long] to backup the EEPROM" +#define TR_TO_MANY_LUA_SCRIPTS "Too many Lua scripts!" #if defined(MAVLINK) #define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 0b440638e..addcf859a 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -814,6 +814,7 @@ #define TR_INPUTS "Inputs" #define TR_OUTPUTS "Outputs" #define TR_EEBACKUP "\004[ENTER Long] to backup the EEPROM" +#define TR_TO_MANY_LUA_SCRIPTS "Too many Lua scripts!" #if defined(MAVLINK) #define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 950d02ad6..419657f4d 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -814,6 +814,7 @@ #define TR_INPUTS "Inputs" #define TR_OUTPUTS "Outputs" #define TR_EEBACKUP "\004[ENTER Long] to backup the EEPROM" +#define TR_TO_MANY_LUA_SCRIPTS "Too many Lua scripts!" #if defined(MAVLINK) #define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index a76285a7c..272a1f7c5 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -814,6 +814,7 @@ #define TR_INPUTS "Inputs" #define TR_OUTPUTS "Outputs" #define TR_EEBACKUP "\004[ENTER Long] to backup the EEPROM" +#define TR_TO_MANY_LUA_SCRIPTS "Too many Lua scripts!" #if defined(MAVLINK) #define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 3f6553139..7f280f025 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -814,6 +814,7 @@ #define TR_INPUTS "Entrées" #define TR_OUTPUTS "Sorties" #define TR_EEBACKUP "\004[ENTER Long]: Sauvegarder l'EEPROM" +#define TR_TO_MANY_LUA_SCRIPTS "Too many Lua scripts!" #if defined(MAVLINK) #define TR_MAVLINK_RC_RSSI_SCALE_LABEL "RSSI Max" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index eac7abfcd..1539e867b 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -814,6 +814,7 @@ #define TR_INPUTS "Ingresso" #define TR_OUTPUTS "Uscita" #define TR_EEBACKUP "\004[ENTER Lungo] per copiare la EEPROM" +#define TR_TO_MANY_LUA_SCRIPTS "Too many Lua scripts!" #if defined(MAVLINK) #define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 26bb3b615..ba8a35b65 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -814,6 +814,7 @@ #define TR_INPUTS "Wejścia" #define TR_OUTPUTS "Wyjścia" #define TR_EEBACKUP "\004[ENTER Long] to backup the EEPROM" +#define TR_TO_MANY_LUA_SCRIPTS "Too many Lua scripts!" #if defined(MAVLINK) #define TR_MAVLINK_RC_RSSI_SCALE_LABEL "MaksRSSI" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 705cfe081..b96473313 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -814,6 +814,7 @@ #define TR_INPUTS "Inputs" #define TR_OUTPUTS "Outputs" #define TR_EEBACKUP "\004[ENTER Long] to backup the EEPROM" +#define TR_TO_MANY_LUA_SCRIPTS "Too many Lua scripts!" #if defined(MAVLINK) #define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index 76710b83b..7b66737f8 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -814,6 +814,7 @@ #define TR_INPUTS "Input" #define TR_OUTPUTS "Outputs" #define TR_EEBACKUP "\004[ENTER Lång] säkerhetskopiera EEPROM" +#define TR_TO_MANY_LUA_SCRIPTS "Too many Lua scripts!" #if defined(MAVLINK) #define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI"