Treehouse Mbed Team / Mbed 2 deprecated APS_DCM1SL

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/menu.cpp

Revision:
12:fd1fd1857628
Parent:
11:01dcfb29fbc4
Child:
15:aed8f326c949
--- a/src/menu.cpp	Fri Dec 07 20:42:41 2018 +0000
+++ b/src/menu.cpp	Sat Dec 08 01:53:36 2018 +0000
@@ -60,7 +60,7 @@
     struct displayValues dvals = calcDisplayValues(avals);
     
     double pwr_out=dvals.v12f*dvals.i12f;
-    double pwr_in=dvals.v48f*(dvals.i48f-CURRENT_CONTROL_OFFSET);
+    double pwr_in=dvals.v48f*(dvals.i48f);
     double pwr_eff=100*pwr_out/pwr_in;
     
     sprintf(strbuf, "V48=%2.1f, I48=%3.1f | V24=%2.1f, I24=%3.1f | V12=%2.1f, I12=%3.1f    \r\n", dvals.v48f, dvals.i48f, dvals.v24f, dvals.i24f, dvals.v12f, dvals.i12f);
@@ -127,9 +127,9 @@
     struct adcValues avals = getADCresults();
     refreshData(avals);
     
-    sprintf(strbuf, "\r\n MULT");
+    sprintf(strbuf, "\r\n BRDS");
     sendSerial(strbuf);
-    sprintf(strbuf, "\r\n BRDS");
+    sprintf(strbuf, "\r\n MULT");
     sendSerial(strbuf);
     sprintf(strbuf, "\r\n ALLOFF");
     sendSerial(strbuf);