NagaokaRoboticsClub_mbedTeam / Mbed OS NHK2017_octopus2_arms

タコ　腕

Dependencies:   2017NHKpin_config FEP ikarashiMDC

Fork of NHK2017_octopus2 by NagaokaRoboticsClub_mbedTeam

Diff: bot/bot.h

Branch:
develop1
Revision:
23:797d25f3df5e
Parent:
19:34da005ea4ea
--- a/bot/bot.h	Thu Sep 28 20:37:09 2017 +0900
+++ b/bot/bot.h	Sun Oct 01 11:43:53 2017 +0900
@@ -17,7 +17,7 @@
 /**
 * @brief ロボットのクラス
 */
-class Bot : public PIDC
+class Bot
 {
 public :
     /**
@@ -34,8 +34,6 @@
     * @brief 足回りの制御
     */
     void controllDrive();
-    void controllDrive2();
-    void controllDrive3();
 
     /**
     * @brief 機構部の制御
@@ -55,6 +53,7 @@
     WheelUnit quadOmni;
     Slider slider;
     ikarashiMDC armMotor[3];
+    PIDC pidc;
     bool receiveSuccessed;
     DigitalOut led[3];
     Serial debugSerial;