Diff: serialcom.cpp

Revision:

128:c583aff5a7bf

Parent:

127:831f03471efb

Child:

129:53d23eae7a6a

diff -r 831f03471efb -r c583aff5a7bf serialcom.cpp
--- a/serialcom.cpp	Thu Oct 29 22:46:30 2015 +0100
+++ b/serialcom.cpp	Thu Oct 29 23:43:54 2015 +0100
@@ -23,39 +23,56 @@
     pc.scanf("%s", buf);
     if(strcmp(buf,"ledRed")==0){
         redLed.write(!redLed.read());
-        pc.printf("received data\n");
     }
     if(strcmp(buf,"ledBlue")==0){
         blueLed.write(!blueLed.read());
-        pc.printf("received data\n");
     }
     if(strcmp(buf,"ledGreen")==0){
         greenLed.write(!greenLed.read());
-        pc.printf("received data\n");
     }
     if(strcmp(buf, "switchPump")==0){
         enablePump = !enablePump;
-        pc.printf("enablePump %d\n", enablePump);
     }
     if(strcmp(buf, "startCalibration")==0){
         startCalibration = true;
-        pc.printf("startCalibration %d\n", startCalibration);
     }
     if(strcmp(buf, "enableEMG")==0){
         enableEMG = true;
-        pc.printf("enableEMG %d\n", enableEMG);
     }
     if(strcmp(buf, "usePotmeters")==0){
         usePotmeters = true;
-        pc.printf("usePotmeters %d\n", usePotmeters);
     }
     if(strcmp(buf, "controlAngle")==0){
         controlAngle = true;
-        pc.printf("controlAngle %d\n", controlAngle);
     }
     if(strcmp(buf, "controlDirection")==0){
         controlDirection = true;
-        pc.printf("controlDirection %d\n", controlDirection);
     }
+
+    // Writers
+    pc.printf("enablePump %d\n", enablePump);
+    pc.printf("startCalibration %d\n", startCalibration);
+    pc.printf("enableEMG %d\n", enableEMG);
+    pc.printf("usePotmeters %d\n", usePotmeters);
+    pc.printf("controlAngle %d\n", controlAngle);
+    pc.printf("controlDirection %d\n", controlDirection);
+    pc.printf("calReady %d\n", calReady);
+    pc.printf("motorsEnable %d\n", motorsEnable);
+    pc.printf("EMGCalReady %d\n", EMGCalReady);
+    pc.printf("Xpos %.3ld\n", Xpos);
+    pc.printf("Ypos %.3ld\n", Ypos);
+    pc.printf("motor1Pos %.3ld\n", motor1Pos);
+    pc.printf("motor2Pos %.3ld\n", motor2Pos);
+
+    // transmit correct DOF controller
+    if(usePotermers){
+        transmitDOF = actuatorState; // DOF controlled by buttons
+    }if(enableEMG){
+        transmitDOF = DOF; // DOF controlled by EMG
+    }
+    pc.printf("DOF %i\n", transmitDOF);  // DOF: 1=x 2=y 3=z
+
+
+
 }