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

Fixes #1277

Browse Source
This commit is contained in:
bsongis
2014-06-14 11:20:40 +02:00
parent d6ef1c011b
commit 726a03d433
14 changed files with 39 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/eeprom_conversions.cpp
+2 -2
View File
@@ -678,8 +678,8 @@ void ConvertModel_215_to_216(ModelData &model)
if (cstate == LS_FAMILY_OFS || cstate == LS_FAMILY_DIFF) {
if ((uint8_t)sw.v1 >= MIXSRC_FIRST_TELEM) {
switch ((uint8_t)sw.v1) {
case MIXSRC_FIRST_TELEM + TELEM_TM1-1:
case MIXSRC_FIRST_TELEM + TELEM_TM2-1:
case MIXSRC_FIRST_TELEM + TELEM_TIMER1-1:
case MIXSRC_FIRST_TELEM + TELEM_TIMER2-1:
sw.v2 = (sw.v2+128) * 3;
break;
case MIXSRC_FIRST_TELEM + TELEM_ALT-1:
radio/src/gui/view_telemetry.cpp
+3 -3
View File
@@ -235,7 +235,7 @@ void menuTelemetryFrsky(uint8_t event)
#endif
getvalue_t threshold = 0;
uint8_t thresholdX = 0;
if (source <= TELEM_TM2)
if (source <= TELEM_TIMER2)
threshold = 0;
else if (source <= TELEM_RSSI_RX)
threshold = getRssiAlarmValue(source-TELEM_RSSI_TX);
@@ -331,9 +331,9 @@ void menuTelemetryFrsky(uint8_t event)
#endif
putsTelemetryChannel(pos[j+1]-2, 1+FH+2*FH*i, field-1, value, att);
if (field >= TELEM_TM1 && field <= TELEM_TM2 && i!=3) {
if (field >= TELEM_TIMER1 && field <= TELEM_TIMER2 && i!=3) {
// there is not enough space on LCD for displaying "Tmr1" or "Tmr2" and still see the - sign, we write "T1" or "T2" instead
field = field-TELEM_TM1+TELEM_T1;
field = field-TELEM_TIMER1+TELEM_T1;
}
lcd_putsiAtt(pos[j], 1+FH+2*FH*i, STR_VTELEMCHNS, field, 0);
}
radio/src/lcd.cpp
+6 -6
View File
@@ -860,12 +860,12 @@ void lcdDrawTelemetryTopBar()
if (g_model.timers[0].mode) {
att = (timersStates[0].val<0 ? BLINK : 0);
putsTimer(22*FW+5*FWNUM+3, 0, timersStates[0].val, att, att);
lcd_putsiAtt(18*FW+2, 1, STR_VTELEMCHNS, TELEM_TM1, SMLSIZE);
lcd_putsiAtt(18*FW+2, 1, STR_VTELEMCHNS, TELEM_TIMER1, SMLSIZE);
}
if (g_model.timers[1].mode) {
att = (timersStates[1].val<0 ? BLINK : 0);
putsTimer(31*FW+5*FWNUM+3, 0, timersStates[1].val, att, att);
lcd_putsiAtt(27*FW+2, 1, STR_VTELEMCHNS, TELEM_TM2, SMLSIZE);
lcd_putsiAtt(27*FW+2, 1, STR_VTELEMCHNS, TELEM_TIMER2, SMLSIZE);
}
lcd_invert_line(0);
}
@@ -1214,8 +1214,8 @@ void putsTelemetryChannel(xcoord_t x, uint8_t y, uint8_t channel, lcdint_t val,
break;
}
#endif
case TELEM_TM1-1:
case TELEM_TM2-1:
case TELEM_TIMER1-1:
case TELEM_TIMER2-1:
att &= ~NO_UNIT;
putsTimer(x, y, val, att, att);
break;
@@ -1346,8 +1346,8 @@ void putsTelemetryChannel(xcoord_t x, uint8_t y, uint8_t channel, lcdint_t val,
void putsTelemetryChannel(xcoord_t x, uint8_t y, uint8_t channel, lcdint_t val, uint8_t att)
{
switch (channel) {
case TELEM_TM1-1:
case TELEM_TM2-1:
case TELEM_TIMER1-1:
case TELEM_TIMER2-1:
att &= ~NO_UNIT;
putsTimer(x, y, val, att, att);
break;
radio/src/mixer.cpp
+1 -1
View File
@@ -325,7 +325,7 @@ getvalue_t getValue(uint8_t i)
return t.tm_hour*60 + t.tm_min;
}
#endif
else if (i<=MIXSRC_FIRST_TELEM-1+TELEM_TM2) return timersStates[i-MIXSRC_FIRST_TELEM+1-TELEM_TM1].val;
else if (i<=MIXSRC_FIRST_TELEM-1+TELEM_TIMER2) return timersStates[i-MIXSRC_FIRST_TELEM+1-TELEM_TIMER1].val;
#if defined(FRSKY)
#if defined(CPUARM)
else if (i==MIXSRC_FIRST_TELEM-1+TELEM_SWR) return frskyData.swr.value;
radio/src/myeeprom.h
+4 -4
View File
@@ -1030,8 +1030,8 @@ enum TelemetrySource {
TELEM_RESERVE4,
TELEM_RESERVE5,
#endif
TELEM_TM1,
TELEM_TM2,
TELEM_TIMER1,
TELEM_TIMER2,
#if defined(CPUARM)
TELEM_SWR,
#endif
@@ -1115,7 +1115,7 @@ enum TelemetrySource {
#if defined(FRSKY)
TELEM_DISPLAY_MAX = TELEM_MAX_POWER,
#else
TELEM_DISPLAY_MAX = TELEM_TM2, // because used also in PlayValue
TELEM_DISPLAY_MAX = TELEM_TIMER2, // because used also in PlayValue
#endif
TELEM_STATUS_MAX = TELEM_GPS_TIME,
TELEM_FIRST_STREAMED_VALUE = TELEM_RSSI_TX,
@@ -1145,7 +1145,7 @@ enum VarioSource {
#elif defined(MAVLINK)
#define NUM_TELEMETRY 4
#else
#define NUM_TELEMETRY TELEM_TM2
#define NUM_TELEMETRY TELEM_TIMER2
#endif
PACK(typedef struct t_FrSkyBarData {
radio/src/opentx.cpp
+7 -4
View File
@@ -731,6 +731,9 @@ ls_telemetry_value_t maxTelemValue(uint8_t channel)
#if defined(CPUARM)
case TELEM_TX_TIME:
return 24*60-1;
case TELEM_TIMER1:
case TELEM_TIMER2:
return 60*60;
#endif
case TELEM_FUEL:
#if defined(CPUARM)
@@ -783,8 +786,8 @@ getvalue_t convert8bitsTelemValue(uint8_t channel, ls_telemetry_value_t value)
{
getvalue_t result;
switch (channel) {
case TELEM_TM1:
case TELEM_TM2:
case TELEM_TIMER1:
case TELEM_TIMER2:
result = value * 5;
break;
#if defined(FRSKY)
@@ -1646,8 +1649,8 @@ PLAY_FUNCTION(playValue, uint8_t idx)
case MIXSRC_FIRST_TELEM+TELEM_TX_VOLTAGE-1:
PLAY_NUMBER(val, 1+UNIT_VOLTS, PREC1);
break;
case MIXSRC_FIRST_TELEM+TELEM_TM1-1:
case MIXSRC_FIRST_TELEM+TELEM_TM2-1:
case MIXSRC_FIRST_TELEM+TELEM_TIMER1-1:
case MIXSRC_FIRST_TELEM+TELEM_TIMER2-1:
PLAY_DURATION(val, 0);
break;
#if defined(CPUARM) && defined(FRSKY)
radio/src/translations/tts_cz.cpp
+2 -2
View File
@@ -58,8 +58,8 @@ enum CzechPrompts {
CZ_PROMPT_G = CZ_PROMPT_UNITS_BASE+(UNIT_G*4),
CZ_PROMPT_LABELS_BASE = 194,
CZ_PROMPT_TIMER1 = CZ_PROMPT_LABELS_BASE+TELEM_TM1,
CZ_PROMPT_TIMER2 = CZ_PROMPT_LABELS_BASE+TELEM_TM2,
CZ_PROMPT_TIMER1 = CZ_PROMPT_LABELS_BASE+TELEM_TIMER1,
CZ_PROMPT_TIMER2 = CZ_PROMPT_LABELS_BASE+TELEM_TIMER2,
CZ_PROMPT_RSSI_TX = CZ_PROMPT_LABELS_BASE+TELEM_RSSI_TX,
CZ_PROMPT_RSSI_RX = CZ_PROMPT_LABELS_BASE+TELEM_RSSI_RX,
CZ_PROMPT_A1 = CZ_PROMPT_LABELS_BASE+TELEM_A1,
radio/src/translations/tts_de.cpp
+2 -2
View File
@@ -59,8 +59,8 @@ enum GermanPrompts {
DE_PROMPT_G= DE_PROMPT_UNITS_BASE+UNIT_G,
DE_PROMPT_LABELS_BASE = 128,
DE_PROMPT_TIMER1 = DE_PROMPT_LABELS_BASE+TELEM_TM1,
DE_PROMPT_TIMER2 = DE_PROMPT_LABELS_BASE+TELEM_TM2,
DE_PROMPT_TIMER1 = DE_PROMPT_LABELS_BASE+TELEM_TIMER1,
DE_PROMPT_TIMER2 = DE_PROMPT_LABELS_BASE+TELEM_TIMER2,
DE_PROMPT_RSSI_TX = DE_PROMPT_LABELS_BASE+TELEM_RSSI_TX,
DE_PROMPT_RSSI_RX = DE_PROMPT_LABELS_BASE+TELEM_RSSI_RX,
DE_PROMPT_A1 = DE_PROMPT_LABELS_BASE+TELEM_A1,
radio/src/translations/tts_es.cpp
+2 -2
View File
@@ -83,8 +83,8 @@ enum SpanishPrompts {
ES_PROMPT_G= ES_PROMPT_UNITS_BASE+UNIT_G,
ES_PROMPT_LABELS_BASE = 139,
ES_PROMPT_TIMER1 = ES_PROMPT_LABELS_BASE+TELEM_TM1,
ES_PROMPT_TIMER2 = ES_PROMPT_LABELS_BASE+TELEM_TM2,
ES_PROMPT_TIMER1 = ES_PROMPT_LABELS_BASE+TELEM_TIMER1,
ES_PROMPT_TIMER2 = ES_PROMPT_LABELS_BASE+TELEM_TIMER2,
ES_PROMPT_RSSI_TX = ES_PROMPT_LABELS_BASE+TELEM_RSSI_TX,
ES_PROMPT_RSSI_RX = ES_PROMPT_LABELS_BASE+TELEM_RSSI_RX,
ES_PROMPT_A1 = ES_PROMPT_LABELS_BASE+TELEM_A1,
radio/src/translations/tts_fr.cpp
+2 -2
View File
@@ -64,8 +64,8 @@ enum FrenchPrompts {
FR_PROMPT_SECONDE = FR_PROMPT_UNITS_BASE+UNIT_SECONDS,
FR_PROMPT_LABELS_BASE = 145,
FR_PROMPT_TIMER1 = FR_PROMPT_LABELS_BASE+TELEM_TM1,
FR_PROMPT_TIMER2 = FR_PROMPT_LABELS_BASE+TELEM_TM2,
FR_PROMPT_TIMER1 = FR_PROMPT_LABELS_BASE+TELEM_TIMER1,
FR_PROMPT_TIMER2 = FR_PROMPT_LABELS_BASE+TELEM_TIMER2,
FR_PROMPT_RSSI_TX = FR_PROMPT_LABELS_BASE+TELEM_RSSI_TX,
FR_PROMPT_RSSI_RX = FR_PROMPT_LABELS_BASE+TELEM_RSSI_RX,
FR_PROMPT_A1 = FR_PROMPT_LABELS_BASE+TELEM_A1,
radio/src/translations/tts_it.cpp
+2 -2
View File
@@ -55,8 +55,8 @@ enum ItalianPrompts {
IT_PROMPT_KTS = IT_PROMPT_UNITS_BASE+UNIT_KTS,
IT_PROMPT_LABELS_BASE = 131,
IT_PROMPT_TIMER1 = IT_PROMPT_LABELS_BASE+TELEM_TM1,
IT_PROMPT_TIMER2 = IT_PROMPT_LABELS_BASE+TELEM_TM2,
IT_PROMPT_TIMER1 = IT_PROMPT_LABELS_BASE+TELEM_TIMER1,
IT_PROMPT_TIMER2 = IT_PROMPT_LABELS_BASE+TELEM_TIMER2,
IT_PROMPT_RSSI_TX = IT_PROMPT_LABELS_BASE+TELEM_RSSI_TX,
IT_PROMPT_RSSI_RX = IT_PROMPT_LABELS_BASE+TELEM_RSSI_RX,
IT_PROMPT_A1 = IT_PROMPT_LABELS_BASE+TELEM_A1,
radio/src/translations/tts_pl.cpp
+2 -2
View File
@@ -59,8 +59,8 @@ enum PolishPrompts {
PL_PROMPT_G = PL_PROMPT_UNITS_BASE+(UNIT_G*4),
PL_PROMPT_LABELS_BASE = 250,
PL_PROMPT_TIMER1 = PL_PROMPT_LABELS_BASE+TELEM_TM1,
PL_PROMPT_TIMER2 = PL_PROMPT_LABELS_BASE+TELEM_TM2,
PL_PROMPT_TIMER1 = PL_PROMPT_LABELS_BASE+TELEM_TIMER1,
PL_PROMPT_TIMER2 = PL_PROMPT_LABELS_BASE+TELEM_TIMER2,
PL_PROMPT_RSSI_TX = PL_PROMPT_LABELS_BASE+TELEM_RSSI_TX,
PL_PROMPT_RSSI_RX = PL_PROMPT_LABELS_BASE+TELEM_RSSI_RX,
PL_PROMPT_A1 = PL_PROMPT_LABELS_BASE+TELEM_A1,
radio/src/translations/tts_pt.cpp
+2 -2
View File
@@ -78,8 +78,8 @@ enum PortuguesePrompts {
PT_PROMPT_KTS = PT_PROMPT_UNITS_BASE+UNIT_KTS,
PT_PROMPT_LABELS_BASE = 140,
PT_PROMPT_TIMER1 = PT_PROMPT_LABELS_BASE+TELEM_TM1,
PT_PROMPT_TIMER2 = PT_PROMPT_LABELS_BASE+TELEM_TM2,
PT_PROMPT_TIMER1 = PT_PROMPT_LABELS_BASE+TELEM_TIMER1,
PT_PROMPT_TIMER2 = PT_PROMPT_LABELS_BASE+TELEM_TIMER2,
PT_PROMPT_RSSI_TX = PT_PROMPT_LABELS_BASE+TELEM_RSSI_TX,
PT_PROMPT_RSSI_RX = PT_PROMPT_LABELS_BASE+TELEM_RSSI_RX,
PT_PROMPT_A1 = PT_PROMPT_LABELS_BASE+TELEM_A1,
radio/src/translations/tts_sk.cpp
+2 -2
View File
@@ -73,8 +73,8 @@ enum SlovakPrompts {
SK_PROMPT_G = SK_PROMPT_UNITS_BASE+(UNIT_G*4),
SK_PROMPT_LABELS_BASE = 194,
SK_PROMPT_TIMER1 = SK_PROMPT_LABELS_BASE+TELEM_TM1,
SK_PROMPT_TIMER2 = SK_PROMPT_LABELS_BASE+TELEM_TM2,
SK_PROMPT_TIMER1 = SK_PROMPT_LABELS_BASE+TELEM_TIMER1,
SK_PROMPT_TIMER2 = SK_PROMPT_LABELS_BASE+TELEM_TIMER2,
SK_PROMPT_RSSI_TX = SK_PROMPT_LABELS_BASE+TELEM_RSSI_TX,
SK_PROMPT_RSSI_RX = SK_PROMPT_LABELS_BASE+TELEM_RSSI_RX,
SK_PROMPT_A1 = SK_PROMPT_LABELS_BASE+TELEM_A1,