test fork
Dependencies: SPI_TFTx2 SPI_TFTx2_ILI9341 TFT_fonts TOUCH_TFTx2 mbed
Fork of CANary_9341 by
Diff: main.cpp
- Revision:
- 157:1a100a5ed06f
- Parent:
- 156:4e5d30535cf9
- Child:
- 158:059abeb44ba1
--- a/main.cpp Thu Oct 24 19:51:31 2013 +0000 +++ b/main.cpp Wed Oct 30 03:16:51 2013 +0000 @@ -9,11 +9,11 @@ // * Change pack volt color when CVLI fails // * Add tire pressure cal (40psi for me = FR 38, RR 38.2, FL 37.8, RL 38 - maybe 2psi error on my tire gauge?) // * Add heater activation warning message -// * Add trip max/min efficiency reset + -// rev156 -// Changed efficency screen braking monitor to use actual motor amps instead of target regen signal -// Changed braking screen to use actual regen signal instead of target regen signal +// rev157 +// Added trip max/min efficiency reset +// Added second config screen and RegenMon enable/disable #include "mbed.h" #include "CAN.h" @@ -23,7 +23,7 @@ #include "utility.h" #include "displayModes.h" #include "TOUCH_TFTx2.h" -char revStr[7] = "156"; // gg - revision string, max 6 characters +char revStr[7] = "157"; // gg - revision string, max 6 characters FATFS USBdrive; LocalFileSystem local("local"); @@ -430,7 +430,7 @@ } else if (dMode[whichTouched] == indexScreen) { // gg - index dMode[whichTouched] = mainScreen ; // GoTo Main Screen sMode=0; - } else if (dMode[whichTouched]==configScreen) { + } else if (dMode[whichTouched]==config2Screen) { wait_ms(500); tt.background(Black); tt.calibrate(); @@ -463,6 +463,9 @@ msgReq.attach(&sendReq,0.015); } else if (dMode[whichTouched]==configScreen) { mbed_reset(); + } else if (dMode[whichTouched]==config2Screen) { // reset DTE Max/Min + maxTripEff = 4; + minTripEff = 4; } else if (dMode[whichTouched]==playbackScreen) { // pause/unpause playbackEn=!playbackEn; if(playbackEn){ @@ -502,7 +505,7 @@ case 30: // right-most on top row - if (dMode[whichTouched]==configScreen) { + if (dMode[whichTouched]==config2Screen) { // step through skins if( skin < maxSkin ) skin += 1 ; else skin = 0 ; @@ -605,7 +608,7 @@ break; case 31: // col 3 row 1 - if (dMode[whichTouched]==configScreen) { // gg - Batt Log Enable Button + if (dMode[whichTouched]==config2Screen) { // gg - Batt Log Enable Button debugMode = !debugMode; } else if (dMode[whichTouched] == indexScreen) { // gg - index dMode[whichTouched] = configScreen ; // GoTo Config Screen @@ -634,8 +637,10 @@ break; case 12: // left-middle col, bottom row (not nav) - if (dMode[whichTouched] == configScreen) { // gg - index + if (dMode[whichTouched] == config2Screen) { // gg - index dMode[whichTouched] = dateScreen ; // GoTo Set Date/Time Screen + } else if (dMode[whichTouched]==configScreen) { + regenMon = !regenMon; } else { lastDMode[whichTouched]=99;//repaint to clear highlight } @@ -644,7 +649,7 @@ case 22: // right-middle col, bottom row (not nav) if (dMode[whichTouched] == indexScreen) { // gg - index dMode[whichTouched] = logScreen ; - } else if (dMode[whichTouched]==configScreen) { + } else if (dMode[whichTouched]==config2Screen) { showHealth = !showHealth; } else { lastDMode[whichTouched]=99;//repaint to clear highlight @@ -652,7 +657,7 @@ break; case 32: // right col, bottom row (not nav) - if (dMode[whichTouched] == configScreen) { + if (dMode[whichTouched] == config2Screen) { logEn=false; updateFirmware(); } else if (dMode[whichTouched] == tripScreen) {