Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-19 06:15:10 +03:00
Code Issues Wiki Activity

RxBatt ok in Companion

Browse source
This commit is contained in:
bsongis 2014-05-26 22:00:26 +02:00
parent 170cbddb13
commit db311eb78c
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
companion/src/eeprominterface.cpp
View file

@ -991,7 +991,7 @@ void FrSkyData::clear()
memset(this, 0, sizeof(FrSkyData)); memset(this, 0, sizeof(FrSkyData));
rssiAlarms[0].clear(2, 45); rssiAlarms[0].clear(2, 45);
rssiAlarms[1].clear(3, 42); rssiAlarms[1].clear(3, 42);
rxBattAlarms[1] = round(4.3/0.05); rxBattAlarms[1] = round(43.0*255/132);
varioSource = 2/*VARIO*/; varioSource = 2/*VARIO*/;
blades = 2; blades = 2;
} }

8
companion/src/modeledit/telemetry.cpp
View file

@ -523,8 +523,8 @@ void TelemetryPanel::setup()
lock = true; lock = true;
if (IS_ARM(firmware->getBoard())) { if (IS_ARM(firmware->getBoard())) {
ui->rxbattAlarm1DSB->setValue(0.05*model.frsky.rxBattAlarms[0]); ui->rxbattAlarm1DSB->setValue((13.2*model.frsky.rxBattAlarms[0])/255);
ui->rxbattAlarm2DSB->setValue(0.05*model.frsky.rxBattAlarms[1]); ui->rxbattAlarm2DSB->setValue((13.2*model.frsky.rxBattAlarms[1])/255);
} }
else { else {
ui->rxbattLabel->hide(); ui->rxbattLabel->hide();
@ -776,13 +776,13 @@ void TelemetryPanel::on_varioLimitMin_DSB_editingFinished()
void TelemetryPanel::on_rxbattAlarm1DSB_editingFinished() void TelemetryPanel::on_rxbattAlarm1DSB_editingFinished()
{ {
model.frsky.rxBattAlarms[0] = round(ui->rxbattAlarm1DSB->value()/0.05); model.frsky.rxBattAlarms[0] = round(ui->rxbattAlarm1DSB->value()/(13.2/255));
emit modified(); emit modified();
} }
void TelemetryPanel::on_rxbattAlarm2DSB_editingFinished() void TelemetryPanel::on_rxbattAlarm2DSB_editingFinished()
{ {
model.frsky.rxBattAlarms[1] = round(ui->rxbattAlarm2DSB->value()/0.05); model.frsky.rxBattAlarms[1] = round(ui->rxbattAlarm2DSB->value()/(13.2/255));
emit modified(); emit modified();
} }

2
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] = 43; g_model.rxBattAlarms[1] = 83; // 4.3V
#endif #endif
#if defined(MAVLINK) #if defined(MAVLINK)