ino/softserial_mock/softserial_mock.ino

@@ -29,8 +29,4 @@ void loop () {
     softSerial.write(cmdChar);
     Serial.println(cmdChar);
   }
-  if (softSerial.available()) {
-    cmdChar = (char)softSerial.read();
-    Serial.println(cmdChar);
-  }
 }

ino/takeup/takeup.ino

@@ -93,7 +93,7 @@ void loop() {
   }
 
   if (cmdChar != 'z') {
-    cmd(cmdChar, 0);
+    cmd(cmdChar);
   }
 
   cmdChar = 'z';
@@ -103,7 +103,7 @@ void loop() {
   }
 
   if (cmdChar != 'z') {
-    cmd(cmdChar, 1);
+    cmd(cmdChar);
   }
 
   cmdChar = 'z';
@@ -116,11 +116,11 @@ void loop() {
   }
 }
 
-void cmd (char which, int source) {
+void cmd (char which) {
   if (which == Fcmd && !Frunning) {
-    forward(source);
+    forward();
   } else if (which == Bcmd && !Brunning) {
-    backward(source);
+    backward();
   } else if (which == cmd_debug) {
     debug();
   } else if (which == cmd_connect) {
@@ -130,25 +130,15 @@ void cmd (char which, int source) {
   }
 }
 
-void forward (int source) {
+void forward () {
   log("forward()");
-  if (source == 0) {
-    Serial.println(Fcmd);
-  } else if (source == 1) {
-    softSerial.write(Fcmd);
-  }
   Ftime = timer;
   set_speed(Fmotor, frameSpeed);
   clockwise(Fmotor);
 }
 
-void backward (int source) {
+void backward () {
   log("backward()");
-  if (source == 0) {
-    Serial.println(Bcmd);
-  } else if (source == 1) {
-    softSerial.write(Bcmd);
-  }
   Btime = timer;
   set_speed(Bmotor, frameSpeed);
   counter_clockwise(Bmotor);
@@ -304,9 +294,9 @@ void btnCmd (int index, int time) {
   int multiple = floor(time / buttonPress);
   if (multiple > ButtonMultiple[index]) {
     if (index == Fmotor) {
-      cmd(Fcmd, 0);
+      cmd(Fcmd);
     } else if (index == Bmotor) {
-      cmd(Bcmd, 0);
+      cmd(Bcmd);
     }
     ButtonMultiple[index] = multiple;
   }