Revision 12:2cb9082e2d40, committed 2018-04-29

Comitter:

MCR_Xavier

Date:

Sun Apr 29 10:40:19 2018 +0000

Parent:

11:5ec2507020da

Commit message:

Lancer2018????????????

Changed in this revision

diff -r 5ec2507020da -r 2cb9082e2d40 SDFileSystem.lib
--- a/SDFileSystem.lib	Tue Mar 27 01:48:45 2018 +0000
+++ b/SDFileSystem.lib	Sun Apr 29 10:40:19 2018 +0000
@@ -1,1 +1,1 @@
-http://mbed.org/users/mbed_official/code/SDFileSystem/#aeb486cd871e
+https://os.mbed.com/users/MCR_Xavier/code/SDFileSystem/#d1ab8cc9dcb0

diff -r 5ec2507020da -r 2cb9082e2d40 main.cpp
--- a/main.cpp	Tue Mar 27 01:48:45 2018 +0000
+++ b/main.cpp	Sun Apr 29 10:40:19 2018 +0000
@@ -164,7 +164,7 @@
 char Log_W_WidsLR[300];
 char Log_Count_R[300];
 char Log_tmp[100][6];
-char LLog_tmp[600];
+char LLog_tmp[300];
 int Sensecnt=0,writeflg=0;
 
 unsigned char WidsNo=0;
@@ -354,6 +354,7 @@
         Log_Count_R[WidsNo] = Count_R;
         Log_W_Wids[WidsNo][0] = W_WidsR;
         //Log_W_Wids[WidsNo][1] = EnCountI;
+        LLog_tmp[WidsNo] = EnCount;
         Log_W_Wids[WidsNo][1] = EnCount_1R;
         WidsNo++;
                         }
@@ -369,6 +370,7 @@
         Log_Count_R[WidsNo] = Count_R;
         Log_W_Wids[WidsNo][0] = W_WidsL;
         //Log_W_Wids[WidsNo][1] = EnCountI;
+        LLog_tmp[WidsNo] = EnCount;
         Log_W_Wids[WidsNo][1] = EnCount_1R;
         WidsNo++;
                         }
@@ -726,7 +728,7 @@
                                 }
         fprintf(fp, "Wids EnCount_1R WidsLR \r\n");
         for(i=0;i<=WidsNo;i++){
-            fprintf(fp, "%-20d%-20d%-4d%-4d\r\n",Log_W_Wids[i][0],Log_W_Wids[i][1],Log_W_WidsLR[i],Log_Count_R[i]);
+            fprintf(fp, "%-20d%-20d%-4d%-4d%-4d\r\n",Log_W_Wids[i][0],Log_W_Wids[i][1],Log_W_WidsLR[i],Log_Count_R[i],LLog_tmp[i]);
                             }
                         }
 
@@ -1012,8 +1014,8 @@
         case 3:
             lcd.clear();
             lcd.printf(0,"STSpeed");
-            lcd.printf(1,"5.1m/s");
-            SPCom=5100;
+            lcd.printf(1,"6m/s");
+            SPCom=6000;
             wait(0.1);
             break;
         case 2: