Tick Tock / Mbed 2 deprecated CANary_merge

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:   SPI_TFTx2 TFT_fonts TOUCH_TFTx2 mbed

Fork of CANary by Tick Tock

Diff: utility.cpp

Revision:
38:155ec32c5e91
Parent:
37:fea2c1d52c5f
Child:
39:eef8beac7411
diff -r fea2c1d52c5f -r 155ec32c5e91 utility.cpp
--- a/utility.cpp	Sun Mar 24 15:35:45 2013 +0000
+++ b/utility.cpp	Sun Mar 24 17:26:09 2013 +0000
@@ -130,8 +130,8 @@
         }
         imWs=packV; // Volts*seconds*2
         imWs*=packA; // Watts*4
-        imWs*=-2.5; // milliwatts*seconds (1db messages are 10ms apart)
-        mWs+=imWs; // total mWs
+        imWs*=-10; // milliwatt*seconds*4 (1db messages are 10ms apart)
+        mWs+=(imWs>>2); // total mWs
         //lms=ms;
     }
 }