piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Some compile fixes

Browse Source
This commit is contained in:
3djc
2021-01-12 19:37:12 +01:00
parent 8207413747
commit ebdff7a3bd
13 changed files with 23 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/common/stdlcd/radio_sdmanager.cpp
+2 -2
View File
@@ -227,8 +227,8 @@ void onSdManagerMenu(const char * result)
#if defined(INTERNAL_MODULE_MULTI)
else if (result == STR_FLASH_INTERNAL_MULTI) {
getSelectionFullPath(lfn);
MultiDeviceFirmwareUpdate device(INTERNAL_MODULE, MULTI_TYPE_MULTIMODULE);
device.flashFirmware(lfn, drawProgressScreen);
MultiDeviceFirmwareUpdate device(INTERNAL_MODULE);
device.flashFirmware(lfn, MULTI_TYPE_MULTIMODULE, drawProgressScreen);
}
#endif
else if (result == STR_FLASH_EXTERNAL_MULTI) {
radio/src/opentx.cpp
-6
View File
@@ -373,17 +373,11 @@ void defaultInputs()
expo->chn = i;
expo->weight = 100;
expo->mode = 3; // TODO constant
#if defined(TRANSLATIONS_CZ)
for (int c = 0; c < 4; c++) {
g_model.inputNames[i][c] = STR_INPUTNAMES[1 + 4 * stick_index + c];
}
#else
for (int c = 0; c < 3; c++) {
g_model.inputNames[i][c] = STR_VSRCRAW[2 + 4 * stick_index + c];
}
#if LEN_INPUT_NAME > 3
g_model.inputNames[i][3] = '\0';
#endif
#endif
}
storageDirty(EE_MODEL);
radio/src/translations.cpp
-4
View File
@@ -95,10 +95,6 @@ ISTR(VOUTPUT_TYPE);
ISTR(VSWASHTYPE);
#endif
#if defined(TRANSLATIONS_CZ)
ISTR(INPUTNAMES);
#endif
#if defined(MULTIMODULE)
ISTR(MULTI_PROTOCOLS);
ISTR(MULTI_POWER);
radio/src/translations/cz.h.txt
+4 -3
View File
@@ -308,9 +308,6 @@
#define LEN_VSWITCHES "\003"
#define LEN_VSRCRAW "\004"
#define LEN_INPUTNAMES "\004"
#define TR_INPUTNAMES "Sme\0""Vys\0""Pln\0""Kri\0"
#define TR_STICKS_VSRCRAW STR_CHAR_STICK "Smě" STR_CHAR_STICK "Výš" STR_CHAR_STICK "Pln" STR_CHAR_STICK "Kři"
#if defined(PCBHORUS)
@@ -920,6 +917,8 @@
#define TR_COPY "Kopírovat"
#define TR_MOVE "Přesunout"
#define TR_PASTE "Vložit"
#define TR_PASTE_AFTER "Paste after"
#define TR_PASTE_BEFORE "Paste before"
#define TR_DELETE "Odstranit"
#define TR_INSERT "Přidat"
#define TR_RESET_FLIGHT "Let"
@@ -973,6 +972,8 @@
#define TR_TELEMETRY_TYPE TR("Typ", "Typ telemetrie")
#define TR_TELEMETRY_SENSORS "Senzory"
#define TR_VALUE "Hodnota"
#define TR_REPEAT "Repeat"
#define TR_ENABLE "Enable"
#define TR_TOPLCDTIMER "Stopky horního LCD"
#define TR_UNIT "Jednotky"
#define TR_TELEMETRY_NEWSENSOR INDENT "Přidat senzor ručně"
radio/src/translations/de.h.txt
+3 -2
View File
@@ -432,7 +432,7 @@
#define TR_COPYINGMODEL "Kopiere Modell"
#define TR_MOVINGMODEL "Schiebe Modell"
#define TR_LOADINGMODEL "Lade Modell..."
#define STR_NAME "Name"
#define TR_NAME "Name"
#define TR_MODELNAME "Modellname"
#define TR_PHASENAME "Phase-Name"
#define TR_MIXNAME "Mix-Name"
@@ -570,7 +570,6 @@
#define TR_MODESRC " Modus\003% Quelle"
#define TR_MULTIPLIER "Multiplik."
#define TR_CAL "Kal."
#define TR_CALIBRATION "Calibration"
#define TR_VTRIM "Trim - +"
#define TR_BG "BG:"
#define TR_CALIB_DONE "Calibration completed"
@@ -982,6 +981,8 @@
#define TR_TELEMETRY_TYPE TR("Typ", "Telemetrietyp")
#define TR_TELEMETRY_SENSORS "Sensoren"
#define TR_VALUE "Wert"
#define TR_REPEAT "Repeat"
#define TR_ENABLE "Enable"
#define TR_TOPLCDTIMER "Top LCD Timer"
#define TR_UNIT "Einheit"
#define TR_TELEMETRY_NEWSENSOR INDENT "Sensor hinzufügen ..."
radio/src/translations/es.h.txt
+7 -6
View File
@@ -430,7 +430,7 @@
#define TR_COPYINGMODEL "Copiando modelo.."
#define TR_MOVINGMODEL "Moviendo modelo..."
#define TR_LOADINGMODEL "Cargando modelo..."
#define STR_NAME "Nombre"
#define TR_NAME "Nombre"
#define TR_MODELNAME TR("Nom. modelo", "Nombre modelo")
#define TR_PHASENAME "Nombre fase "
#define TR_MIXNAME TR("Nom. mezcla", "Nombre mezcla")
@@ -550,7 +550,7 @@
#define TR_SPLASHSCREEN "Pantalla inicio"
#define TR_PWR_ON_DELAY TR("Atraso On", "Atraso encendido")
#define TR_PWR_OFF_DELAY TR("Atraso Off", "Atraso apagado")
#define TR_THROTTLEWARNING TR("Aviso-A", INDENT "Aviso acelerador")
#define TR_THROTTLE_WARNING TR("Aviso-A", INDENT "Aviso acelerador")
#define TR_SWITCHWARNING TR("Aviso-I", INDENT "Aviso interruptor")
#define TR_POTWARNINGSTATE TR(INDENT "Pot&Slid.", INDENT "Pots & sliders")
#define TR_SLIDERWARNING TR(INDENT "Pos. slid.", INDENT "Posiciones slider")
@@ -567,10 +567,9 @@
#define TR_MODESRC "Modo\006% Fuente"
#define TR_MULTIPLIER "Multiplicar"
#define TR_CAL "Cal"
#define TR_CALIBRATION "Calibration"
#define TR_VTRIM "Trim- +"
#define TR_BG "BG:"
#define TR_CALIB_DONE "Calibration completed"
#define TR_CALIB_DONE "Calibration completed"
#if defined(PCBHORUS)
#define TR_MENUTOSTART "Presiona [Enter] para empezar"
#define TR_SETMIDPOINT "Centra sticks/pots/sliders y presiona [Enter]"
@@ -629,6 +628,7 @@
#define TR_CHANNELS2FAILSAFE "Canales=>Failsafe"
#define TR_CHANNEL2FAILSAFE "Canal=>Failsafe"
#define TR_MENUMODELSEL TR("MODELOS", "SELECCIÓN MODELO")
#define TR_MENU_MODEL_SETUP TR("SETUP", "MODEL SETUP")
#define TR_MENUSETUP TR("CONFIG. MODELO", "CONFIGURACIÓN MODELO")
#define TR_MENUFLIGHTMODE "MODO DE VUELO"
#define TR_MENUFLIGHTMODES "MODOS DE VUELO"
@@ -703,9 +703,10 @@
#define TR_SYNCMENU "Sync " TR_ENTER
#define TR_LIMIT INDENT"Límite"
#define TR_MINRSSI "Min Rssi"
#define TR_FLYSKY_TELEMETRY TR("FlySky RSSI #", "Use FlySky RSSI value without rescalling")
#define TR_LATITUDE "Latitud"
#define TR_LONGITUDE "Longitud"
#define TR_GPSCOORD TR("Coords GPS", INDENT "Formato coordenadas")
#define TR_GPS_COORDS_FORMAT TR("Coords GPS", INDENT "Formato coordenadas")
#define TR_VARIO TR("Vario", "Variómetro")
#define TR_PITCH_AT_ZERO INDENT "Pitch en cero"
#define TR_PITCH_AT_MAX INDENT "Pitch en máx"
@@ -775,7 +776,7 @@
#define TR_EEPROMWARN "EEPROM"
#define TR_STORAGE_WARNING "ALMAC."
#define TR_EEPROM_CONVERTING "Convirtiendo EEPROM"
#define TR_THROTTLEWARN TR("ACELERAD.", "ACELERADOR")
#define TR_THROTTLE_UPPERCASE TR("ACELERAD.", "ACELERADOR")
#define TR_ALARMSWARN "ALARMAS"
#define TR_SWITCHWARN TR("INTERRUP.", "INTERRUPTOR")
#define TR_FAILSAFEWARN "FAILSAFE"
radio/src/translations/fi.h.txt
+1 -2
View File
@@ -440,7 +440,7 @@
#define TR_COPYINGMODEL "Copying model..."
#define TR_MOVINGMODEL "Moving model..."
#define TR_LOADINGMODEL "Loading model..."
#define STR_NAME "Name"
#define TR_NAME "Name"
#define TR_MODELNAME "Model Name"
#define TR_PHASENAME "Mode Name"
#define TR_MIXNAME "Mix Name"
@@ -982,7 +982,6 @@
#define TR_ANALOGS_BTN BUTTON(TR("Analog","Analogs"))
#define TR_TOUCH_NOTFOUND "Touch hardware not found"
#define TR_TOUCH_EXIT "Touch screen to exit"
#define TR_CALIBRATION "Calibration"
#define TR_SET "[Set]"
#define TR_TRAINER "Trainer"
#define TR_CHANS "Chans"
radio/src/translations/fr.h.txt
-1
View File
@@ -986,7 +986,6 @@
#define TR_ANALOGS_BTN BUTTON(TR("Anas", "Analogs"))
#define TR_TOUCH_NOTFOUND "Touch hardware not found"
#define TR_TOUCH_EXIT "Touch screen to exit"
#define TR_CALIBRATION "Calibration"
#define TR_SET BUTTON("Déf")
#define TR_TRAINER "Ecolage"
#define TR_CHANS "Chans"
radio/src/translations/it.h.txt
+2 -3
View File
@@ -455,7 +455,7 @@
#define TR_COPYINGMODEL "Copia in corso.."
#define TR_MOVINGMODEL "Spostamento..."
#define TR_LOADINGMODEL "Caricamento..."
#define STR_NAME "Nome"
#define TR_NAME "Nome"
#define TR_MODELNAME TR("Nome Mode.", "Nome Modello")
#define TR_PHASENAME "Nome fase"
#define TR_MIXNAME "Nome mix"
@@ -556,7 +556,7 @@
#define TR_INACTIVITYALARM INDENT "Inattività"
#define TR_MEMORYWARNING TR(INDENT "Avv. Mem.", INDENT "Avviso Memoria")
#define TR_ALARMWARNING INDENT "Spegni suono"
#define TR_RSSISHUTDOWNALARM TR(INDENT "RSSI Shut.", INDENT "Control. RSSI al Shutdown")
#define TR_RSSI_SHUTDOWN_ALARM TR(INDENT "RSSI Shut.", INDENT "Control. RSSI al Shutdown")
#define TR_MODEL_STILL_POWERED "Ricevente ancora connessa"
#define TR_MODEL_SHUTDOWN "Shutdown?"
#define TR_PRESS_ENTER_TO_CONFIRM "Premi [ENT] per confermare"
@@ -592,7 +592,6 @@
#define TR_MODESRC "Modo\006% Origine"
#define TR_MULTIPLIER "Moltiplica"
#define TR_CAL "Cal"
#define TR_CALIBRATION "Calibration"
#define TR_VTRIM "Trim- +"
#define TR_BG "BG:"
#define TR_CALIB_DONE "Calibration completed"
radio/src/translations/nl.h.txt
+1 -2
View File
@@ -431,7 +431,7 @@
#define TR_COPYINGMODEL "Kopieer Model"
#define TR_MOVINGMODEL "Verplaats Model"
#define TR_LOADINGMODEL "Laad Model..."
#define STR_NAME "Naam"
#define TR_NAME "Naam"
#define TR_MODELNAME "Modelnaam"
#define TR_PHASENAME "Modus"
#define TR_MIXNAME "Mix Naam"
@@ -971,7 +971,6 @@
#define TR_ANALOGS_BTN BUTTON(TR("Analog","Analogs"))
#define TR_TOUCH_NOTFOUND "Touch hardware not found"
#define TR_TOUCH_EXIT "Touch screen to exit"
#define TR_CALIBRATION "Calibration"
#define TR_SET "[Set]"
#define TR_TRAINER "Trainer Poort"
#define TR_CHANS "Chans"
radio/src/translations/pl.h.txt
+1 -2
View File
@@ -451,7 +451,7 @@
#define TR_COPYINGMODEL "Kopiuj model.."
#define TR_MOVINGMODEL "Przenieś model."
#define TR_LOADINGMODEL "Załaduj model.."
#define STR_NAME "Nazwa"
#define TR_NAME "Nazwa"
#define TR_MODELNAME "Nazwa modelu"
#define TR_PHASENAME "Nazwa Fazy"
#define TR_MIXNAME "Nazwa Mix"
@@ -985,7 +985,6 @@
#define TR_ANALOGS_BTN BUTTON(TR("Analog","Analogs"))
#define TR_TOUCH_NOTFOUND "Touch hardware not found"
#define TR_TOUCH_EXIT "Touch screen to exit"
#define TR_CALIBRATION "Calibration"
#define TR_SET "[Set]"
#define TR_TRAINER "Port Trenera"
#define TR_CHANS "Chans"
radio/src/translations/pt.h.txt
+1 -2
View File
@@ -444,7 +444,7 @@
#define TR_COPYINGMODEL "Copiando modelo"
#define TR_MOVINGMODEL "Movendo modelo"
#define TR_LOADINGMODEL "Carregar modelo"
#define STR_NAME "Nome"
#define TR_NAME "Nome"
#define TR_MODELNAME "Model Name"
#define TR_PHASENAME "Phase Name"
#define TR_MIXNAME "Mix Name"
@@ -986,7 +986,6 @@
#define TR_ANALOGS_BTN BUTTON(TR("Analog","Analogs"))
#define TR_TOUCH_NOTFOUND "Touch hardware not found"
#define TR_TOUCH_EXIT "Touch screen to exit"
#define TR_CALIBRATION "Calibration"
#define TR_SET "[Set]"
#define TR_TRAINER "Trainer"
#define TR_CHANS "Chans"
radio/src/translations/se.h.txt
+1 -2
View File
@@ -449,7 +449,7 @@
#define TR_COPYINGMODEL "Kopierar Modell "
#define TR_MOVINGMODEL "Flyttar Modell "
#define TR_LOADINGMODEL "Laddar Modell "
#define STR_NAME "Namn"
#define TR_NAME "Namn"
#define TR_MODELNAME "Modellnamn"
#define TR_PHASENAME "Lägesnamn "
#define TR_MIXNAME "Mixnamn "
@@ -988,7 +988,6 @@
#define TR_ANALOGS_BTN BUTTON(TR("Analog","Analogs"))
#define TR_TOUCH_NOTFOUND "Touch hardware not found"
#define TR_TOUCH_EXIT "Touch screen to exit"
#define TR_CALIBRATION "Calibration"
#define TR_SET "[Spara]"
#define TR_TRAINER "Trainer"
#define TR_CHANS "Chans"