test fork

Dependencies:   SPI_TFTx2 SPI_TFTx2_ILI9341 TFT_fonts TOUCH_TFTx2 mbed

Fork of CANary_9341 by Tick Tock

Revision:
38:155ec32c5e91
Parent:
37:fea2c1d52c5f
Child:
39:eef8beac7411
--- a/main.cpp	Sun Mar 24 15:35:45 2013 +0000
+++ b/main.cpp	Sun Mar 24 17:26:09 2013 +0000
@@ -89,7 +89,7 @@
 float accV = 0;
 bool playbackEn = false;
 bool playbackOpen = false;
-float playbackInt = 0.032; //read one message every 64 ms
+float playbackInt = 0.05; //read messages every 50 ms
 bool step = false;
 char header[5];
 char data[8];
@@ -309,7 +309,7 @@
                                     wait_ms(500);
                                     tt.background(Black);
                                     tt.calibrate();
-                                } else if (dMode[i]==config2Screen) { // slower
+                                } else if (dMode[i]==playbackScreen) { // slower
                                         playbackInt *=2;
                                     if(playbackEn){
                                         playback.detach();
@@ -326,7 +326,7 @@
                                     pollCP=true;
                                 } else if (dMode[i]==config1Screen) {
                                     mbed_reset();
-                                } else if (dMode[i]==config2Screen) { // pause/unpause
+                                } else if (dMode[i]==playbackScreen) { // pause/unpause
                                     playbackEn=!playbackEn;
                                     if(playbackEn){
                                         playback.attach(&playbackISR,playbackInt);
@@ -344,7 +344,7 @@
                                     logMsg(sTemp);
                                     saveConfig();
                                     spkr.beep(2000,0.25);
-                                } else if (dMode[i]==config2Screen) { // faster
+                                } else if (dMode[i]==playbackScreen) { // faster
                                     if(playbackInt>.002){
                                         playbackInt/=2;
                                         if(playbackEn){
@@ -373,7 +373,7 @@
                                     } else {
                                         autoPoll.detach();
                                     }
-                                } else if (dMode[i]==config2Screen) {
+                                } else if (dMode[i]==playbackScreen) {
                                     // Start/stop playback
                                     if(!playbackOpen){
                                         if(!logOpen){
@@ -483,7 +483,7 @@
             if(playbackOpen&&playbackEn){
                 //sprintf(sTemp,"step\n");
                 //logMsg(sTemp);
-                for(i=0;i<200;i++){
+                for(i=0;i<120;i++){
                     if(!feof(file)){
                         fscanf(file,"%5c%8c",&header,&data);
                         pbts=(header[1]<<8)|header[2];