Attempts to merge SPI_TFT2 & SPI_TFT_ILI9341
Dependencies: SPI_TFTx2 TFT_fonts TOUCH_TFTx2 mbed
Fork of CANary by
Diff: main.cpp
- Branch:
- Metric
- Revision:
- 104:5a19101aaac5
- Parent:
- 103:1389e9efe8c3
- Child:
- 105:2da2d9378c57
diff -r 1389e9efe8c3 -r 5a19101aaac5 main.cpp --- a/main.cpp Thu Jun 20 23:07:27 2013 +0000 +++ b/main.cpp Fri Jun 28 00:11:41 2013 +0000 @@ -12,10 +12,8 @@ // * Add coasting regen to regen/braking display // * Change semilog efficiency graph to linear with 10 minute values // * Add Trip meter (kWh and efficiency for current trip) -// * Make unique sound when log file write fails and logging disabled // * Make display updates interruptable for log writes // * Add additional 79b bank readouts -// * Ignore the missing 4th pemperature sensor on 2013 models // * Add ability to transfer settings config file to/from USB // * Add once-on-powerup/powerdown log // * Move log dump to ISR (but CAN RX at higher priority) @@ -30,7 +28,7 @@ #include "displayModes.h" #include "TOUCH_TFTx2.h" -char revStr[7] = "100"; +char revStr[7] = "103"; LocalFileSystem local("local"); @@ -297,7 +295,10 @@ logOpen = false; sprintf(sTemp,"Failed to append log file.\n"); printMsg(sTemp); // failed to append - spkr.beep(1000,0.25); + spkr.beep(3000,0.25); + spkr.beep(1500,0.25); + spkr.beep(750,0.25); + spkr.beep(375,0.25); logEn=false; } else { while (readPointer != writePointer) {