F^3RC D班 / Mbed 2 deprecated clubvs2017_momoi

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Dependencies:   mbed

Fork of clubvs2017_momoi by ROBOSTEP4期

Diff: KaidaKari.cpp

Revision:
13:9b0efec30108
Parent:
12:b2f3c85cba36
Child:
14:67ee8d8f4efe
diff -r b2f3c85cba36 -r 9b0efec30108 KaidaKari.cpp
--- a/KaidaKari.cpp	Sat Jun 04 09:06:29 2016 +0000
+++ b/KaidaKari.cpp	Mon Jun 06 08:27:21 2016 +0000
@@ -14,22 +14,22 @@
 DigitalOut led4(LED4);
 
 //MD1
-PwmOut motorRightOne (p24);
-PwmOut motorRightTwo (p23);
+PwmOut motorRightOne (p25);
+PwmOut motorRightTwo (p26);
 
 //MD2
-PwmOut motorLeftOne (p22);
-PwmOut motorLeftTwo (p21);
+PwmOut motorLeftOne (p23);
+PwmOut motorLeftTwo (p24);
 
 //MD3 Arm1
-PwmOut armOneJun(p25);
-DigitalOut chocolateOne (p6);
-DigitalOut chocolateTwo (p5);
+PwmOut armOneJun(p22);
+DigitalOut armROne (p29);
+DigitalOut armRTwo (p30);
 
 //MD4 Arm2
-PwmOut armTwoTaka(p26);
-DigitalOut brownieOne (p29);
-DigitalOut brownieTwo (p30);
+PwmOut armTwoTaka(p21);
+DigitalOut armLOne (p19);
+DigitalOut armLTwo (p20);
 
 
 /*
@@ -166,22 +166,7 @@
         motorLeftTwo = 0;
         }
 
-    if(((ButtonState >> BUTTONCIRCLE)&1) == 1 && ((ButtonState >> BUTTONCROSS)&1) == 0) { //つかむか放す
-        chocolateOne = 0.1;
-        chocolateTwo = 0;
-        brownieOne = 0.1;
-        brownieOne = 0;
-    } else if (((ButtonState >> BUTTONCIRCLE)&1) == 0 && ((ButtonState >> BUTTONCROSS)&1) == 1) {
-        chocolateOne = 0;
-        chocolateTwo = 0.1;
-        brownieOne = 0;
-        brownieOne = 0.1;
-    } else {
-        chocolateOne = 0;
-        chocolateTwo = 0;
-        brownieOne = 0;
-        brownieOne = 0;
-    };
+