interfisch
/
bobbycar
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

efficiency display and display alignement fixes

This commit is contained in:
interfisch 2023-06-04 14:12:49 +02:00
parent e82675c36d
commit 73fc09154f
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
controller_teensy/include/display.h
View File

@ -120,7 +120,7 @@ void display_drivingDisplay(ESCSerialComm& escFront, ESCSerialComm& escRear) {
display.print("km/h");
//A
display.setCursor(SCREEN_WIDTH-35,1);
display.setCursor(SCREEN_WIDTH-37,1);
static float averaged_filtered_currentAll;
#define CURRENT_FILTER 0.8
averaged_filtered_currentAll=averaged_filtered_currentAll*CURRENT_FILTER+(1-CURRENT_FILTER)*filtered_currentAll; //filter over time
@ -137,18 +137,17 @@ void display_drivingDisplay(ESCSerialComm& escFront, ESCSerialComm& escRear) {
display.setCursor(1,SCREEN_HEIGHT-7);
if (((millis()/2500)%2)==0) {
//## Trip
//## Speed statistic
display.print("max: ");
dtostrf(max_meanSpeed*3.6,1,0,buf);
display.print((String)buf);
display.print("max: ");
display.print("km/h");
}else{
//## Current Consumed
dtostrf(min_filtered_currentAll,1,1,buf);
display.print("min:");
display.print((String)buf);
display.print("A, max: ");
display.print("A max:");
dtostrf(max_filtered_currentAll,1,1,buf);
display.print((String)buf);
@ -188,20 +187,22 @@ void display_standingDisplay(ESCSerialComm& escFront, ESCSerialComm& escRear) {
display.println();
display.print(F("Trip:"));
dtostrf(escFront.getTrip(),1,0,buf);
display.print((String)buf);
display.print("/");
dtostrf(escRear.getTrip(),1,0,buf);
dtostrf(min(escFront.getTrip(),escRear.getTrip()),1,0,buf);
display.print((String)buf);
display.print(" m ");
display.println();
display.print(F("Cons. "));
dtostrf(escFront.getCurrentConsumed()+escRear.getCurrentConsumed(),1,2,buf);
display.print((String)buf);
display.print(" Ah");
display.println();
display.print(F("Eff: "));
dtostrf( min(escFront.getTrip(),escRear.getTrip())/1000/(escFront.getCurrentConsumed()+escRear.getCurrentConsumed()) ,1,2,buf);
display.print((String)buf);
display.print(" km/Ah");
display.println();
}

2
controller_teensy/include/led.h
View File

@ -120,7 +120,7 @@ void led_update(unsigned long loopmillis,ESCSerialComm& escFront, ESCSerialComm&
if (reverse_enabled) {
_bgColor=strip.Color(20, 0, 20, 0);
}
led_gauge(loopmillis,currentMean,0,16.0,strip.Color(0, 0, 0, 255),_bgColor);
led_gauge(loopmillis,currentMean,0,32.0,strip.Color(0, 0, 0, 255),_bgColor);
}
}else{
//Disarmed