Attempts to merge SPI_TFT2 & SPI_TFT_ILI9341
Dependencies: SPI_TFTx2 TFT_fonts TOUCH_TFTx2 mbed
Fork of CANary by
Diff: main.cpp
- Revision:
- 171:355e284f5201
- Parent:
- 170:7ee98e3611bc
- Child:
- 172:53548bf8bf85
diff -r 7ee98e3611bc -r 355e284f5201 main.cpp --- a/main.cpp Tue Dec 24 12:20:50 2013 +0000 +++ b/main.cpp Sat Dec 28 14:53:14 2013 +0000 @@ -11,10 +11,8 @@ // * Add climate control impact to main max/min dte and new trip display // * Be more efficient with write buffer (use msgLen instead of always storing 8 bytes) -// rev170 -// Added kWperGid scalar to config file. .075 appears to be too small -// Added CCkWh_trip to TripLog (after kWh_trip) -// Added uncalibrated available regen bars to dte screen +// rev171 +// Converted dte display braking bargraph to kW #include "mbed.h" #include "CAN.h" @@ -24,7 +22,7 @@ #include "utility.h" #include "displayModes.h" #include "TOUCH_TFTx2.h" -char revStr[7] = "170"; // gg - revision string, max 6 characters +char revStr[7] = "171"; // gg - revision string, max 6 characters unsigned long maxTarget = 1000; FATFS USBdrive; LocalFileSystem local("local"); @@ -177,6 +175,9 @@ bool idir, lidir; bool enableSound=false; bool clearTest=true; +unsigned long tbScalar = 72464; +unsigned long rbScalar = 8696; +unsigned long fbScalar = 132; int main() { char sTemp[40];