Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-23 16:25:16 +03:00
Code Issues Wiki Activity

RxBatt now ok!

Browse source
This commit is contained in:
bsongis 2014-05-26 21:38:19 +02:00
parent 5ac583c598
commit 331fb9d588
5 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
radio/src/gui/menu_model.cpp
View file

@ -5531,7 +5531,7 @@ void menuModelTelemetry(uint8_t event)
lcd_putsLeft(y, (alarm==0 ? STR_LOWALARM : STR_CRITICALALARM)); lcd_putsLeft(y, (alarm==0 ? STR_LOWALARM : STR_CRITICALALARM));
putsTelemetryChannel(TELEM_COL2, y, TELEM_RXBATT-1, g_model.rxBattAlarms[alarm], LEFT|attr); putsTelemetryChannel(TELEM_COL2, y, TELEM_RXBATT-1, g_model.rxBattAlarms[alarm], LEFT|attr);
if (attr && (s_editMode>0 || p1valdiff)) { if (attr && (s_editMode>0 || p1valdiff)) {
g_model.rxBattAlarms[alarm] = checkIncDec(event, g_model.rxBattAlarms[alarm], 0, 255, EE_MODEL); g_model.rxBattAlarms[alarm] = checkIncDec(event, g_model.rxBattAlarms[alarm], 0, 132, EE_MODEL);
} }
break; break;
} }

2
radio/src/lcd.cpp
View file

@ -1217,7 +1217,7 @@ void putsTelemetryChannel(xcoord_t x, uint8_t y, uint8_t channel, lcdint_t val,
break; break;
#if defined(CPUARM) #if defined(CPUARM)
case TELEM_RXBATT-1: case TELEM_RXBATT-1:
val *= 5; val = ((val*1320) + 127) / 255;
#if LCD_W >= 212 #if LCD_W >= 212
att |= PREC2; att |= PREC2;
#else #else

4
radio/src/opentx.cpp
View file

@ -420,7 +420,7 @@ void modelDefault(uint8_t id)
#if defined(PCBTARANIS) #if defined(PCBTARANIS)
g_model.frsky.channels[0].ratio = 132; g_model.frsky.channels[0].ratio = 132;
g_model.rxBattAlarms[0] = 0; g_model.rxBattAlarms[0] = 0;
g_model.rxBattAlarms[1] = 86; g_model.rxBattAlarms[1] = 43;
#endif #endif
#if defined(MAVLINK) #if defined(MAVLINK)
@ -1636,7 +1636,7 @@ PLAY_FUNCTION(playValue, uint8_t idx)
break; break;
case MIXSRC_FIRST_TELEM+TELEM_RXBATT-1: case MIXSRC_FIRST_TELEM+TELEM_RXBATT-1:
if (TELEMETRY_STREAMING()) { if (TELEMETRY_STREAMING()) {
PLAY_NUMBER(val/2, 1+UNIT_VOLTS, PREC1); PLAY_NUMBER((val*132+127)/255, 1+UNIT_VOLTS, PREC1);
} }
break; break;
#endif #endif

2
radio/src/telemetry/frsky.cpp
View file

@ -435,7 +435,7 @@ void telemetryInterrupt10ms()
uint8_t channel = g_model.frsky.voltsSource; uint8_t channel = g_model.frsky.voltsSource;
#if defined(CPUARM) #if defined(CPUARM)
if (channel == FRSKY_VOLTS_SOURCE_RXBATT) { if (channel == FRSKY_VOLTS_SOURCE_RXBATT) {
voltage = frskyData.analog[TELEM_ANA_RXBATT].value / 2; voltage = ((frskyData.analog[TELEM_ANA_RXBATT].value * 132) + 127) / 255;
} }
else if (channel <= FRSKY_VOLTS_SOURCE_A4) { else if (channel <= FRSKY_VOLTS_SOURCE_A4) {
voltage = applyChannelRatio(channel, frskyData.analog[channel].value) / 10; voltage = applyChannelRatio(channel, frskyData.analog[channel].value) / 10;

2
radio/src/telemetry/frsky_sport.cpp
View file

@ -321,7 +321,7 @@ void frskySportProcessPacket(uint8_t *packet)
#endif #endif
} }
else if (appId == BATT_ID) { else if (appId == BATT_ID) {
frskyData.analog[TELEM_ANA_RXBATT].set((SPORT_DATA_U32(packet)*132/255)/5, UNIT_VOLTS); frskyData.analog[TELEM_ANA_RXBATT].set(SPORT_DATA_U8(packet), UNIT_VOLTS);
} }
else if ((appId >> 8) == 0) { else if ((appId >> 8) == 0) {
// The old FrSky IDs // The old FrSky IDs