Tick Tock / Mbed 2 deprecated CANary_merge

Attempts to merge SPI_TFT2 & SPI_TFT_ILI9341

Dependencies:   SPI_TFTx2 TFT_fonts TOUCH_TFTx2 mbed

Fork of CANary by Tick Tock

Diff: displayModes.h

Revision:
167:58d4edf403d4
Parent:
164:46ed06263b0e
Child:
170:7ee98e3611bc
--- a/displayModes.h	Tue Dec 03 13:54:07 2013 +0000
+++ b/displayModes.h	Tue Dec 03 20:45:05 2013 +0000
@@ -36,6 +36,7 @@
 extern float playbackInt;
 extern float miles_trip[3];
 extern float kWh_trip[3];
+extern float CCkWh_trip[3];
 extern float kW[39];
 extern float mpkWh[39];
 extern float mpkWh_noCC;
@@ -61,9 +62,8 @@
 extern float unloadedV_x2,Resr,curRmax,curRmin,redRmax,redRmin,incRmax,incRmin;
 extern signed short Imax, Imin;
 extern bool showHealth;
-extern float maxTripEff, minTripEff;
+extern float maxTripEff, minTripEff, maxTripMiles, minTripMiles, maxTripkWh, minTripkWh, maxTripCCkWh, minTripCCkWh;
 extern bool brakeMon, regenMon, heaterMon;
-extern float curEff;
 extern unsigned short uMsgId[8];
 extern bool accOn;
 extern bool autoSync;