Diff: main.cpp

Revision:

7:c5940ae7773a

Parent:

4:f0be27a5a83a

Child:

8:33b8899a8dad

diff -r f0be27a5a83a -r c5940ae7773a main.cpp
--- a/main.cpp	Thu Feb 04 09:33:42 2016 +0000
+++ b/main.cpp	Thu Feb 04 17:46:59 2016 +0000
@@ -55,8 +55,17 @@
 // Querregelung Ende
 
 void serial_thread(void const *args) {
+    char c;
+    float f;
     while (true) {
-        Thread::wait(100);
+        serialMinnow.scanf("[%c]=%f\r", &c, &f);
+        if (c == 'v') {
+            serialMinnow.printf("v erhalten: %f", c);
+        } else if (c == 'g') {
+            serialMinnow.printf("g erhalten: %f", c);
+        }
+        heartbeatLED = !heartbeatLED;
+        //Thread::wait(100);
     }
 }
 
@@ -142,11 +151,11 @@
         IMU_registerDataBuffer = supportSystem->getImuRegisterDataBuffer();
         RadioDecoder_registerDataBuffer = supportSystem->getRadioDecoderRegisterDataBuffer();
 
-        for(uint8_t i=0; i<3; i++) {
-            serialMinnow.printf("RadioDecoder - Ch[%d] Valid:      %d\r\n",i,RadioDecoder_registerDataBuffer->channelValid[i]);
-            serialMinnow.printf("RadioDecoder - Ch[%d] ActiveTime: %d\r\n",i,RadioDecoder_registerDataBuffer->channelActiveTime[i]);
-            serialMinnow.printf("RadioDecoder - Ch[%d] Percentage: %d\r\n",i,RadioDecoder_registerDataBuffer->channelPercent[i]);
-        }
+        //for(uint8_t i=0; i<3; i++) {
+        //    serialMinnow.printf("RadioDecoder - Ch[%d] Valid:      %d\r\n",i,RadioDecoder_registerDataBuffer->channelValid[i]);
+        //    serialMinnow.printf("RadioDecoder - Ch[%d] ActiveTime: %d\r\n",i,RadioDecoder_registerDataBuffer->channelActiveTime[i]);
+        //    serialMinnow.printf("RadioDecoder - Ch[%d] Percentage: %d\r\n\r\n",i,RadioDecoder_registerDataBuffer->channelPercent[i]);
+        //}
 
         uint16_t rc_percentage = RadioDecoder_registerDataBuffer->channelActiveTime[0];
         uint8_t rc_valid = RadioDecoder_registerDataBuffer->channelValid[0];
@@ -160,7 +169,7 @@
 
         if (rc_percentage > (uint16_t) 1800 && rc_valid != 0) {
             // oben => Wettbewerb
-            heartbeatLED = true;
+            //heartbeatLED = true;
             buttonLED = false;
             redlightLED = false;
             supportSystem->setLightManagerRemoteLight(false, true);
@@ -171,7 +180,7 @@
             }
         } else if (rc_percentage > (uint16_t) 1200 && rc_valid != 0) {
             // unten => RC-Wettbewerb
-            heartbeatLED = false;
+            //heartbeatLED = false;
             buttonLED = false;
             redlightLED = true;
             supportSystem->setLightManagerRemoteLight(true, true);
@@ -188,7 +197,7 @@
             }
         } else if (rc_percentage > (uint16_t) 800 && rc_valid != 0) {
             // mitte => RC-Training
-            heartbeatLED = false;
+            //heartbeatLED = false;
             buttonLED = true;
             redlightLED = false;
             supportSystem->setLightManagerRemoteLight(true, true);
@@ -215,13 +224,13 @@
         
 
         //serialMinnow.printf("%ld, ", difference_millis);
-        serialMinnow.printf("%f, ", velocity_minnow_queue);
-        serialMinnow.printf("%f, ", steering_angle_minnow_queue);
-        serialMinnow.printf("%d, ", IMU_registerDataBuffer->curveRadiusRegister);
-        serialMinnow.printf("%f, ", IMU_registerDataBuffer->velocityAngularRegister);
-        serialMinnow.printf("%f, ", IMU_registerDataBuffer->velocityAngularFilteredRegister);
-        serialMinnow.printf("%f, ", IMU_registerDataBuffer->velocityXRegister);
-        serialMinnow.printf("%f\r\n", IMU_registerDataBuffer->velocityXFilteredRegister);
+        //serialMinnow.printf("%f, ", velocity_minnow_queue);
+        //serialMinnow.printf("%f, ", steering_angle_minnow_queue);
+        //serialMinnow.printf("%d, ", IMU_registerDataBuffer->curveRadiusRegister);
+        //serialMinnow.printf("%f, ", IMU_registerDataBuffer->velocityAngularRegister);
+        //serialMinnow.printf("%f, ", IMU_registerDataBuffer->velocityAngularFilteredRegister);
+        //serialMinnow.printf("%f, ", IMU_registerDataBuffer->velocityXRegister);
+        //serialMinnow.printf("%f\r\n", IMU_registerDataBuffer->velocityXFilteredRegister);
         Thread::wait(50);
     }
 }