Diff: main.cpp

Revision:

5:1548821bebf3

Parent:

4:ab73021bbce1

Child:

6:2675289c6463

--- a/main.cpp	Fri Oct 04 12:44:52 2019 +0000
+++ b/main.cpp	Sat Oct 05 09:04:33 2019 +0000
@@ -121,8 +121,8 @@
         get_data();
         mode_change();
         change_pwm();
+        change_data();
         change_servo();
-        change_data();
         //change_rack();
         change_rack_2();
         sequence_kaisyu();
@@ -505,13 +505,13 @@
     } else if(circle!=old_circle) {
         old_circle=circle;
         //バスタオル挟む機構
-        if(circle==1&&(get_data_rs232 & 0b00000011)) {
+        if(circle==1/*&&(get_data_rs232 & 0b00000011)*/) {
             if(k==1) {
-                data_servo=0x03;
+                data_servo=0xf3;
                 //send_data(0x18,data_servo);
                 k=0;
-            } else if(k==0&&(get_data_rs232 & 0b00000011)) {
-                data_servo=0x04;
+            } else if(k==0/*&&(get_data_rs232 & 0b00000011)*/) {
+                data_servo=0xf4;
                 //send_data(0x18,data_servo);
                 k=1;
             }