NagaokaRoboticsClub_mbedTeam / Mbed OS hayatoShooter

2017ロボコンはやとブーメランプログラム

Dependencies:   PID QEI ikarashiMDC recieveController omni

Diff: main.cpp

Revision:
25:fd4fb86b4148
Parent:
24:050d78bb5b69
--- a/main.cpp	Wed Nov 22 18:10:49 2017 +0900
+++ b/main.cpp	Fri Dec 01 18:16:33 2017 +0900
@@ -75,7 +75,7 @@
     if((con.buttons[0]>>3)%2) //square
       angle = 80;
     if((con.buttons[0]>>4)%2) //cross
-      angle = 45;
+      angle = 37.5;
     if((con.buttons[0]>>5)%2) //circle
       angle = 25;
     if((con.buttons[0]>>6)%2) //triangle
@@ -116,10 +116,10 @@
     else
       turnRate = 0;
 
-    if((con.buttons[0]>>14%2))
-      angling = -0.4;
-    else if((con.buttons[0])%2)
-      angling = 0.2;
+    if((con.buttons[0]>>12)%2)
+      angling = -0.2;
+    else if((con.buttons[0]>>14)%2)
+      angling = 0.4;
     else
       angling = 0;
     fishingPole.setAnglingSpeed(angling);