diff --git a/radio/src/telemetry/frsky.cpp b/radio/src/telemetry/frsky.cpp
index 185f1dd1a..363bb3d73 100644
--- a/radio/src/telemetry/frsky.cpp
+++ b/radio/src/telemetry/frsky.cpp
@@ -608,12 +608,7 @@ void telemetryInit(void)
   // we don't reset the telemetry here as we would also reset the consumption after model load
 }
 
-
-#if defined(CPUARM)
-void frskySetCellVoltage(uint8_t battnumber, uint16_t cellVolts) {
-#elif defined(FRSKY_HUB)
-void frskySetCellVoltage(uint8_t battnumber, uint8_t cellVolts) {
-#endif
+void frskySetCellVoltage(uint8_t battnumber, frskyCellVoltage_t cellVolts) {
   frskyData.hub.cellVolts[battnumber] = cellVolts;
   if (!frskyData.hub.minCellVolts || cellVolts<frskyData.hub.minCellVolts || battnumber==frskyData.hub.minCellIdx) {
     //update minimum cell voltage (Cell) and its cell number 
@@ -628,3 +623,14 @@ void frskySetCellVoltage(uint8_t battnumber, uint8_t cellVolts) {
   }
 }
 
+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;
+    }
+    frskyCellVoltage_t cellVolts = (frskyCellVoltage_t) (((((frskyData.hub.volts & 0xFF00) >> 8) + ((frskyData.hub.volts & 0x000F) << 8))) / (5*TELEMETRY_CELL_VOLTAGE_MUTLIPLIER));
+    frskySetCellVoltage(battnumber, cellVolts);
+  }
+}
diff --git a/radio/src/telemetry/frsky.h b/radio/src/telemetry/frsky.h
index a2afca3bf..a4dca8893 100644
--- a/radio/src/telemetry/frsky.h
+++ b/radio/src/telemetry/frsky.h
@@ -462,9 +462,12 @@ void telemetryInit(void);
 void telemetryInterrupt10ms(void);
 
 #if defined(CPUARM)
-void frskySetCellVoltage(uint8_t battnumber, uint16_t cellVolts);
+  typedef uint16_t frskyCellVoltage_t;
 #elif defined(FRSKY_HUB)
-void frskySetCellVoltage(uint8_t battnumber, uint8_t cellVolts);
+  typedef uint16_t frskyCellVoltage_t;
 #endif
 
+void frskySetCellVoltage(uint8_t battnumber, frskyCellVoltage_t cellVolts);
+void frskyUpdateCells(void);
+
 #endif
diff --git a/radio/src/telemetry/frsky_d.cpp b/radio/src/telemetry/frsky_d.cpp
index 8c9d2da9d..b136a543a 100644
--- a/radio/src/telemetry/frsky_d.cpp
+++ b/radio/src/telemetry/frsky_d.cpp
@@ -216,19 +216,7 @@ void parseTelemHubByte(uint8_t byte)
 
     case offsetof(FrskySerialData, volts):
     {
-      // 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;
-        }
-#if defined(CPUARM)
-        uint16_t cellVolts = (uint16_t)(((((frskyData.hub.volts & 0xFF00) >> 8) + ((frskyData.hub.volts & 0x000F) << 8))) / 5);
-#else
-        uint8_t cellVolts = (uint8_t)(((((frskyData.hub.volts & 0xFF00) >> 8) + ((frskyData.hub.volts & 0x000F) << 8))) / 10);
-#endif
-        frskySetCellVoltage(battnumber, cellVolts);
-      }
+      frskyUpdateCells();
       break;
     }
 
diff --git a/radio/src/telemetry/frsky_sport.cpp b/radio/src/telemetry/frsky_sport.cpp
index 2603d9da7..d591cf7b7 100644
--- a/radio/src/telemetry/frsky_sport.cpp
+++ b/radio/src/telemetry/frsky_sport.cpp
@@ -237,19 +237,7 @@ void processHubPacket(uint8_t id, uint16_t value)
 
     case VOLTS_ID:
     {
-      // 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;
-        }
-#if defined(CPUARM)
-        uint16_t cellVolts = (uint16_t)(((((frskyData.hub.volts & 0xFF00) >> 8) + ((frskyData.hub.volts & 0x000F) << 8))) / 5);
-#else
-        uint8_t cellVolts = (uint8_t)(((((frskyData.hub.volts & 0xFF00) >> 8) + ((frskyData.hub.volts & 0x000F) << 8))) / 10);
-#endif
-        frskySetCellVoltage(battnumber, cellVolts);
-      }
+      frskyUpdateCells();
       break;
     }
 
@@ -467,8 +455,8 @@ void frskySportProcessPacket(uint8_t *packet)
       else if (appId >= CELLS_FIRST_ID && appId <= CELLS_LAST_ID) {
         uint32_t cells = SPORT_DATA_U32(packet);
         uint8_t battnumber = cells & 0xF;
-        frskySetCellVoltage(battnumber,   (uint16_t) ((cells & 0x000FFF00) >>  8) / 5);
-        frskySetCellVoltage(battnumber+1, (uint16_t) ((cells & 0xFFF00000) >> 20) / 5);
+        frskySetCellVoltage(battnumber,   (frskyCellVoltage_t) ((cells & 0x000FFF00) >>  8) / 5);
+        frskySetCellVoltage(battnumber+1, (frskyCellVoltage_t) ((cells & 0xFFF00000) >> 20) / 5);
       }
       break;
   }