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

Dependencies:   PID QEI ikarashiMDC recieveController omni

Revision:
4:c2b09fa31492
Parent:
3:01947ec86f09
Child:
6:0bee4b2bb400
diff -r 01947ec86f09 -r c2b09fa31492 Spiral.cpp
--- a/Spiral.cpp	Thu Aug 24 20:51:12 2017 +0900
+++ b/Spiral.cpp	Tue Aug 29 17:00:05 2017 +0900
@@ -3,7 +3,7 @@
 Spiral::Spiral(ikarashiMDC* spiralMotor_)
 {
   spiralMotor = spiralMotor_;
-  spiralLimit = new InterruptIn(NC);
+  spiralLimit = new InterruptIn(D15);
   spiralLimit->rise(this,&Spiral::stopRotation);
   spiralLimit->disable_irq();
   rotating = false;
@@ -15,19 +15,9 @@
     return 1;
   spiralLimit->enable_irq();
   spiralMotor->setSpeed(0.4);
-  spiralLimit->rise(this,&Spiral::reversePrep);
   rotating = true;
   return false;
 }
-void Spiral::reversePrep()
-{
-  spiralLimit->rise(this,&Spiral::reverseRotation);
-}
-void Spiral::reverseRotation()
-{
-  spiralMotor->setSpeed(-0.4);
-  spiralLimit->rise(this,&Spiral::stopRotation);
-}
 
 void Spiral::stopRotation()
 {