Diff: defines.h

Revision:

6:a5f674c2f262

Parent:

4:72c26c07c251

Child:

7:77174a098e6f

--- a/defines.h	Mon Nov 20 00:46:15 2017 +0000
+++ b/defines.h	Fri Apr 20 18:14:15 2018 +0000
@@ -4,11 +4,13 @@
 #include "mbed.h"
 #include "AsyncSerial.hpp"
 
-//#include "Lib_DFPlayerMini.h"
-#include "Lib_MPU9250_SPI.h"
+#include "Lib_DFPlayerMini.h"
+#include "Lib_MPU9250.h"
+#include "filter_func.h"
 
-//#define USE_SERIAL_DEBUG
+#define USE_SERIAL_DEBUG
 //#define USE_LED_DEBUG
+#define USE_FILESYSTEM
 
 #ifdef USE_SERIAL_DEBUG
     #define DEBUG_BAUDRATE  115200
@@ -24,18 +26,18 @@
 #define CAN_RX                  (p30)
 #define CAN_TX                  (p29)
 
-#define MPU9250_CS              p7
-#define MPU9250_MOSI            p11
-#define MPU9250_MISO            p12
-#define MPU9250_SCK             p13
-#define MPU9250_INT             p8
+#define MPU9250_CS              (p7)
+#define MPU9250_MOSI            (p11)
+#define MPU9250_MISO            (p12)
+#define MPU9250_SCK             (p13)
+#define MPU9250_INT             (p8)
 
-#define DFPLAYER_RX             p27
-#define DFPLAYER_TX             p28
-#define DFPLAYER_BUSY           p18
+#define MPU9250_SDA             (p9)
+#define MPU9250_SCL             (p10)
 
-#define BLUETOOTH_RX            USBRX
-#define BLUETOOTH_TX            USBTX
+#define DFPLAYER_RX             (p27)
+#define DFPLAYER_TX             (p28)
+#define DFPLAYER_BUSY           (p18)
 
 #define NEOPIXEL_DOUT           (p21)
 
@@ -65,16 +67,10 @@
   float   C_max_angle;
 } STRUCTCONRTOLPARAM;
 
-typedef struct _STRUCTPAD{
-  uint8_t enable;             // 制御許可(0=制御しない 1=制御する)  
-  float   x;                  // X軸値( -1.0～1.0 0.0で中立 )
-  float   y;                  // Y軸値( -1.0～1.0 0.0で中立 )
-} STRUCTPAD;
-
-extern STRUCTSENSOR         sensor;
+extern STRUCTSENSOR         sensor_vehicle;
+extern STRUCTSENSOR         sensor_interface;
 extern STRUCTPOSTURE        posture;
 extern STRUCTCONRTOLPARAM   control;
-extern STRUCTPAD            pad;
 
 //extern Ticker           tic_sen_ctrl;
 //extern CAN              can_driver;