Added averaged power_display for displays

Author: jenkie

Arduino_Pedelec_Controller/Arduino_Pedelec_Controller.ino

@@ -225,6 +225,7 @@ float voltage_1s,voltage_2s = 0.0; //Voltage history 1s and 2s before "now"
 float voltage_display = 0.0;   //averaged voltage
 float current_display = 0.0;   //averaged current
 double power=0.0;              //calculated power
+double power_display=0.0;      //averaged power for display
 double power_set = 0;          //Set Power
 double power_poti = 0.0;   //set power, calculated with current poti setting
 double power_throttle=0.0; //set power, calculated with current throttle setting
@@ -664,6 +665,7 @@ if (loadcell.is_ready())     //new conversion result from load cell available
     voltage_display = 0.99*voltage_display + 0.01*voltage; //averaged voltage for display
     current_display = 0.99*current_display + 0.01*current; //averaged current for display
     power=current*voltage;
+    power_display = current_display*voltage_display;
 
 #if defined(SUPPORT_XCELL_RT) || defined(SUPPORT_SEMPU_V1) || defined(SUPPORT_SEMPU)
 #ifdef SUPPORT_XCELL_RT

Arduino_Pedelec_Controller/display.cpp

@@ -357,20 +357,20 @@ static void display_16x2_view_main()
     lcd.print(spd,0);
     lcd.print(MY_F(" km/h  "));
 
-    double power_display = power;
-    if (power_display > 999)
-        power_display = 999;
-    else if (power_display < 0)
-        power_display = 0;
+    double power_temp = power_display;
+    if (power_temp > 999)
+        power_temp = 999;
+    else if (power_temp < 0)
+        power_temp = 0;
 
-    if (power_display<10)
+    if (power_temp<10)
     {lcd.print(MY_F(" "));}
-    if (power_display<100)
+    if (power_temp<100)
     {lcd.print(MY_F(" "));}
-    if (power_display < 0)
+    if (power_temp < 0)
         lcd.print(MY_F("0"));
     else
-        lcd.print(power_display,0);
+        lcd.print(power_temp,0);
     lcd.print(MY_F(" W "));
 
     // Break status
@@ -986,11 +986,11 @@ static void display_nokia_view_main()
     lcd.print(battery_percent_fromcapacity);
 
     lcd.setCursor(0,1);
-    if (power<99.5)
+    if (power_display<99.5)
     {lcd.print(MY_F(" "));}
-    if (power<9.5)
+    if (power_display<9.5)
     {lcd.print(MY_F(" "));}
-    lcd.print(power,0);
+    lcd.print(power_display,0);
 
     lcd.setCursor(9,1);
     if (wh<99.5)
@@ -1020,7 +1020,7 @@ static void display_nokia_view_main()
 
     lcd.setCursor(0,4);
     if ( spd > 5.0)
-        lcd.print(power/spd,1);
+        lcd.print(power_display/spd,1);
     else
         lcd.print(MY_F("---"));
     lcd.print(MY_F("/"));
@@ -1082,9 +1082,9 @@ static void display_nokia_view_graphic()
 
     //print the electrical power (Watt) in the top right corner
     lcd.setCursorInPixels(84-4*6,0);
-    if (power<99.5) {lcd.print(MY_F(" "));}
-    if (power<9.5)  {lcd.print(MY_F(" "));}
-    lcd.print(power,0);
+    if (power_display<99.5) {lcd.print(MY_F(" "));}
+    if (power_display<9.5)  {lcd.print(MY_F(" "));}
+    lcd.print(power_display,0);
     lcd.print(MY_F("W"));
 
     drawSpeed(spd, 20, 2); //centered vertically
@@ -1098,7 +1098,7 @@ static void display_nokia_view_graphic()
     //- the limit line shows the target power that is selected by the user (power_set_for_display)
     //- the bar shows the currenlty measured electrical power that the moter consumes
     lcd.setCursorInPixels(72,1);
-    lcd.drawVerticalBar((word)(max(curr_power_max,curr_power_poti_max)), (word)(max(power_set,0)), (word)(power), 11, 4);
+    lcd.drawVerticalBar((word)(max(curr_power_max,curr_power_poti_max)), (word)(max(power_set,0)), (word)(power_display), 11, 4);
 
     //print battery percent left
     lcd.setCursorInPixels(0,1);
@@ -1299,7 +1299,7 @@ void display_update()
 
 
 #if (DISPLAY_TYPE & DISPLAY_TYPE_BMS3)
-    slcd3_update(map(battery_percent_fromcapacity,0,100,0,16),wheel_time, 0, max(power/9.75,0), (byte)0x20*(!brake_stat));
+    slcd3_update(map(battery_percent_fromcapacity,0,100,0,16),wheel_time, 0, max(power_display/9.75,0), (byte)0x20*(!brake_stat));
 #endif
 }
 

Arduino_Pedelec_Controller/globals.h

@@ -30,6 +30,7 @@ extern float current_display;
 extern byte battery_percent_fromvoltage;
 extern byte battery_percent_fromcapacity;
 extern double power;
+extern double power_display;
 extern double power_set;
 extern float wh;
 extern double wh_human;