Diff: setting/def.h

Revision:

32:367b16d69a32

Parent:

30:5998ba42237e

Child:

33:aa115c30892e

--- a/setting/def.h	Wed Mar 23 13:01:43 2016 +0000
+++ b/setting/def.h	Thu Mar 24 04:54:39 2016 +0000
@@ -2,8 +2,8 @@
 #define _DEF_H_
 
 //red or green
-//#define RED_CAT//jj
-#define GREEN_CAT//lily
+#define RED_CAT//jj
+//#define GREEN_CAT//lily
 
 //BT(BlueTooth)
 #define DATA_NUM 8+2//2byte→KEYCODE（拝啓）とCHECKCODE（敬具） 8byte→やりとりするデータ
@@ -218,7 +218,7 @@
 //データ
 typedef struct {
     //cmps&pid
-    double cmps, CmpsInitialValue, CmpsDiff;//0<x<360
+    double cmps, CmpsInitialValue, CmpsInitialValue2, CmpsInitialValue0, CmpsDiff;//0<x<360
     int16_t FrontDeg, AtkDeg, HoldDeg, GoalDeg;
     //正．．．右回転
     //負．．．左回転
@@ -298,7 +298,12 @@
     uint8_t PingBlind;
     
     uint8_t DriBlind;
+    uint8_t TurnAtkBlind;
+    uint8_t TurnDriBlind;
+    uint8_t TurnHoldBlind;
+    uint8_t KickBlind;
     uint8_t HomeBlind;
+    
     //motor 
     uint8_t pow_num;
     uint8_t s_pow;