NHK2019ROBOCON team A manual robot program 10/4 version (ロボコン前日ピットにて)
Dependencies: mbed 2019ROBOKONmanualProgram
Revision 5:1548821bebf3, committed 2019-10-05
- Comitter:
- shina
- Date:
- Sat Oct 05 09:04:33 2019 +0000
- Parent:
- 4:ab73021bbce1
- Commit message:
- NHK2019 manual robot program_10/5;
Changed in this revision
main.cpp | Show annotated file Show diff for this revision Revisions of this file |
diff -r ab73021bbce1 -r 1548821bebf3 main.cpp --- 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; }