From 8b706b019982af11bd80b9ecf28023281a0cc36a Mon Sep 17 00:00:00 2001
From: Michael Carpenter <malcom2073@gmail.com>
Date: Fri, 12 Jul 2013 14:00:37 -0400
Subject: [PATCH] Change so battery monitor config screen properly reads
 battery voltage now

---
 src/ui/configuration/BatteryMonitorConfig.cc | 18 ++++++++++++++++++
 src/ui/configuration/BatteryMonitorConfig.h  |  2 ++
 2 files changed, 20 insertions(+)

diff --git a/src/ui/configuration/BatteryMonitorConfig.cc b/src/ui/configuration/BatteryMonitorConfig.cc
index 5e74ced..05b6dc2 100644
--- a/src/ui/configuration/BatteryMonitorConfig.cc
+++ b/src/ui/configuration/BatteryMonitorConfig.cc
@@ -32,6 +32,16 @@ BatteryMonitorConfig::BatteryMonitorConfig(QWidget *parent) : AP2ConfigWidget(pa
 
 
 }
+void BatteryMonitorConfig::activeUASSet(UASInterface *uas)
+{
+    if (!uas)
+    {
+        return;
+    }
+    connect(uas,SIGNAL(batteryChanged(UASInterface*,double,double,double,int)),this,SLOT(batteryChanged(UASInterface*,double,double,double,int)));
+    AP2ConfigWidget::activeUASSet(uas);
+}
+
 void BatteryMonitorConfig::calcDividerSet()
 {
     if (!m_uas)
@@ -222,6 +232,14 @@ void BatteryMonitorConfig::apmVerCurrentIndexChanged(int index)
 BatteryMonitorConfig::~BatteryMonitorConfig()
 {
 }
+void BatteryMonitorConfig::batteryChanged(UASInterface* uas, double voltage, double current, double percent, int seconds)
+{
+    ui.calcVoltsLineEdit->setText(QString::number(voltage,'f',2));
+    if (ui.measuredVoltsLineEdit->text() == "")
+    {
+        ui.measuredVoltsLineEdit->setText(ui.calcVoltsLineEdit->text());
+    }
+}
 
 void BatteryMonitorConfig::parameterChanged(int uas, int component, QString parameterName, QVariant value)
 {
diff --git a/src/ui/configuration/BatteryMonitorConfig.h b/src/ui/configuration/BatteryMonitorConfig.h
index 183d782..2bbdb56 100644
--- a/src/ui/configuration/BatteryMonitorConfig.h
+++ b/src/ui/configuration/BatteryMonitorConfig.h
@@ -20,6 +20,8 @@ private slots:
     void calcDividerSet();
     void ampsPerVoltSet();
     void batteryCapacitySet();
+    void activeUASSet(UASInterface *uas);
+    void batteryChanged(UASInterface* uas, double voltage, double current, double percent, int seconds);
 private:
     Ui::BatteryMonitorConfig ui;
 };