hirromu takaki / states

手動bのほぼ全部

Dependents:   kobayashi_rei 2019BSyudo Bsyudo 2019Bsyudo

Diff: states.h

Revision:
7:9d5746931f80
Parent:
5:3273db2411d8
--- a/states.h	Tue Sep 10 01:49:31 2019 +0000
+++ b/states.h	Fri Sep 13 03:22:42 2019 +0000
@@ -6,10 +6,7 @@
 #include "pin_config.h"
 #include "PS3.h"
 #include "R1370.h"
-#include "wheelUnit.h"
 #include "mechanism.h"
-#include "serialArduino.h"
-#include <math.h>
 
 #define front 0
 #define right 90
@@ -25,11 +22,12 @@
     void tellPad();
     void move();
 private:
+
     /*非常停止*/
     DigitalOut emStop;
     
     /*モーター系*/
-    WheelUnit omni;
+//    WheelUnit omni;
     Serial serial;
 
     /*角度制御*/
@@ -47,11 +45,10 @@
     /*コントローラ系*/
     PS3 pad;
     int stick[4],trigger[2];
+    
     int b[12],b2[12],b3[12];
-    float rad[2],norm[2];
-    int check;
+    float norm[2];
+    //sint check;
     
-    /*arduino*/
-    SerialArduino nano;
 };
 #endif