Diff: setting/def.h

Revision:

18:3a42a931c95a

Parent:

16:4fadb7a87497

Child:

19:967207de919d

--- a/setting/def.h	Mon Mar 14 08:56:04 2016 +0000
+++ b/setting/def.h	Tue Mar 15 12:03:51 2016 +0000
@@ -171,8 +171,8 @@
 #define F_LINE 2
 #define B_LINE 3
 
-#define X_LINE 1
-#define Y_LINE 0
+#define X_LINE 0
+#define Y_LINE 1
 
 #define LINE_INSIDE 0
 #define LINE_OUTSIDE 1
@@ -211,14 +211,15 @@
     uint8_t lineSpot[3];
     uint8_t lnFlag[3];
     uint8_t NonWall[4];
+    uint8_t NearWall[2];
     uint8_t ReturnDir[2];
     
     uint8_t lnHold;
     uint8_t lnRaw;
     uint8_t lnStop[2];
+    //uint8_t lnStay[2];
     uint8_t lnCorner[4];
-    uint8_t FieldState;//0...inside,1...outside
-    uint8_t kkk;//0...inside,1...outside
+    uint8_t lnRepeat;
     uint8_t FieldSpot;//0...inside,1...outside
     uint8_t lnOrder[3];//first_second_third
     
@@ -254,6 +255,7 @@
     uint8_t UswFlag;
     uint8_t UswFlag2;
     uint8_t PidFlag;
+    uint8_t DefenceFlag;
     //blind//on...1/off...0
     uint8_t IrBlind;
     uint8_t LineBlind;