Diff: log.cpp

Revision:

10:e63fe4080760

Parent:

9:1b54bac6d9a7

Child:

11:2156cb77d0d6

--- a/log.cpp	Thu Oct 03 23:28:56 2019 +0000
+++ b/log.cpp	Fri Oct 04 09:46:00 2019 +0000
@@ -3,7 +3,8 @@
 Timer t_loggingTimer;
 int i_logging_duration;
 bool b_LOG_READY = false;
-Serial rs_LOG_pc(USBTX, USBRX);
+Serial rs_LOG_pc(USBTX, USBRX,9600);
+//Serial rs_LOG_odroid(PC_10, PC_11,115200);
 
 
 s_Sample s_LOG_history[LOG_SIZE];
@@ -21,21 +22,35 @@
 
 void log_check()
 {
-    if(t_loggingTimer.read_ms() > i_logging_duration) {
+    if(t_loggingTimer.read_ms() > i_logging_duration || i_LOG_index_data >= LOG_SIZE) {
         b_LOG_READY = true;
         b_LOG_flag = false;
         t_loggingTimer.stop();
         t_loggingTimer.reset();
     }
     if(b_LOG_flag && i_LOG_index_data < LOG_SIZE) {
-        s_LOG_history[i_LOG_index_data].timestamp = t_loggingTimer.read_ms();
-        i_LOG_index_data + 1;
+        i_LOG_index_data ++;
+        rs_LOG_pc.printf("i_LOG_index_data:%d\r\n",i_LOG_index_data);
     }
+    
 }
 void log_pc()
 {
     rs_LOG_pc.printf("timestamp;left_90;right_90;left_45;right_45;pwm_dir;odom;speed;\r\n");
-    for(int i = 0; i<LOG_SIZE; i++) {
-        rs_LOG_pc.printf("%d;%f;%f;%f;%f;%d;%f;%f;\r\n",s_LOG_history[i_LOG_index_data].timestamp,s_LOG_history[i_LOG_index_data].left_90,s_LOG_history[i_LOG_index_data].right_90,s_LOG_history[i_LOG_index_data].left_45,s_LOG_history[i_LOG_index_data].right_45,s_LOG_history[i_LOG_index_data].pwm_dir,s_LOG_history[i_LOG_index_data].odom,s_LOG_history[i_LOG_index_data].speed);
+    for(int i = 0; i<i_LOG_index_data; i++) {
+        rs_LOG_pc.printf("%d;%f;%f;%f;%f;%d;%f;%f;\r\n",s_LOG_history[i].timestamp,s_LOG_history[i].left_90,s_LOG_history[i].right_90,s_LOG_history[i].left_45,s_LOG_history[i].right_45,s_LOG_history[i].pwm_dir,s_LOG_history[i].odom,s_LOG_history[i].speed);
+    
+    s_LOG_history[i].left_90 = 0.0;
+    s_LOG_history[i].right_90 = 0.0;
+    s_LOG_history[i].left_45 = 0.0;
+    s_LOG_history[i].right_45 = 0.0;
+    s_LOG_history[i].odom = 0.0;
+    s_LOG_history[i].speed = 0.0;
+    s_LOG_history[i].timestamp = 0;
+    s_LOG_history[i].pwm_dir = 0;
+    
+    
     }
+    i_LOG_index_data = 0;
+    b_LOG_READY = false;
 }