Diff: setting/def.h

Revision:

2:635947de1583

Parent:

1:3e013ae7900d

Child:

3:c49ea7ad8e91

--- a/setting/def.h	Sun Feb 28 06:38:17 2016 +0000
+++ b/setting/def.h	Thu Mar 03 05:58:43 2016 +0000
@@ -133,27 +133,25 @@
     uint8_t ping[4];
     //line
     uint8_t lineSpot[3];
+    uint8_t lnFlag[3];
+    /*uint8_t LineFlag[3];
+    uint8_t LinePriority[3];
+    uint8_t LineBind[3];*/
     //ir(spi)
     uint8_t irKey;//2bit
     uint8_t irValPhase[2];//3*2bit
-    uint8_t irSpot[2];//4*2bit
+    uint8_t irDif[2];//3bit
+    uint8_t irPosition;//5bit
+    
+    uint8_t irSpot[2];//4*2bit//old
     //ir(playing)
     uint8_t irNotice;
-    uint8_t irPosition;
     //ball
     uint8_t ball;
 } SensorVal;
 typedef struct {
-    //line
-    uint8_t lnFlag[3];
-    uint8_t Flag[3];
-    uint8_t Priority[3];
-    uint8_t Bind[3];
-} LineVal;
-typedef struct {
     //system,flag
     uint8_t strategy;
-    //uint8_t init_point_flag;
     uint8_t jump_flag;//0<=x<=STATE_NUM_Y
     uint8_t stopflag;
     uint8_t KickOffFlag;
@@ -168,5 +166,27 @@
     double s_pow;
     double l_pow;
     int8_t dri_pow;
+    uint8_t ir_pow_table;
 } SystemVal;
+/*
+typedef struct {//for command
+
+    uint8_t (*Function[STATE_NUM_Y])(uint8_t x)
+    uint8_t strategy;
+    uint8_t jump_flag;//0<=x<=STATE_NUM_Y
+    uint8_t stopflag;
+    uint8_t KickOffFlag;
+    uint8_t DribbleFlag;
+    uint8_t KickFlag;
+    uint8_t MotorFlag;
+    uint8_t IrFlag;
+    uint8_t UswFlag;
+    uint8_t UswFlag_2;
+    uint8_t PidFlag;
+    //motor 
+    double s_pow;
+    double l_pow;
+    int8_t dri_pow;
+    uint8_t ir_pow_table;
+} CommandItem;*/
 #endif
\ No newline at end of file