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

Dependencies:   PID QEI ikarashiMDC recieveController omni

Revision:
4:c2b09fa31492
Parent:
2:aca690545ec9
Child:
6:0bee4b2bb400
--- a/hayatoBoomerang.h	Thu Aug 24 20:51:12 2017 +0900
+++ b/hayatoBoomerang.h	Tue Aug 29 17:00:05 2017 +0900
@@ -19,11 +19,13 @@
   void update();
   double motorRPM;
   double armAngle;
+  bool calibrating;
+  double beltSpeed;
+  ikarashiMDC* armMotor,*shootingMotor,*beltMotor,*spiralMotor;
 private:
   InterruptIn *speedEncoder;
   QEI *armEncoder;
   InterruptIn* armLimit;
-  ikarashiMDC* armMotor,*shootingMotor,*beltMotor,*spiralMotor;
   DigitalOut *rscs;
   PID *speedPID,*armPID;
   Timer rpmCalc;
@@ -31,6 +33,7 @@
   Spiral* spiral;
   void endCalibration();
   void beltStop();
+  bool firing;
 
   void shootingEncoderCount();