From db311eb78c2093f20b5a6d93ecab168bb216a19d Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@gmail.com>
Date: Mon, 26 May 2014 22:00:26 +0200
Subject: [PATCH] RxBatt ok in Companion

---
 companion/src/eeprominterface.cpp     | 2 +-
 companion/src/modeledit/telemetry.cpp | 8 ++++----
 radio/src/opentx.cpp                  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/companion/src/eeprominterface.cpp b/companion/src/eeprominterface.cpp
index 86c17f319..468a0c5a2 100644
--- a/companion/src/eeprominterface.cpp
+++ b/companion/src/eeprominterface.cpp
@@ -991,7 +991,7 @@ void FrSkyData::clear()
   memset(this, 0, sizeof(FrSkyData));
   rssiAlarms[0].clear(2, 45);
   rssiAlarms[1].clear(3, 42);
-  rxBattAlarms[1] = round(4.3/0.05);
+  rxBattAlarms[1] = round(43.0*255/132);
   varioSource = 2/*VARIO*/;
   blades = 2;
 }
diff --git a/companion/src/modeledit/telemetry.cpp b/companion/src/modeledit/telemetry.cpp
index 2c7e1c927..4456d6f4c 100644
--- a/companion/src/modeledit/telemetry.cpp
+++ b/companion/src/modeledit/telemetry.cpp
@@ -523,8 +523,8 @@ void TelemetryPanel::setup()
     lock = true;
 
     if (IS_ARM(firmware->getBoard())) {
-      ui->rxbattAlarm1DSB->setValue(0.05*model.frsky.rxBattAlarms[0]);
-      ui->rxbattAlarm2DSB->setValue(0.05*model.frsky.rxBattAlarms[1]);
+      ui->rxbattAlarm1DSB->setValue((13.2*model.frsky.rxBattAlarms[0])/255);
+      ui->rxbattAlarm2DSB->setValue((13.2*model.frsky.rxBattAlarms[1])/255);
     }
     else {
       ui->rxbattLabel->hide();
@@ -776,13 +776,13 @@ void TelemetryPanel::on_varioLimitMin_DSB_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();
 }
 
 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();
 }
 
diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index 000e02709..b76f93eef 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -420,7 +420,7 @@ void modelDefault(uint8_t id)
 #if defined(PCBTARANIS)
   g_model.frsky.channels[0].ratio = 132;
   g_model.rxBattAlarms[0] = 0;
-  g_model.rxBattAlarms[1] = 43;
+  g_model.rxBattAlarms[1] = 83; // 4.3V
 #endif
 
 #if defined(MAVLINK)