chore: Remove obsolete language defines, single source for telemetry sensor names (#3119)
* - all telemetry sensor name definitions in one place (untranslated.h) - all telemetry sensor name definitions follow the naming convention STR_SENSOR_<sensor> - eliminated one redundant definition - editorial updates to telemetry protocols code to reflect the naming convention changes - re-introduced translations in da.h (STR_SENSOR_THROTTLE and STR_SENSOR_SPEED) - re-introduced translation in it.h (STR_SENSOR_GPSDATETIME) - re-introduced translation for fr.h ( STR_SENSOR_BATT) - saved 160 Bytes of flash * removed obsolete translation saved 280 byte flash memory in total * finally removed extern const char STR_MENUTEMPLATES[]; definition adjusted da.h, fr.h, it.h local sensor name definitions to naming conventions STR_SENSOR_<senosr> * corrected merge removed obsolete #ifdef * some more obsolete ones * added TW and CN translation for TR_PERIOD and TR_INTERVAL fixed problem in /radio/src/gui/colorlcd/fullscreen_dialog.cpp preventing builds for CZ, IT and FR languages
This commit is contained in:
+3
-108
@@ -124,6 +124,9 @@ const char STR_MINUTE_SINGULAR[] = TR_MINUTE_SINGULAR;
|
||||
const char STR_MINUTE_PLURAL1[] = TR_MINUTE_PLURAL1;
|
||||
const char STR_MINUTE_PLURAL2[] = TR_MINUTE_PLURAL2;
|
||||
|
||||
const char CHR_HOUR = TR_CHR_HOUR;
|
||||
const char CHR_INPUT = TR_CHR_INPUT;
|
||||
|
||||
const char STR_POPUPS_ENTER_EXIT[] = TR_POPUPS_ENTER_EXIT;
|
||||
const char STR_OK[] = TR_OK;
|
||||
const char STR_FREE[] = TR_FREE;
|
||||
@@ -524,113 +527,6 @@ const char STR_PHASENAME[] = TR_PHASENAME;
|
||||
const char STR_MIXNAME[] = TR_MIXNAME;
|
||||
const char STR_INPUTNAME[] = TR_INPUTNAME;
|
||||
const char STR_EXPONAME[] = TR_EXPONAME;
|
||||
const char STR_SENSOR_RSSI[] = TR_SENSOR_RSSI;
|
||||
const char STR_SENSOR_R9PW[] = TR_SENSOR_R9PW;
|
||||
const char STR_SENSOR_RAS[] = TR_SENSOR_RAS;
|
||||
const char STR_SENSOR_A1[] = TR_SENSOR_A1;
|
||||
const char STR_SENSOR_A2[] = TR_SENSOR_A2;
|
||||
const char STR_SENSOR_A3[] = TR_SENSOR_A3;
|
||||
const char STR_SENSOR_A4[] = TR_SENSOR_A4;
|
||||
const char STR_SENSOR_BATT[] = TR_SENSOR_BATT;
|
||||
const char STR_SENSOR_ALT[] = TR_SENSOR_ALT;
|
||||
const char STR_SENSOR_TEMP1[] = TR_SENSOR_TEMP1;
|
||||
const char STR_SENSOR_TEMP2[] = TR_SENSOR_TEMP2;
|
||||
const char STR_SENSOR_TEMP3[] = TR_SENSOR_TEMP3;
|
||||
const char STR_SENSOR_TEMP4[] = TR_SENSOR_TEMP4;
|
||||
const char STR_SENSOR_RPM2[] = TR_SENSOR_RPM2;
|
||||
const char STR_SENSOR_PRES[] = TR_SENSOR_PRES;
|
||||
const char STR_SENSOR_ODO1[] = TR_SENSOR_ODO1;
|
||||
const char STR_SENSOR_ODO2[] = TR_SENSOR_ODO2;
|
||||
const char STR_SENSOR_TXV[] = TR_SENSOR_TXV;
|
||||
const char STR_SENSOR_CURR_SERVO1[] = TR_SENSOR_CURR_SERVO1;
|
||||
const char STR_SENSOR_CURR_SERVO2[] = TR_SENSOR_CURR_SERVO2;
|
||||
const char STR_SENSOR_CURR_SERVO3[] = TR_SENSOR_CURR_SERVO3;
|
||||
const char STR_SENSOR_CURR_SERVO4[] = TR_SENSOR_CURR_SERVO4;
|
||||
const char STR_SENSOR_DIST[] = TR_SENSOR_DIST;
|
||||
const char STR_SENSOR_ARM[] = TR_SENSOR_ARM;
|
||||
const char STR_SENSOR_C50[] = TR_SENSOR_C50;
|
||||
const char STR_SENSOR_C200[] = TR_SENSOR_C200;
|
||||
const char STR_SENSOR_RPM[] = TR_SENSOR_RPM;
|
||||
const char STR_SENSOR_FUEL[] = TR_SENSOR_FUEL;
|
||||
const char STR_SENSOR_VSPD[] = TR_SENSOR_VSPD;
|
||||
const char STR_SENSOR_ACCX[] = TR_SENSOR_ACCX;
|
||||
const char STR_SENSOR_ACCY[] = TR_SENSOR_ACCY;
|
||||
const char STR_SENSOR_ACCZ[] = TR_SENSOR_ACCZ;
|
||||
const char STR_SENSOR_GYROX[] = TR_SENSOR_GYROX;
|
||||
const char STR_SENSOR_GYROY[] = TR_SENSOR_GYROY;
|
||||
const char STR_SENSOR_GYROZ[] = TR_SENSOR_GYROZ;
|
||||
const char STR_SENSOR_CURR[] = TR_SENSOR_CURR;
|
||||
const char STR_SENSOR_CAPACITY[] = TR_SENSOR_CAPACITY;
|
||||
const char STR_SENSOR_VFAS[] = TR_SENSOR_VFAS;
|
||||
const char STR_SENSOR_ASPD[] = TR_SENSOR_ASPD;
|
||||
const char STR_SENSOR_GSPD[] = TR_SENSOR_GSPD;
|
||||
const char STR_SENSOR_HDG[] = TR_SENSOR_HDG;
|
||||
const char STR_SENSOR_SATELLITES[] = TR_SENSOR_SATELLITES;
|
||||
const char STR_SENSOR_CELLS[] = TR_SENSOR_CELLS;
|
||||
const char STR_SENSOR_GPSALT[] = TR_SENSOR_GPSALT;
|
||||
const char STR_SENSOR_GPSDATETIME[] = TR_SENSOR_GPSDATETIME;
|
||||
const char STR_SENSOR_GPS[] = TR_SENSOR_GPS;
|
||||
const char STR_SENSOR_BATT1_VOLTAGE[] = TR_SENSOR_BATT1_VOLTAGE;
|
||||
const char STR_SENSOR_BATT2_VOLTAGE[] = TR_SENSOR_BATT2_VOLTAGE;
|
||||
const char STR_SENSOR_BATT1_CURRENT[] = TR_SENSOR_BATT1_CURRENT;
|
||||
const char STR_SENSOR_BATT2_CURRENT[] = TR_SENSOR_BATT2_CURRENT;
|
||||
const char STR_SENSOR_BATT1_CONSUMPTION[] = TR_SENSOR_BATT1_CONSUMPTION;
|
||||
const char STR_SENSOR_BATT2_CONSUMPTION[] = TR_SENSOR_BATT2_CONSUMPTION;
|
||||
const char STR_SENSOR_BATT1_TEMP[] = TR_SENSOR_BATT1_TEMP;
|
||||
const char STR_SENSOR_BATT2_TEMP[] = TR_SENSOR_BATT2_TEMP;
|
||||
const char STR_SENSOR_RB_STATE[] = TR_SENSOR_RB_STATE;
|
||||
const char STR_SENSOR_CHANS_STATE[] = TR_SENSOR_CHANS_STATE;
|
||||
const char STR_SENSOR_RX_RSSI1[] = TR_SENSOR_RX_RSSI1;
|
||||
const char STR_SENSOR_RX_RSSI2[] = TR_SENSOR_RX_RSSI2;
|
||||
const char STR_SENSOR_RX_QUALITY[] = TR_SENSOR_RX_QUALITY;
|
||||
const char STR_SENSOR_RX_SNR[] = TR_SENSOR_RX_SNR;
|
||||
const char STR_SENSOR_RX_SIGNAL[] = TR_SENSOR_RX_SIGNAL;
|
||||
const char STR_SENSOR_RX_NOISE[] = TR_SENSOR_RX_NOISE;
|
||||
const char STR_SENSOR_ANTENNA[] = TR_SENSOR_ANTENNA;
|
||||
const char STR_SENSOR_RF_MODE[] = TR_SENSOR_RF_MODE;
|
||||
const char STR_SENSOR_TX_POWER[] = TR_SENSOR_TX_POWER;
|
||||
const char STR_SENSOR_TX_RSSI[] = TR_SENSOR_TX_RSSI;
|
||||
const char STR_SENSOR_TX_QUALITY[] = TR_SENSOR_TX_QUALITY;
|
||||
const char STR_SENSOR_RX_RSSI_PERC[] = TR_SENSOR_RX_RSSI_PERC;
|
||||
const char STR_SENSOR_RX_RF_POWER[] = TR_SENSOR_RX_RF_POWER;
|
||||
const char STR_SENSOR_TX_RSSI_PERC[] = TR_SENSOR_TX_RSSI_PERC;
|
||||
const char STR_SENSOR_TX_RF_POWER[] = TR_SENSOR_TX_RF_POWER;
|
||||
const char STR_SENSOR_TX_FPS[] = TR_SENSOR_TX_FPS;
|
||||
const char STR_SENSOR_TX_SNR[] = TR_SENSOR_TX_SNR;
|
||||
const char STR_SENSOR_TX_NOISE[] = TR_SENSOR_TX_NOISE;
|
||||
const char STR_SENSOR_PITCH[] = TR_SENSOR_PITCH;
|
||||
const char STR_SENSOR_ROLL[] = TR_SENSOR_ROLL;
|
||||
const char STR_SENSOR_YAW[] = TR_SENSOR_YAW;
|
||||
const char STR_SENSOR_FLIGHT_MODE[] = TR_SENSOR_FLIGHT_MODE;
|
||||
const char STR_SENSOR_THROTTLE[] = TR_SENSOR_THROTTLE;
|
||||
const char STR_SENSOR_QOS_A[] = TR_SENSOR_QOS_A;
|
||||
const char STR_SENSOR_QOS_B[] = TR_SENSOR_QOS_B;
|
||||
const char STR_SENSOR_QOS_L[] = TR_SENSOR_QOS_L;
|
||||
const char STR_SENSOR_QOS_R[] = TR_SENSOR_QOS_R;
|
||||
const char STR_SENSOR_QOS_F[] = TR_SENSOR_QOS_F;
|
||||
const char STR_SENSOR_QOS_H[] = TR_SENSOR_QOS_H;
|
||||
const char STR_SENSOR_BIND[] = TR_SENSOR_BIND;
|
||||
const char STR_SENSOR_LAP_NUMBER[] = TR_SENSOR_LAP_NUMBER;
|
||||
const char STR_SENSOR_GATE_NUMBER[] = TR_SENSOR_GATE_NUMBER;
|
||||
const char STR_SENSOR_LAP_TIME[] = TR_SENSOR_LAP_TIME;
|
||||
const char STR_SENSOR_GATE_TIME[] = TR_SENSOR_GATE_TIME;
|
||||
const char STR_SENSOR_ESC_VOLTAGE[] = TR_SENSOR_ESC_VOLTAGE;
|
||||
const char STR_SENSOR_ESC_CURRENT[] = TR_SENSOR_ESC_CURRENT;
|
||||
const char STR_SENSOR_ESC_RPM[] = TR_SENSOR_ESC_RPM;
|
||||
const char STR_SENSOR_ESC_CONSUMPTION[] = TR_SENSOR_ESC_CONSUMPTION;
|
||||
const char STR_SENSOR_ESC_TEMP[] = TR_SENSOR_ESC_TEMP;
|
||||
const char STR_SENSOR_SD1_CHANNEL[] = TR_SENSOR_SD1_CHANNEL;
|
||||
const char STR_SENSOR_GASSUIT_TEMP1[] = TR_SENSOR_GASSUIT_TEMP1;
|
||||
const char STR_SENSOR_GASSUIT_TEMP2[] = TR_SENSOR_GASSUIT_TEMP2;
|
||||
const char STR_SENSOR_GASSUIT_RPM[] = TR_SENSOR_GASSUIT_RPM;
|
||||
const char STR_SENSOR_GASSUIT_FLOW[] = TR_SENSOR_GASSUIT_FLOW;
|
||||
const char STR_SENSOR_GASSUIT_CONS[] = TR_SENSOR_GASSUIT_CONS;
|
||||
const char STR_SENSOR_GASSUIT_RES_VOL[] = TR_SENSOR_GASSUIT_RES_VOL;
|
||||
const char STR_SENSOR_GASSUIT_RES_PERC[] = TR_SENSOR_GASSUIT_RES_PERC;
|
||||
const char STR_SENSOR_GASSUIT_MAX_FLOW[] = TR_SENSOR_GASSUIT_MAX_FLOW;
|
||||
const char STR_SENSOR_GASSUIT_AVG_FLOW[] = TR_SENSOR_GASSUIT_AVG_FLOW;
|
||||
const char STR_SENSOR_SBEC_VOLTAGE[] = TR_SENSOR_SBEC_VOLTAGE;
|
||||
const char STR_SENSOR_SBEC_CURRENT[] = TR_SENSOR_SBEC_CURRENT;
|
||||
const char STR_TRAINER[] = TR_TRAINER;
|
||||
const char STR_CHANS[] = TR_CHANS;
|
||||
const char STR_MODULE_BIND[] = TR_MODULE_BIND;
|
||||
@@ -982,7 +878,6 @@ const char * const STR_PHASES_HEADERS[] = TR_PHASES_HEADERS;
|
||||
const char * const STR_LIMITS_HEADERS[] = TR_LIMITS_HEADERS;
|
||||
const char * const STR_LSW_HEADERS[] = TR_LSW_HEADERS;
|
||||
const char * const STR_LSW_DESCRIPTIONS[] = TR_LSW_DESCRIPTIONS;
|
||||
const char * const STR_GVAR_HEADERS[] = TR_GVAR_HEADERS;
|
||||
#endif
|
||||
|
||||
#if defined(BLUETOOTH)
|
||||
|
||||
Reference in New Issue
Block a user