Tick Tock
/
CANary
Important changes to repositories hosted on mbed.com
Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.
To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.
It is also possible to export all your personal repositories from the account settings page.
Dependencies: SPI_TFTx2_ILI9341 TFT_fonts TOUCH_TFTx2_ILI9341 mbed
Fork of
CANary_corrupt
by 
Tick Tock
Revision 200:b2d21dcd6287, committed 2014-09-25
- Comitter:
- TickTock
- Date:
- Thu Sep 25 03:14:10 2014 +0000
- Parent:
- 199:400b8950effa
- Child:
- 201:4adbb1b56005
- Commit message:
- // Fixed brakeMon/regenMon mixup in config file
Changed in this revision
| main.cpp | Show annotated file Show diff for this revision Revisions of this file |
| utility.cpp | Show annotated file Show diff for this revision Revisions of this file |
--- a/main.cpp Thu Aug 28 10:49:02 2014 +0000
+++ b/main.cpp Thu Sep 25 03:14:10 2014 +0000
@@ -12,8 +12,8 @@
// * fix bug where charging while on screws up efficiency computation
// * find better kWh estimate than gids
-// rev198
-// Fixed false long touch bug
+// rev200
+// Fixed brakeMon/regenMon mixup in config file
// Include this before other header files
#include "precompile.h"
@@ -27,7 +27,7 @@
#include "displayModes.h"
#include "TOUCH_TFTx2.h"
-char revStr[7] = "198";
+char revStr[7] = "200";
unsigned long maxTarget = 1000;
FATFS USBdrive;
LocalFileSystem local("local");
--- a/utility.cpp Thu Aug 28 10:49:02 2014 +0000
+++ b/utility.cpp Thu Sep 25 03:14:10 2014 +0000
@@ -558,7 +558,7 @@
fprintf(cfile,"metric %d\r\n",(metric?1:0));
fprintf(cfile, "firmware %d\r\n", fwCount );
fprintf(cfile,"showHealth %d\r\n",(showHealth?1:0));
- fprintf(cfile,"brakeMon %d\r\n",(heaterMon?4:0)+(brakeMon?2:0)+(regenMon?1:0));
+ fprintf(cfile,"brakeMon %d\r\n",(heaterMon?4:0)+(regenMon?2:0)+(brakeMon?1:0));
fprintf(cfile,"brkMonRate %2.1f\r\n", (float) brkMonRate/94737 );
fprintf(cfile,"brkMonThr %2.1f\r\n", (float) brkMonThr/1895);
for(char i=0;i<8;i++){