Diff: screen_library.cpp

Revision:

6:1fda11b7b0b9

Parent:

5:4b63e6845a8e

--- a/screen_library.cpp	Wed Nov 28 12:01:20 2018 +0000
+++ b/screen_library.cpp	Sun Mar 07 15:44:19 2021 +0000
@@ -8,8 +8,8 @@
 extern GEAR *Gears;
 extern IMAGE LogoBig,LogoSmall,Branko,NewYearCongat;
 
-extern uint16_t Rpm0, Speed0, Gear0, Water_Temp0, Oil_Temp0, TPS0, Brakes0, MAP0, Air_Temp0, Lambda0, Volts0, Crank0;
-extern uint16_t Rpm,  Speed,  Gear,  Water_Temp,  Oil_Temp,  TPS,  Brakes,  MAP,  Air_Temp,  Lambda,  Volts,  Crank;
+extern uint16_t Rpm0, Speed0, Gear0, Water_Temp0, Bat_Temp0, TPS0, Brakes0, MAP0, Air_Temp0, Lambda0, Volts0, Crank0;
+extern uint16_t Rpm,  Speed,  Gear,  Water_Temp,  Bat_Temp,  TPS,  Brakes,  MAP,  Air_Temp,  Lambda,  Volts,  Crank;
 extern int FL_LVDT0, FR_LVDT0, RL_LVDT0, RR_LVDT0, FL_LVDT,  FR_LVDT,  RL_LVDT,  RR_LVDT;
 extern int FL_LVDT_Ref,FR_LVDT_Ref,RL_LVDT_Ref,RR_LVDT_Ref;
 extern int LVDT_Max;
@@ -54,7 +54,7 @@
     DrawSpeedMeter();
     DrawRGBImage(LogoSmall,LogoSmallXPos,LogoSmallYPos);
     lcd.SetFont(&Font24);
-    lcd.DisplayStringAt(30,170,(uint8_t*)"Oil Temp",LEFT_MODE);
+    lcd.DisplayStringAt(30,170,(uint8_t*)"Battery Temp",LEFT_MODE);
     lcd.DisplayStringAt(30,320,(uint8_t*)"Water Temp",LEFT_MODE);
     lcd.DisplayStringAt(584,170,(uint8_t*)"TPS",LEFT_MODE);
     lcd.SetTextColor(LCD_COLOR_DARKRED);
@@ -65,7 +65,7 @@
     
     //Display initial values
     PrintChar(Gears[Gear],GearXPos,GearYPos,LCD_COLOR_BLACK);
-    SetNumber(Oil_Temp,100,OilTempXPos,OilTempYPos,3,0,0);
+    SetNumber(Bat_Temp,100,BatTempXPos,BatTempYPos,3,0,0);
     SetNumber(Water_Temp,100,WaterTempXPos,WaterTempYPos,3,0,0);
     SetNumber(TPS,100,TPSXPos,TPSYPos,3,0,0);
     BrakeSignal(Brakes);
@@ -143,8 +143,8 @@
     if(Gear!=Gear0){
         PrintChar(Gears[Gear],GearXPos,GearYPos,LCD_COLOR_BLACK);
     };
-    if(Oil_Temp!=Oil_Temp0){
-        ChangeNumber(Oil_Temp,Oil_Temp0,100,OilTempXPos,OilTempYPos,3,0,0);
+    if(Bat_Temp!=Bat_Temp0){
+        ChangeNumber(Bat_Temp,Bat_Temp0,100,BatTempXPos,BatTempYPos,3,0,0);
     };
     if(Water_Temp!=Water_Temp0){
        ChangeNumber(Water_Temp,Water_Temp0,100,WaterTempXPos,WaterTempYPos,3,0,0);