Tick Tock
Dual CANbus monitor and instrumentation cluster supporting ILI9341 display controller
Dependencies: SPI_TFTx2_ILI9341 TOUCH_TFTx2_ILI9341 TFT_fonts mbed
Revision 114:3f8c59a8a2b9, committed 2013-07-02
- Comitter:
- TickTock
- Date:
- Tue Jul 02 02:57:36 2013 +0000
- Branch:
- Metric
- Parent:
- 113:f388b4505463
- Child:
- 115:549410af477d
- Commit message:
- fixed bug in battery log files (pointing to wrong cellpair locations)
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 Mon Jul 01 02:54:46 2013 +0000
+++ b/main.cpp Tue Jul 02 02:57:36 2013 +0000
@@ -24,7 +24,7 @@
#include "displayModes.h"
#include "TOUCH_TFTx2.h"
-char revStr[7] = "113"; // gg - revision string, max 6 characters
+char revStr[7] = "114"; // gg - revision string, max 6 characters
FATFS USBdrive;
LocalFileSystem local("local");
@@ -613,6 +613,7 @@
case 32: // right col, bottom row (not nav)
if (dMode[whichTouched] == configScreen) {
+ logEn=false;
updateFirmware();
} else if (dMode[whichTouched] == tripScreen) {
miles_trip[2]=0;
@@ -709,7 +710,8 @@
//compute historic efficiency
if(numSsamples>0){ // Avoid div0
- mph[0]=((float) motorRPM)/numSsamples/215; // Empirically derived - may change car to car
+ //mph[0]=((float) motorRPM)/numSsamples/215; // Empirically derived - may change car to car
+ mph[0]=((float) motorRPM)/numSsamples/219; // Empirically derived - may change car to car
} else {
mph[0]=0;
}
--- a/utility.cpp Mon Jul 01 02:54:46 2013 +0000
+++ b/utility.cpp Tue Jul 02 02:57:36 2013 +0000
@@ -632,7 +632,7 @@
min=9999;
avg=0;
for(i=0; i<96; i++) {
- bd=(battData[i*2+3]<<8)+battData[i*2+4];
+ bd=(battData[BatDataBaseG2*7+i*2+3]<<8)+battData[BatDataBaseG2*7+i*2+4];
avg+=bd;
if(bd>max) max=bd;
if(bd<min) min=bd;
@@ -656,7 +656,7 @@
f_printf(&bfile,"%d,%d,%d,%d,",(battData[(BatDataBaseG4*7)+ 3]<<8)+battData[(BatDataBaseG4*7)+ 4],battData[(BatDataBaseG4*7)+ 5],(battData[(BatDataBaseG4*7)+ 6]<<8)+battData[(BatDataBaseG4*7)+ 7],battData[(BatDataBaseG4*7)+ 8]);
f_printf(&bfile,"%d,%d,%d,%d", (battData[(BatDataBaseG4*7)+ 9]<<8)+battData[(BatDataBaseG4*7)+10],battData[(BatDataBaseG4*7)+11],(battData[(BatDataBaseG4*7)+12]<<8)+battData[(BatDataBaseG4*7)+13],battData[(BatDataBaseG4*7)+14]);
for(i=0; i<96; i++) {
- bd=(battData[i*2+3]<<8)+battData[i*2+4];
+ bd=(battData[BatDataBaseG2*7+i*2+3]<<8)+battData[BatDataBaseG2*7+i*2+4];
f_printf(&bfile,",%d",bd);
}
f_printf(&bfile,"\r\n");
@@ -693,7 +693,7 @@
min=9999;
avg=0;
for(i=0; i<96; i++) {
- bd=(battData[i*2+3]<<8)+battData[i*2+4];
+ bd=(battData[BatDataBaseG2*7+i*2+3]<<8)+battData[BatDataBaseG2*7+i*2+4];
avg+=bd;
if(bd>max) max=bd;
if(bd<min) min=bd;
@@ -717,7 +717,7 @@
f_printf(&bfile,"%d,%d,%d,%d,",(battData[(BatDataBaseG4*7)+ 3]<<8)+battData[(BatDataBaseG4*7)+ 4],battData[(BatDataBaseG4*7)+ 5],(battData[(BatDataBaseG4*7)+ 6]<<8)+battData[(BatDataBaseG4*7)+ 7],battData[(BatDataBaseG4*7)+ 8]);
f_printf(&bfile,"%d,%d,%d,%d", (battData[(BatDataBaseG4*7)+ 9]<<8)+battData[(BatDataBaseG4*7)+10],battData[(BatDataBaseG4*7)+11],(battData[(BatDataBaseG4*7)+12]<<8)+battData[(BatDataBaseG4*7)+13],battData[(BatDataBaseG4*7)+14]);
for(i=0; i<96; i++) {
- bd=(battData[i*2+3]<<8)+battData[i*2+4];
+ bd=(battData[BatDataBaseG2*7+i*2+3]<<8)+battData[BatDataBaseG2*7+i*2+4];
f_printf(&bfile,",%d",bd);
}
f_printf(&bfile,"\r\n");