Jon Freeman / Mbed 2 deprecated Loco_10_17_SD

Electric Locomotive control system. Touch screen driver control, includes regenerative braking, drives 4 brushless motors, displays speed MPH, system volts and power

Dependencies:   BSP_DISCO_F746NG FastPWM LCD_DISCO_F746NG SD_DISCO_F746NG TS_DISCO_F746NG mbed

Diff: graphics.cpp

Revision:
1:8ef34deb5177
Parent:
0:23cc72b18e74
--- a/graphics.cpp	Sun Nov 12 06:26:29 2017 +0000
+++ b/graphics.cpp	Mon Nov 13 09:53:00 2017 +0000
@@ -1,7 +1,7 @@
 #include "mbed.h"
 #include "TS_DISCO_F746NG.h"
 #include "LCD_DISCO_F746NG.h"
-#include "dro.h"
+#include "Electric_Loco.h"
 
 #define VOLTMETER_X 68      //  Voltmeter screen position
 #define VOLTMETER_Y 68
@@ -331,9 +331,11 @@
     Powermeter.setup   (AMMETER_X, AMMETER_Y, V_A_SIZE, -1400.0, 1400.0, 1.25 * PI, -0.25 * PI , 14, "Watt", NO_DPS);
 }
 
-void    update_meters  (double speed, double current, double voltage)
+//void    update_meters  (double speed, double current, double voltage)
+void    update_meters  (double speed, double power, double voltage)
 {
-    Powermeter.set_value(voltage * current);
+//    Powermeter.set_value(voltage * current);
+    Powermeter.set_value(power);
     Voltmeter.set_value (voltage);
     Speedo.set_value    (speed);
 }