Diff: bot/bot.cpp

Revision:

44:3466b8e98fd9

Parent:

43:c659cd5baa14

Child:

45:a3ff2bc0574b

--- a/bot/bot.cpp	Sun Oct 22 11:24:12 2017 +0900
+++ b/bot/bot.cpp	Mon Oct 23 18:40:00 2017 +0900
@@ -75,7 +75,7 @@
     float moment = 0;
     static float beforestick = pad.getStick(2);
 
-    if(!pad.getButton1(6)) {
+    if(!pad.getButton2(4)) {
         axis.resetOffset();
         debugSerial.printf("Force RESeT\n\r");
     }
@@ -187,11 +187,11 @@
             armMotor[ROLL].setSpeed(0.0);
         }
 
-        if(!pad.getButton1(0)) {
+        if(!pad.getButton2(3)) {
             debugSerial.printf("FUKUDA\n\r");
             armMotor[SWORD].setSpeed(1.0);
         }
-        if(pad.getButton1(0)) armMotor[SWORD].setSpeed(0.0);
+        if(pad.getButton2(3)) armMotor[SWORD].setSpeed(0.0);
 
         slider.slide(pad.getStick(3));
 
@@ -213,8 +213,8 @@
 void Bot::calibrate()
 {
     if(receiveSuccessed &&
-            !pad.getButton2(0) &&
-            !pad.getButton2(1)
+            !pad.getButton2(4) &&
+            !pad.getButton2(5)
       ){
         t.start();
         t.reset();