涼太郎 中村 / Mbed 2 deprecated 2ndcomp

Dependencies:   Locate Move Servo button mbed

Fork of 3servotest by 涼太郎 中村

Files at this revision

API Documentation at this revision

Comitter:
choutin
Date:
Fri Sep 09 05:44:54 2016 +0000
Parent:
14:0629ab54765c
Commit message:
a

Changed in this revision

Move.lib Show annotated file Show diff for this revision Revisions of this file
main.cpp Show annotated file Show diff for this revision Revisions of this file
--- a/Move.lib	Thu Sep 08 10:08:17 2016 +0000
+++ b/Move.lib	Fri Sep 09 05:44:54 2016 +0000
@@ -1,1 +1,1 @@
-https://developer.mbed.org/users/choutin/code/Move/#7e99a1c80656
+https://developer.mbed.org/users/choutin/code/Move/#451b0c1d06b7
--- a/main.cpp	Thu Sep 08 10:08:17 2016 +0000
+++ b/main.cpp	Fri Sep 09 05:44:54 2016 +0000
@@ -14,15 +14,15 @@
     
    int targetx[9] = { 600,600,600,1200,900,1200,900,1200,900 };
    int targety[9] = { team*300,team*600,team*900,team*1200,team*900,team*600,team*600,0,team*300 };
-   int goalx=0,goaly1=1200,goaly2=900,goaly3=600,goaly4=300;
+   int goalx=0,goaly1=team*1200,goaly2=team*900,goaly3=team*600,goaly4=team*300;
     
 //オブジェクト0,1,2回収
        pmove(targetx[0],0);
        pmove(targetx[0],targety[0]);
        //回収
-       pmove(targetx[1],targety[1]);
+       pmove(targetx[1],targety[1]-20);
        //回収
-       pmove(targetx[2],targety[2]);
+       pmove(targetx[2],targety[2]-20);
        //回収
        
        pmove(600,1200);//次につなげるハブ
@@ -59,6 +59,7 @@
        pmove(targetx[7],targety[7]);
        //回収
        pmove(1200,300);//ハブ
+       //ここでエラー
         pmove(targetx[8],targety[8]);
        //回収?
        pmove(goalx,goaly4);