1
Revision 11:360230a179b9, committed 2020-03-13
- Comitter:
- shaorui
- Date:
- Fri Mar 13 03:38:13 2020 +0000
- Parent:
- 10:f94e325fc1e6
- Commit message:
- 1
Changed in this revision
diff -r f94e325fc1e6 -r 360230a179b9 DATA_COMMAND/data_command.cpp --- a/DATA_COMMAND/data_command.cpp Thu Mar 12 15:17:18 2020 +0000 +++ b/DATA_COMMAND/data_command.cpp Fri Mar 13 03:38:13 2020 +0000 @@ -99,12 +99,12 @@ } if((duoji_state==DUOJI_MODE)&&(data[2]!='k'))//腕关节数据判断成功,电机跟随位置转动 { - duoji_control.p_des=int(data[2]);//matlab给定的舵机(手爪)的位置信息 + shouzhua_control.p_des=int(data[2]);//matlab给定的舵机(手爪)的位置信息 duoji_command=1; printf("\n\r Duoji Start\r"); //舵机开始运动到指定的位置 - printf("f: %.3f\n\r", duoji_control.p_des);//显示舵机的角度信息 + printf("f: %.3f\n\r", shouzhua_control.p_des);//显示舵机的角度信息 } - } + } }
diff -r f94e325fc1e6 -r 360230a179b9 main.cpp --- a/main.cpp Thu Mar 12 15:17:18 2020 +0000 +++ b/main.cpp Fri Mar 13 03:38:13 2020 +0000 @@ -75,11 +75,10 @@ //send_enable = 0; } if(duoji_command==1) - {moveServo(1, duoji_control.p_des, 1000); //1s移动1号舵机至指定的位置 - printf("Move Sucessfully1 ! \n\r"); + { + moveServo(1, shouzhua_control.p_des, 1000); //1s移动1号舵机至指定的位置 + printf("Shouzhua Move Sucessfully1 ! \n\r"); wait(1); - printf("Move Sucessfully2 ! \n\r"); - } //pc.printf("\n\rPpd: %f - %f\r", SP_pf, SP_df);
diff -r f94e325fc1e6 -r 360230a179b9 mbed-dev.lib --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mbed-dev.lib Fri Mar 13 03:38:13 2020 +0000 @@ -0,0 +1,1 @@ +https://os.mbed.com/users/benkatz/code/mbed-dev_spine/#97f825502e2a