hirromu takaki / states

手動bのほぼ全部

Dependents:   kobayashi_rei 2019BSyudo Bsyudo 2019Bsyudo

Diff: states.h

Revision:
6:3cb78320d4db
Parent:
4:eafd5a0c3351
Child:
8:8ff6db217a17
--- a/states.h	Mon Sep 09 04:48:16 2019 +0000
+++ b/states.h	Fri Sep 13 03:01:12 2019 +0000
@@ -6,9 +6,8 @@
 #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
@@ -24,11 +23,12 @@
     void tellPad();
     void move();
 private:
+
     /*非常停止*/
     DigitalOut emStop;
     
     /*モーター系*/
-    WheelUnit omni;
+//    WheelUnit omni;
     Serial serial;
 
     /*角度制御*/
@@ -46,11 +46,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