Treehouse Mbed Team / Mbed 2 deprecated APS_DCM1SL2

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Dependencies:   mbed

Diff: src/adc.cpp

Revision:
18:78e982f31c6b
Parent:
17:454afe56eedb
Child:
22:2c37ac12746e
--- a/src/adc.cpp	Thu Dec 13 21:58:28 2018 +0000
+++ b/src/adc.cpp	Fri Dec 14 00:31:15 2018 +0000
@@ -33,6 +33,7 @@
 
 void initADC(void){
     
+    //Auto-zero current values
     struct adcValues adcVals = getADCresults();
     
     CURRENT_48_OFFSET = adcVals.i48;
@@ -131,11 +132,13 @@
         dvals.v48f = VOLTAGE_48_FACTOR*avals.v48;
         dvals.v24f = VOLTAGE_24_FACTOR*avals.v24;
         dvals.v12f = VOLTAGE_12_FACTOR*avals.v12;
-        dvals.i48f = ((avals.i48-CURRENT_48_OFFSET)/CURRENT_48_DIV_FACTOR)-CURRENT_CONTROL_OFFSET;
+        //dvals.i48f = ((avals.i48-CURRENT_48_OFFSET)/CURRENT_48_DIV_FACTOR)-CURRENT_CONTROL_OFFSET;
+        dvals.i48f = (avals.i48-CURRENT_48_OFFSET)/CURRENT_48_DIV_FACTOR;
         dvals.i24f = (avals.i24-CURRENT_24_OFFSET)/CURRENT_24_DIV_FACTOR;
         dvals.i12f = (avals.i12-CURRENT_12_OFFSET)/CURRENT_12_DIV_FACTOR;
     }else{
-        dvals.v48f = 1.0*avals.v48-CURRENT_CONTROL_OFFSET;
+        //dvals.v48f = 1.0*avals.v48-CURRENT_CONTROL_OFFSET;
+        dvals.v48f = 1.0*avals.v48;
         dvals.v24f = 1.0*avals.v24;
         dvals.v12f = 1.0*avals.v12;
         dvals.i48f = 1.0*avals.i48;