Battery Scaling Corrected in BF3.1.0

Author: GaryKeeble

changelog.html

@@ -57,6 +57,7 @@ <h2> 2.5.8 - DShot Logging and Minor Bug Fixes</h2>
         <li>Add OSD and ESC features options to header dialog.</li>
         <li>Add new BF3.1.0 parameters to header dialog.</li>
         <li>Add user setting to show raw values on legend.</li>
+        <li>Correct VBAT scaling for BF3.1.0.</li>
     </ul>
 
     <h2> 2.5.7 - Minor Bug Fixes and Feature Improvements</h2>

js/flightlog.js

@@ -252,9 +252,15 @@ function FlightLog(logData) {
             i,
             fieldNames = that.getMainFieldNames(),
             sysConfig = that.getSysConfig(),
-            refVoltage = that.vbatADCToMillivolts(sysConfig.vbatref) / 100,
             found = false;
 
+        var refVoltage;
+        if(sysConfig.firmwareType == FIRMWARE_TYPE_BETAFLIGHT && semver.gte(sysConfig.firmwareVersion, '3.1.0')) {
+            refVoltage = sysConfig.vbatref;
+        } else {
+            refVoltage = that.vbatADCToMillivolts(sysConfig.vbatref) / 100;
+        }
+
         //Are we even logging VBAT?
         if (!fieldNameToIndex.vbatLatest) {
             numCells = false;
@@ -1092,7 +1098,12 @@ FlightLog.prototype.getPIDPercentage = function(value) {
 
 
 FlightLog.prototype.getReferenceVoltageMillivolts = function() {
-    return this.vbatADCToMillivolts(this.getSysConfig().vbatref);
+    if(this.getSysConfig().firmwareType == FIRMWARE_TYPE_BETAFLIGHT && semver.gte(this.getSysConfig().firmwareVersion, '3.1.0')) {
+        return this.getSysConfig().vbatref * 100;
+    } else {
+        return this.vbatADCToMillivolts(this.getSysConfig().vbatref);
+    }
+
 };
 
 FlightLog.prototype.vbatADCToMillivolts = function(vbatADC) {

js/flightlog_fields_presenter.js

@@ -314,11 +314,19 @@ function FlightLogFieldPresenter() {
                 return flightLog.accRawToGs(value).toFixed(2) + "g";
 
             case 'vbatLatest':
-                return (flightLog.vbatADCToMillivolts(value) / 1000).toFixed(2) + "V" + ", " + (flightLog.vbatADCToMillivolts(value) / 1000 / flightLog.getNumCellsEstimate()).toFixed(2) + "V/cell";
-    
+                if(flightLog.getSysConfig().firmwareType == FIRMWARE_TYPE_BETAFLIGHT && semver.gte(flightLog.getSysConfig().firmwareVersion, '3.1.0')) {
+                    return (value / 10).toFixed(2) + "V" + ", " + (value / 10 / flightLog.getNumCellsEstimate()).toFixed(2) + "V/cell";
+                } else {
+                    return (flightLog.vbatADCToMillivolts(value) / 1000).toFixed(2) + "V" + ", " + (flightLog.vbatADCToMillivolts(value) / 1000 / flightLog.getNumCellsEstimate()).toFixed(2) + "V/cell";
+                }
+
             case 'amperageLatest':
-                return (flightLog.amperageADCToMillivolts(value) / 1000).toFixed(2) + "A" + ", " + (flightLog.amperageADCToMillivolts(value) / 1000 / flightLog.getNumMotors()).toFixed(2) + "A/motor";
-    
+                if(flightLog.getSysConfig().firmwareType == FIRMWARE_TYPE_BETAFLIGHT && semver.gte(flightLog.getSysConfig().firmwareVersion, '3.1.0')) {
+                    return (value / 10).toFixed(2) + "A" + ", " + (value / 10 / flightLog.getNumMotors()).toFixed(2) + "A/motor";
+                } else {
+                    return (flightLog.amperageADCToMillivolts(value) / 1000).toFixed(2) + "A" + ", " + (flightLog.amperageADCToMillivolts(value) / 1000 / flightLog.getNumMotors()).toFixed(2) + "A/motor";
+                }
+
             case 'heading[0]':
             case 'heading[1]':
             case 'heading[2]':