From 1aff10dc359ef97416089b48a986723cd49789bb Mon Sep 17 00:00:00 2001 From: "bsongis@gmail.com" Date: Sun, 26 May 2013 20:48:26 +0000 Subject: [PATCH] [all] Issue 17 fixed (lowercase is now the default) [all] Issue 28 fixed (10 beeps on countdown during the last 10 seconds) [all] Issue 37 fixed (Pwr+) added [all] Issue 39 fixed (Potscroll too slow) [Taranis] Bug with delays on 3 states switches [Taranis/sky9x/gruvin9x] Date & Time not always saved --- src/audio_arm.cpp | 9 ++----- src/audio_arm.h | 3 +-- src/audio_avr.cpp | 6 ++--- src/audio_avr.h | 3 +-- src/buzzer.h | 5 +--- src/gui/menu_general.cpp | 4 ++- src/gui/menu_model.cpp | 2 +- src/gui/menus.cpp | 9 +++++-- src/gui/view_telemetry.cpp | 4 +-- src/haptic.cpp | 4 +-- src/lcd.cpp | 1 + src/myeeprom.h | 3 ++- src/opentx.cpp | 19 +++++++------ src/opentx.h | 3 +-- src/telemetry/frsky.cpp | 18 ++++++------- src/telemetry/frsky.h | 55 +++++++++++++++++++++----------------- src/translations/cz.h | 2 +- src/translations/de.h | 4 +-- src/translations/en.h | 4 +-- src/translations/es.h | 2 +- src/translations/fr.h | 4 +-- src/translations/it.h | 4 +-- src/translations/pt.h | 4 +-- src/translations/se.h | 4 +-- 24 files changed, 88 insertions(+), 88 deletions(-) diff --git a/src/audio_arm.cpp b/src/audio_arm.cpp index ceaa92ec9..a1f2da626 100644 --- a/src/audio_arm.cpp +++ b/src/audio_arm.cpp @@ -79,7 +79,6 @@ const char * audioFilenames[] = { "mixwarn1", "mixwarn2", "mixwarn3", - "timerlt3", "timer10", "timer20", "timer30", @@ -825,14 +824,10 @@ void audioEvent(uint8_t e, uint8_t f) case AU_MIX_WARNING_3: audioQueue.play(BEEP_DEFAULT_FREQ+112, 12, 8, PLAY_REPEAT(2)); break; - // time <3 seconds left - case AU_TIMER_LT3: + // time <= 10 seconds left + case AU_TIMER_LT10: audioQueue.play(BEEP_DEFAULT_FREQ+10, 30, 6, PLAY_NOW); break; - // time 10 seconds left - case AU_TIMER_10: - audioQueue.play(BEEP_DEFAULT_FREQ, 30, 6, PLAY_NOW); - break; // time 20 seconds left case AU_TIMER_20: audioQueue.play(BEEP_DEFAULT_FREQ, 30, 6, PLAY_REPEAT(1)|PLAY_NOW); diff --git a/src/audio_arm.h b/src/audio_arm.h index a042f3e6f..3fd48df00 100644 --- a/src/audio_arm.h +++ b/src/audio_arm.h @@ -181,8 +181,7 @@ void audioStart(); #define AUDIO_ERROR() AUDIO_BUZZER(audioEvent(AU_ERROR), beep(4)) #define AUDIO_TIMER_30() AUDIO_BUZZER(audioEvent(AU_TIMER_30), { beepAgain=2; beep(2); }) #define AUDIO_TIMER_20() AUDIO_BUZZER(audioEvent(AU_TIMER_20), { beepAgain=1; beep(2); }) -#define AUDIO_TIMER_10() AUDIO_BUZZER(audioEvent(AU_TIMER_10), beep(2)) -#define AUDIO_TIMER_LT3(x) AUDIO_BUZZER(audioEvent(AU_TIMER_LT3), beep(2)) +#define AUDIO_TIMER_LT10(x) AUDIO_BUZZER(audioEvent(AU_TIMER_LT10), beep(2)) #define AUDIO_INACTIVITY() AUDIO_BUZZER(audioEvent(AU_INACTIVITY), beep(3)) #define AUDIO_MIX_WARNING(x) AUDIO_BUZZER(audioEvent(AU_MIX_WARNING_1+x-1), beep(1)) #define AUDIO_POT_STICK_MIDDLE() AUDIO_BUZZER(audioEvent(AU_POT_STICK_MIDDLE), beep(2)) diff --git a/src/audio_avr.cpp b/src/audio_avr.cpp index 36438da9a..eb827c5e7 100644 --- a/src/audio_avr.cpp +++ b/src/audio_avr.cpp @@ -248,10 +248,8 @@ void audioQueue::event(uint8_t e, uint8_t f) case AU_TIMER_20: play(BEEP_DEFAULT_FREQ + 50, 15, 3, PLAY_REPEAT(1)|PLAY_NOW); break; - // time 10 seconds left - case AU_TIMER_10: - // time <3 seconds left - case AU_TIMER_LT3: + // time <= 10 seconds left + case AU_TIMER_LT10: play(BEEP_DEFAULT_FREQ + 50, 15, 3, PLAY_NOW); break; case AU_FRSKY_BEEP1: diff --git a/src/audio_avr.h b/src/audio_avr.h index eaa382984..f739cda08 100644 --- a/src/audio_avr.h +++ b/src/audio_avr.h @@ -138,8 +138,7 @@ void audioDefevent(uint8_t e); #define AUDIO_TIMER_MINUTE(t) VOICE_AUDIO_BUZZER(playDuration(t), audioDefevent(AU_WARNING1), beep(2)) #define AUDIO_TIMER_30() VOICE_AUDIO_BUZZER(PUSH_SYSTEM_PROMPT(AU_TIMER_30), audioDefevent(AU_TIMER_30), { beepAgain=2; beep(2); }) #define AUDIO_TIMER_20() VOICE_AUDIO_BUZZER(PUSH_SYSTEM_PROMPT(AU_TIMER_20), audioDefevent(AU_TIMER_20), { beepAgain=1; beep(2); }) -#define AUDIO_TIMER_10() VOICE_AUDIO_BUZZER(PUSH_SYSTEM_PROMPT(AU_TIMER_10), audioDefevent(AU_TIMER_10), beep(2)) -#define AUDIO_TIMER_LT3(x) VOICE_AUDIO_BUZZER(PUSH_SYSTEM_PROMPT(AU_TIMER_LT3), audioDefevent(AU_TIMER_LT3), beep(2)) +#define AUDIO_TIMER_LT10(x) AUDIO_BUZZER(audioDefevent(AU_TIMER_LT10), beep(2)) #define AUDIO_MIX_WARNING(x) AUDIO_BUZZER(audioDefevent(AU_MIX_WARNING_1+x-1), beep(1)) #define AUDIO_POT_STICK_MIDDLE() AUDIO_BUZZER(audioDefevent(AU_POT_STICK_MIDDLE), beep(2)) #define AUDIO_VARIO_UP() audioDefevent(AU_KEYPAD_UP) diff --git a/src/buzzer.h b/src/buzzer.h index ffc9964a6..71c8dafc4 100644 --- a/src/buzzer.h +++ b/src/buzzer.h @@ -70,8 +70,6 @@ void beep(uint8_t val); #define AUDIO_TIMER_MINUTE(t) playDuration(t) #define AUDIO_TIMER_30() PUSH_SYSTEM_PROMPT(AU_TIMER_30) #define AUDIO_TIMER_20() PUSH_SYSTEM_PROMPT(AU_TIMER_20) - #define AUDIO_TIMER_10() PUSH_SYSTEM_PROMPT(AU_TIMER_10) - #define AUDIO_TIMER_LT3(x) PUSH_SYSTEM_PROMPT(AU_TIMER_LT3) #else #define AUDIO_TADA() #define AUDIO_TX_BATTERY_LOW() beep(4) @@ -80,8 +78,6 @@ void beep(uint8_t val); #define AUDIO_TIMER_MINUTE(t) beep(2) #define AUDIO_TIMER_30() { beepAgain=2; beep(2); } #define AUDIO_TIMER_20() { beepAgain=1; beep(2); } - #define AUDIO_TIMER_10() beep(2) - #define AUDIO_TIMER_LT3(x) beep(2) #endif #define AUDIO_KEYPAD_UP() beep(0) @@ -92,6 +88,7 @@ void beep(uint8_t val); #define AUDIO_ERROR() beep(4) #define AUDIO_MIX_WARNING(x) beep(1) #define AUDIO_POT_STICK_MIDDLE() beep(2) + #define AUDIO_TIMER_LT10(x) beep(2) #define AUDIO_VARIO_UP() _beep(1) #define AUDIO_VARIO_DOWN() _beep(1) #define AUDIO_TRIM(event, f) { if (!IS_KEY_FIRST(event)) warble = true; beep(1); } diff --git a/src/gui/menu_general.cpp b/src/gui/menu_general.cpp index 52ecc6c2e..56be78dc4 100644 --- a/src/gui/menu_general.cpp +++ b/src/gui/menu_general.cpp @@ -185,7 +185,9 @@ void menuGeneralSetup(uint8_t event) struct gtm t; gettime(&t); - if ((m_posVert==ITEM_SETUP_DATE+1 || m_posVert==ITEM_SETUP_TIME+1) && s_editMode>0 && event == EVT_KEY_FIRST(KEY_ENTER)) { + if ((m_posVert==ITEM_SETUP_DATE+1 || m_posVert==ITEM_SETUP_TIME+1) && + (s_editMode>0) && + (event==EVT_KEY_FIRST(KEY_ENTER) || event==EVT_KEY_FIRST(KEY_EXIT) || IS_ROTARY_BREAK(event) || IS_ROTARY_LONG(event))) { // set the date and time into RTC chip rtcSetTime(&t); } diff --git a/src/gui/menu_model.cpp b/src/gui/menu_model.cpp index fe8945635..687f4fe03 100644 --- a/src/gui/menu_model.cpp +++ b/src/gui/menu_model.cpp @@ -758,7 +758,7 @@ void editName(uint8_t x, uint8_t y, char *name, uint8_t size, uint8_t event, uin if (p1valdiff || IS_ROTARY_RIGHT(event) || IS_ROTARY_LEFT(event) || event==EVT_KEY_FIRST(KEY_DOWN) || event==EVT_KEY_FIRST(KEY_UP) || event==EVT_KEY_REPT(KEY_DOWN) || event==EVT_KEY_REPT(KEY_UP)) { v = checkIncDec(event, abs(v), 0, ZCHAR_MAX, 0); - if (c < 0) v = -v; + if (c <= 0) v = -v; } switch (event) { diff --git a/src/gui/menus.cpp b/src/gui/menus.cpp index efe52c9e7..11db65b46 100644 --- a/src/gui/menus.cpp +++ b/src/gui/menus.cpp @@ -298,9 +298,14 @@ bool check(check_event_t event, uint8_t curr, const MenuFuncP *menuTab, uint8_t #ifdef NAVIGATION_POT1 // check pot 1 - if changed -> scroll values + static int16_t p1val; static int16_t p1valprev; - p1valdiff = (p1valprev-calibratedStick[6]) / SCROLL_POT1_TH; - if (p1valdiff) p1valprev = calibratedStick[6]; + p1valdiff = (p1val-calibratedStick[6]) / SCROLL_POT1_TH; + if (p1valdiff) { + p1valdiff = (p1valprev-calibratedStick[6]) / 2; + p1val = calibratedStick[6]; + } + p1valprev = calibratedStick[6]; #endif #ifdef NAVIGATION_POT2 diff --git a/src/gui/view_telemetry.cpp b/src/gui/view_telemetry.cpp index 3f49bb231..3cb3b6596 100644 --- a/src/gui/view_telemetry.cpp +++ b/src/gui/view_telemetry.cpp @@ -360,8 +360,8 @@ void menuTelemetryFrsky(uint8_t event) #endif } - putsTelemetryChannel(4, 5*FH+1, TELEM_POWER-1, frskyData.power, LEFT|DBLSIZE); - putsTelemetryChannel(3*FW+4+4*FW+6*FW+FW, 5*FH+1, TELEM_CONSUMPTION-1, frskyData.currentConsumption, DBLSIZE); + putsTelemetryChannel(4, 5*FH+1, TELEM_POWER-1, frskyData.hub.power, LEFT|DBLSIZE); + putsTelemetryChannel(3*FW+4+4*FW+6*FW+FW, 5*FH+1, TELEM_CONSUMPTION-1, frskyData.hub.currentConsumption, DBLSIZE); } else { displayVoltageScreenLine(analog > 0 ? 5*FH : 4*FH, analog ? 2-analog : 0); diff --git a/src/haptic.cpp b/src/haptic.cpp index bb20b5102..83f3a8410 100644 --- a/src/haptic.cpp +++ b/src/haptic.cpp @@ -114,10 +114,10 @@ void hapticQueue::event(uint8_t e) play(15, 3, PLAY_NOW); else if (e <= AU_TRIM_MOVE) play(5, 0, PLAY_NOW); - else if (e <= AU_TIMER_LT3) + else if (e <= AU_TIMER_LT10) play(15, 3, PLAY_NOW); else if (e < AU_FRSKY_FIRST) - play(15, 3, (e-AU_TIMER_10)|PLAY_NOW); + play(15, 3, (e-AU_TIMER_20+1)|PLAY_NOW); else if (e >= AU_FRSKY_LAST && empty()) { play(30, 10, 0); play(10,50-10*(e-AU_FRSKY_LAST),(e-AU_FRSKY_LAST)); diff --git a/src/lcd.cpp b/src/lcd.cpp index 1bb7d7ae1..51746dfa8 100644 --- a/src/lcd.cpp +++ b/src/lcd.cpp @@ -1042,6 +1042,7 @@ void putsTelemetryChannel(xcoord_t x, uint8_t y, uint8_t channel, lcdint_t val, break; case TELEM_POWER-1: + case TELEM_MAX_POWER-1: putsTelemetryValue(x, y, val, UNIT_WATTS, att); break; diff --git a/src/myeeprom.h b/src/myeeprom.h index 8b0d4ee11..716b02b92 100644 --- a/src/myeeprom.h +++ b/src/myeeprom.h @@ -748,11 +748,12 @@ enum TelemetrySource { TELEM_MAX_SPEED, TELEM_MAX_DIST, TELEM_MAX_CURRENT, + TELEM_MAX_POWER, TELEM_ACC, TELEM_GPS_TIME, TELEM_CSW_MAX = TELEM_POWER, TELEM_NOUSR_MAX = TELEM_A2, - TELEM_DISPLAY_MAX = TELEM_MAX_CURRENT, + TELEM_DISPLAY_MAX = TELEM_MAX_POWER, TELEM_STATUS_MAX = TELEM_GPS_TIME }; diff --git a/src/opentx.cpp b/src/opentx.cpp index a49dc0833..a5db0bda0 100644 --- a/src/opentx.cpp +++ b/src/opentx.cpp @@ -933,8 +933,8 @@ getvalue_t getValue(uint8_t i) else if (i= MIXSRC_SA-1 && k <= MIXSRC_LAST_CSW-1) { + if ((k == MIXSRC_SF-1) || (k >= MIXSRC_SH-1 && k <= MIXSRC_LAST_CSW-1)) { if (v < 0 && !md->swtch) sw = false; } if (k>=MIXSRC_CH1-1 && k<=MIXSRC_LAST_CH-1 && md->destCh != k-MIXSRC_CH1+1) { @@ -3412,10 +3412,9 @@ void doMixerCalculations() s_timerVal[i] = newTimerVal; if (s_timerState[i] == TMR_RUNNING) { if (g_model.timers[i].countdownBeep && g_model.timers[i].start) { // beep when 30, 15, 10, 5,4,3,2,1 seconds remaining - if (newTimerVal==30) AUDIO_TIMER_30(); //beep three times - if (newTimerVal==20) AUDIO_TIMER_20(); //beep two times - if (newTimerVal==10) AUDIO_TIMER_10(); - if (newTimerVal<= 3) AUDIO_TIMER_LT3(newTimerVal); + if (newTimerVal==30) AUDIO_TIMER_30(); // beep three times + if (newTimerVal==20) AUDIO_TIMER_20(); // beep two times + if (newTimerVal<=10) AUDIO_TIMER_LT10(newTimerVal); } if (g_model.timers[i].minuteBeep && (newTimerVal % 60)==0) { // short beep every minute @@ -3521,8 +3520,8 @@ void doMixerCalculations() static uint8_t count_dsm_range = 0; if (s_rangecheck_mode) if (++count_dsm_range >= 200) { - AUDIO_PLAY(AU_FRSKY_CHEEP); - count_dsm_range = 0; + AUDIO_PLAY(AU_FRSKY_CHEEP); + count_dsm_range = 0; } #endif diff --git a/src/opentx.h b/src/opentx.h index a96d9131e..47ff44d2c 100644 --- a/src/opentx.h +++ b/src/opentx.h @@ -1233,8 +1233,7 @@ enum AUDIO_SOUNDS { AU_MIX_WARNING_1, AU_MIX_WARNING_2, AU_MIX_WARNING_3, - AU_TIMER_LT3, - AU_TIMER_10, + AU_TIMER_LT10, AU_TIMER_20, AU_TIMER_30, #if defined(PCBTARANIS) diff --git a/src/telemetry/frsky.cpp b/src/telemetry/frsky.cpp index a2ca57090..2d0a2be53 100644 --- a/src/telemetry/frsky.cpp +++ b/src/telemetry/frsky.cpp @@ -684,20 +684,18 @@ void telemetryInterrupt10ms() } #if defined(CPUARM) - frskyData.power = (current * voltage) / 100; + frskyData.hub.power = (current * voltage) / 100; #else - frskyData.power = ((current>>1) * (voltage>>1)) / 25; + frskyData.hub.power = ((current>>1) * (voltage>>1)) / 25; #endif -#if 0 - if (frskyData.power > frskyData.maxPower) - frskyData.maxPower = frskyData.power; -#endif + if (frskyData.hub.power > frskyData.hub.maxPower) + frskyData.hub.maxPower = frskyData.hub.power; - frskyData.currentPrescale += current; - if (frskyData.currentPrescale >= 3600) { - frskyData.currentConsumption += 1; - frskyData.currentPrescale -= 3600; + frskyData.hub.currentPrescale += current; + if (frskyData.hub.currentPrescale >= 3600) { + frskyData.hub.currentConsumption += 1; + frskyData.hub.currentPrescale -= 3600; } } diff --git a/src/telemetry/frsky.h b/src/telemetry/frsky.h index 4916c7f4d..0212f3d40 100644 --- a/src/telemetry/frsky.h +++ b/src/telemetry/frsky.h @@ -116,6 +116,21 @@ PACK(struct FrskySerialData { int32_t varioAltitude_cm; int16_t varioSpeed; // 0x30 Vertical speed in cm/s + uint16_t gpsDistance; + int16_t gpsAltitudeOffset; + uint8_t varioAltitudeQueuePointer; // circular-buffer pointer + uint8_t minCellIdx; + int16_t cellsSum; + uint16_t currentConsumption; + uint16_t currentPrescale; + uint16_t power; + int16_t spare2; + + uint16_t vfas; // 0x39 Added to FrSky protocol for home made sensors with a better precision + uint16_t volts_bp; // 0x3A + uint16_t volts_ap; // 0x3B + // end of FrSky Hub data + /* next fields must keep this order! */ int16_t minAltitude; int16_t maxAltitude; @@ -125,28 +140,19 @@ PACK(struct FrskySerialData { uint16_t maxGpsSpeed; uint16_t maxGpsDistance; uint16_t maxCurrent; + uint16_t maxPower; /* end */ - - uint16_t vfas; // 0x39 Added to FrSky protocol for home made sensors with a better precision - uint16_t volts_bp; // 0x3A - uint16_t volts_ap; // 0x3B - // end of FrSky Hub data - - uint16_t gpsDistance; - int16_t gpsAltitudeOffset; - uint8_t varioAltitudeQueuePointer; // circular-buffer pointer - uint8_t minCellIdx; - int16_t cellsSum; - - // TODO later uint16_t minVfas; }); -#define FRSKY_HUB_DATA FrskySerialData hub; #elif defined(WS_HOW_HIGH) PACK(struct FrskySerialData { int16_t baroAltitude_bp; // 0..9,999 meters int16_t baroAltitudeOffset; int16_t minAltitude; int16_t maxAltitude; + uint16_t currentConsumption; + uint16_t currentPrescale; + uint16_t power; + uint16_t maxPower; #if defined(VARIO) int16_t varioAltitudeQueue[VARIO_QUEUE_LENGTH]; //circular buffer uint8_t varioAltitudeQueuePointer; // circular-buffer pointer @@ -154,29 +160,30 @@ PACK(struct FrskySerialData { int16_t varioSpeed; // Vertical speed in cm/s #endif }); -#define FRSKY_HUB_DATA FrskySerialData hub; #elif defined(VARIO) PACK(struct FrskySerialData { int16_t varioAltitudeQueue[VARIO_QUEUE_LENGTH]; //circular buffer uint8_t varioAltitudeQueuePointer; // circular-buffer pointer int32_t varioAltitude_cm; int16_t varioSpeed; // Vertical speed in cm/s + uint16_t currentConsumption; + uint16_t currentPrescale; + uint16_t power; + uint16_t maxPower; }); -#define FRSKY_HUB_DATA FrskySerialData hub; #else -#define FRSKY_HUB_DATA +PACK(struct FrskySerialData { + uint16_t currentConsumption; + uint16_t currentPrescale; + uint16_t power; + uint16_t maxPower; +}); #endif struct FrskyData { FrskyValueWithMinMax analog[2]; FrskyValueWithMin rssi[2]; - - FRSKY_HUB_DATA - - uint16_t currentConsumption; - uint16_t currentPrescale; - uint16_t power; - // TODO uint16_t maxPower; + FrskySerialData hub; }; // Global Fr-Sky telemetry data variables diff --git a/src/translations/cz.h b/src/translations/cz.h index f077fac69..c02f378e6 100644 --- a/src/translations/cz.h +++ b/src/translations/cz.h @@ -232,7 +232,7 @@ #define TR_RSSI_0 "Tx\0 " #define TR_RSSI_1 "Rx\0 " #endif -#define TR_VTELEMCHNS "---\0""Bat\0""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+""Cur+""Acc\0""Time" +#define TR_VTELEMCHNS "---\0""Bat\0""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+""Cur+""Pwr+""Acc\0""Time" #if defined(CPUARM) #define LEN_VUNITSSYSTEM TR("\006", "\010") diff --git a/src/translations/de.h b/src/translations/de.h index 105637ed3..c83707cd7 100644 --- a/src/translations/de.h +++ b/src/translations/de.h @@ -232,7 +232,7 @@ #define TR_RSSI_0 "Tx\0 " #define TR_RSSI_1 "Rx\0 " #endif -#define TR_VTELEMCHNS "---\0""Batt""Uhr1""Uhr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""H\203he""Umdr""Stof""T1\0 ""T2\0 ""Gesc""Dist""GH\203h""Zell""Zels""Vfas""Strm""Verb""Leis""BesX""BesY""BesZ""Rich""VGes""A1-\0""A2-\0""H\203h-""H\203h+""Umd+""T1+\0""T2+\0""Ges+""Dst+""Str+""Besc""Zeit" +#define TR_VTELEMCHNS "---\0""Batt""Uhr1""Uhr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""H\203he""Umdr""Stof""T1\0 ""T2\0 ""Gesc""Dist""GH\203h""Zell""Zels""Vfas""Strm""Verb""Leis""BesX""BesY""BesZ""Rich""VGes""A1-\0""A2-\0""H\203h-""H\203h+""Umd+""T1+\0""T2+\0""Ges+""Dst+""Str+""Pwr+""Besc""Zeit" #if defined(CPUARM) #define LEN_VUNITSSYSTEM TR("\006", "\010") @@ -690,4 +690,4 @@ #define TR_CHR_SHORT 's' #define TR_CHR_LONG 'l' #define TR_CHR_TOGGLE 't' -#define TR_CHR_HOUR 'h' \ No newline at end of file +#define TR_CHR_HOUR 'h' diff --git a/src/translations/en.h b/src/translations/en.h index f3b1adff6..abd97e02b 100644 --- a/src/translations/en.h +++ b/src/translations/en.h @@ -232,7 +232,7 @@ #define TR_RSSI_0 "Tx\0 " #define TR_RSSI_1 "Rx\0 " #endif -#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+""Cur+""Acc\0""Time" +#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+""Cur+""Pwr+""Acc\0""Time" #if defined(CPUARM) #define LEN_VUNITSSYSTEM TR("\006", "\010") @@ -690,4 +690,4 @@ #define TR_CHR_SHORT 's' #define TR_CHR_LONG 'l' #define TR_CHR_TOGGLE 't' -#define TR_CHR_HOUR 'h' \ No newline at end of file +#define TR_CHR_HOUR 'h' diff --git a/src/translations/es.h b/src/translations/es.h index f96ac6b3a..789a98391 100644 --- a/src/translations/es.h +++ b/src/translations/es.h @@ -232,7 +232,7 @@ #define TR_RSSI_0 "Tx\0 " #define TR_RSSI_1 "Rx\0 " #endif -#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+""Cur+""Acc\0""Hora" +#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+""Cur+""Pwr+""Acc\0""Hora" #if defined(CPUARM) #define LEN_VUNITSSYSTEM TR("\006", "\010") diff --git a/src/translations/fr.h b/src/translations/fr.h index 673af6cca..1f6e7485c 100644 --- a/src/translations/fr.h +++ b/src/translations/fr.h @@ -232,7 +232,7 @@ #define TR_RSSI_0 "Tx\0 " #define TR_RSSI_1 "Rx\0 " #endif -#define TR_VTELEMCHNS "---\0""Batt""Chr1""Chr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Alt\0""Rpm\0""Carb""T1\0 ""T2\0 ""Vit\0""Dist""AltG""Elem""Velm""Vfas""Cour""Cnsm""Puis""AccX""AccY""AccZ""Cap\0""VitV""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Vit+""Dst+""Cur+""Acc\0""Time" +#define TR_VTELEMCHNS "---\0""Batt""Chr1""Chr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Alt\0""Rpm\0""Carb""T1\0 ""T2\0 ""Vit\0""Dist""AltG""Elem""Velm""Vfas""Cour""Cnsm""Puis""AccX""AccY""AccZ""Cap\0""VitV""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Vit+""Dst+""Cur+""Pwr+""Acc\0""Time" #if defined(CPUARM) #define LEN_VUNITSSYSTEM TR("\006", "\012") @@ -690,4 +690,4 @@ #define TR_CHR_SHORT 's' #define TR_CHR_LONG 'l' #define TR_CHR_TOGGLE 't' -#define TR_CHR_HOUR 'h' \ No newline at end of file +#define TR_CHR_HOUR 'h' diff --git a/src/translations/it.h b/src/translations/it.h index 02476911d..d4b01800e 100644 --- a/src/translations/it.h +++ b/src/translations/it.h @@ -232,7 +232,7 @@ #define TR_RSSI_0 "Tx\0 " #define TR_RSSI_1 "Rx\0 " #endif -#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Alt\0""Rpm\0""Carb""T1\0 ""T2\0 ""Vel\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsm""Powr""AccX""AccY""AccZ""Dir\0""VelV""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Vel+""Dst+""Cur+""Acc\0""Time" +#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Alt\0""Rpm\0""Carb""T1\0 ""T2\0 ""Vel\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsm""Powr""AccX""AccY""AccZ""Dir\0""VelV""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Vel+""Dst+""Cur+""Pwr+""Acc\0""Time" #if defined(CPUARM) #define LEN_VUNITSSYSTEM TR("\006", "\011") @@ -690,4 +690,4 @@ #define TR_CHR_SHORT 's' #define TR_CHR_LONG 'l' #define TR_CHR_TOGGLE 't' -#define TR_CHR_HOUR 'h' \ No newline at end of file +#define TR_CHR_HOUR 'h' diff --git a/src/translations/pt.h b/src/translations/pt.h index bc6f224e0..ac60d1cb4 100644 --- a/src/translations/pt.h +++ b/src/translations/pt.h @@ -232,7 +232,7 @@ Padding for row alignment #define TR_RSSI_0 "Tx\0 " #define TR_RSSI_1 "Rx\0 " #endif -#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VVel""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Vel+""Dst+""Cur+""Acc\0""Hora" +#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VVel""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Vel+""Dst+""Cur+""Pwr+""Acc\0""Hora" #if defined(CPUARM) #define LEN_VUNITSSYSTEM TR("\006", "\010") @@ -690,4 +690,4 @@ Padding for row alignment #define TR_CHR_SHORT 's' #define TR_CHR_LONG 'l' #define TR_CHR_TOGGLE 't' -#define TR_CHR_HOUR 'h' \ No newline at end of file +#define TR_CHR_HOUR 'h' diff --git a/src/translations/se.h b/src/translations/se.h index de4c479c5..098d88cc0 100644 --- a/src/translations/se.h +++ b/src/translations/se.h @@ -232,7 +232,7 @@ #define TR_RSSI_0 "Tx\0 " #define TR_RSSI_1 "Rx\0 " #endif -#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""H\202jd""Varv""Tank""T1\0 ""T2\0 ""Fart""Avst""GHjd""Batt""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VFrt""A1-\0""A2-\0""Hjd-""Hjd+""Rpm+""T1+\0""T2+\0""Frt+""Avs+""Cur+""Acc\0""Tid\0" +#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""H\202jd""Varv""Tank""T1\0 ""T2\0 ""Fart""Avst""GHjd""Batt""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VFrt""A1-\0""A2-\0""Hjd-""Hjd+""Rpm+""T1+\0""T2+\0""Frt+""Avs+""Cur+""Pwr+""Acc\0""Tid\0" #if defined(CPUARM) #define LEN_VUNITSSYSTEM TR("\006", "\010") @@ -690,4 +690,4 @@ #define TR_CHR_SHORT 's' #define TR_CHR_LONG 'l' #define TR_CHR_TOGGLE 't' -#define TR_CHR_HOUR 'h' \ No newline at end of file +#define TR_CHR_HOUR 'h'