From f8efcf420a996a80a6ef7e8ad8fbb2b0e1bedf9f Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@gmail.com>
Date: Tue, 8 Jul 2014 11:38:47 +0200
Subject: [PATCH] 200 extra bytes used on 9x with FRSKY_HUB option. I return to
 previous implementation. Only ARM boards will have the extra features.

---
 radio/src/telemetry/frsky.cpp   | 26 +++++++++++++++++++++++---
 radio/src/telemetry/frsky.h     |  2 +-
 radio/src/telemetry/frsky_d.cpp |  2 --
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/radio/src/telemetry/frsky.cpp b/radio/src/telemetry/frsky.cpp
index 5739c1e91..ad19ce4fe 100644
--- a/radio/src/telemetry/frsky.cpp
+++ b/radio/src/telemetry/frsky.cpp
@@ -428,9 +428,10 @@ void telemetryWakeup()
 
 void telemetryInterrupt10ms()
 {
+#if defined(CPUARM)
   uint16_t voltage = frskyData.hub.cellsSum; /* unit: 1/10 volts */
-
-#if defined(FRSKY_HUB)
+#elif defined(FRSKY_HUB)
+  uint16_t voltage = 0; /* unit: 1/10 volts */
   for (uint8_t i=0; i<frskyData.hub.cellsCount; i++)
     voltage += frskyData.hub.cellVolts[i];
   voltage /= (10 / TELEMETRY_CELL_VOLTAGE_MUTLIPLIER);
@@ -609,7 +610,7 @@ void telemetryInit(void)
   // we don't reset the telemetry here as we would also reset the consumption after model load
 }
 
-#if defined(CPUARM) || defined(FRSKY_HUB)
+#if defined(CPUARM)
 void frskySetCellsCount(uint8_t cellscount)
 {
   if (cellscount <= DIM(frskyData.hub.cellVolts)) {
@@ -671,4 +672,23 @@ void frskyUpdateCells(void)
   frskyCellVoltage_t cellVolts = (frskyCellVoltage_t) (((((frskyData.hub.volts & 0xFF00) >> 8) + ((frskyData.hub.volts & 0x000F) << 8))) / (5*TELEMETRY_CELL_VOLTAGE_MUTLIPLIER));
   frskySetCellVoltage(battnumber, cellVolts);
 }
+#elif defined(FRSKY_HUB)
+void frskyUpdateCells(void)
+{
+  // Voltage => Cell number + Cell voltage
+  uint8_t battnumber = ((frskyData.hub.volts & 0x00F0) >> 4);
+  if (battnumber < 12) {
+    if (frskyData.hub.cellsCount < battnumber+1) {
+      frskyData.hub.cellsCount = battnumber+1;
+    }
+    uint8_t cellVolts = (uint8_t)(((((frskyData.hub.volts & 0xFF00) >> 8) + ((frskyData.hub.volts & 0x000F) << 8))) / 10);
+    frskyData.hub.cellVolts[battnumber] = cellVolts;
+    if (!frskyData.hub.minCellVolts || cellVolts<frskyData.hub.minCellVolts || battnumber==frskyData.hub.minCellIdx) {
+      frskyData.hub.minCellIdx = battnumber;
+      frskyData.hub.minCellVolts = cellVolts;
+      if (!frskyData.hub.minCell || frskyData.hub.minCellVolts<frskyData.hub.minCell)
+        frskyData.hub.minCell = frskyData.hub.minCellVolts;
+    }
+  }
+}
 #endif
diff --git a/radio/src/telemetry/frsky.h b/radio/src/telemetry/frsky.h
index 6beee4c0b..589a6fa53 100644
--- a/radio/src/telemetry/frsky.h
+++ b/radio/src/telemetry/frsky.h
@@ -232,7 +232,7 @@ PACK(struct FrskySerialData {
   uint16_t gpsDistance;
   int16_t  gpsAltitudeOffset;
   uint8_t  varioAltitudeQueuePointer;     // circular-buffer pointer
-  uint8_t  cellsState;
+  uint8_t  minCellIdx;
   int16_t  cellsSum;
   uint16_t currentConsumption; // 0x35 openXsensor only! Otherwise calculated by the Tx from current
   uint16_t currentPrescale;
diff --git a/radio/src/telemetry/frsky_d.cpp b/radio/src/telemetry/frsky_d.cpp
index b136a543a..59efb210d 100644
--- a/radio/src/telemetry/frsky_d.cpp
+++ b/radio/src/telemetry/frsky_d.cpp
@@ -215,10 +215,8 @@ void parseTelemHubByte(uint8_t byte)
 #endif
 
     case offsetof(FrskySerialData, volts):
-    {
       frskyUpdateCells();
       break;
-    }
 
 #if defined(GPS)
     case offsetof(FrskySerialData, hour):