Diff: setting/def.h

Revision:

19:967207de919d

Parent:

18:3a42a931c95a

Child:

21:378470320524

--- a/setting/def.h	Tue Mar 15 12:03:51 2016 +0000
+++ b/setting/def.h	Wed Mar 16 02:58:31 2016 +0000
@@ -200,7 +200,8 @@
 //データ
 typedef struct {
     //cmps&pid
-    double cmps, CmpsInitialValue, CmpsDiff, FrontDeg, AtkDeg;//0<x<360
+    double cmps, CmpsInitialValue, CmpsDiff;//0<x<360
+    int16_t FrontDeg, AtkDeg;
     double InputPID;//<<gyrosensor
     int16_t OutputPID;//>>motor
 } CompassVal;
@@ -246,7 +247,9 @@
     uint8_t stopflag;
     uint8_t KickOffFlag;
     uint8_t DribbleFlag;
-    uint8_t BallHoldFlag;
+    //uint8_t BallHoldJudgeFlag;
+    //uint8_t BallHoldGiveUpFlag;
+    //uint8_t BallHoldFlag;
     uint8_t BackHomeFlag;
     uint8_t TurnStartFlag;
     uint8_t KickFlag;
@@ -254,12 +257,16 @@
     uint8_t IrFlag;
     uint8_t UswFlag;
     uint8_t UswFlag2;
+    uint8_t InfoFlag;
     uint8_t PidFlag;
     uint8_t DefenceFlag;
     //blind//on...1/off...0
     uint8_t IrBlind;
     uint8_t LineBlind;
     uint8_t PingBlind;
+    
+    uint8_t DriBlind;
+    uint8_t HomeBlind;
     //motor 
     uint8_t pow_num;
     uint8_t s_pow;