Diff: setting/CommandConfig.h

Revision:

10:6df631c39f9b

Parent:

9:c966191926c5

Child:

11:3efae754e6ef

diff -r c966191926c5 -r 6df631c39f9b setting/CommandConfig.h
--- a/setting/CommandConfig.h	Tue Mar 08 09:52:22 2016 +0000
+++ b/setting/CommandConfig.h	Thu Mar 10 03:03:50 2016 +0000
@@ -5,14 +5,16 @@
 #include "extern.h"
 
 const CommandItem static item[STATE_NUM_Y]={
-    {{"None__","Strgy_","Reset_","______"}, 3, ZeroFunction,        ZERO_FUNCTION},
+    {{"None__","Strgy_","Power_","SftRst"}, 4, ZeroFunction,        ZERO_FUNCTION},
     {{"Start_","Active","______","______"}, 2, Start,               START},
+    {{"TrnSrt","Active","______","______"}, 2, TurnAndStart,        TURN_AND_START},
     {{"Ir____","IrSpot","IrNote","IrPstn"}, 4, GetIr,               GET_IR},
-    {{"Line__","LnABC_","PING__","IrKey_"}, 4, GetLine,             GET_LINE},
-    {{"Cmps__","cmps__","______","______"}, 2, GetPidValue,         GET_PID_VALUE},
-    {{"ClbEnt","Enter_","______","______"}, 2, CalibrationEnter,    CALIBRATION_ENTER},
-    {{"ClbExt","Exit__","______","______"}, 2, CalibrationExit,     CALIBRATION_EXIT},
-    {{"CpsRst","CpsRst","______","______"}, 2, FrontReset,          FRONT_RESET},
+    {{"Sens0_","LnABC_","PING__","BallAn"}, 4, GetSns0,             GET_SNS0},
+    //{{"Cmps__","cmps__","______","______"}, 2, GetPidValue,         GET_PID_VALUE},
+    {{"Cmps__","cmps__","CpsRst","______"}, 3, RwPid,         RW_PID},
+    //{{"ClbEnt","Enter_","______","______"}, 2, CalibrationEnter,    CALIBRATION_ENTER},
+    //{{"ClbExt","Exit__","______","______"}, 2, CalibrationExit,     CALIBRATION_EXIT},
+    //{{"CpsRst","CpsRst","______","______"}, 2, FrontReset,          FRONT_RESET},
     {{"PowUP_","NEXT__","CHANGE","______"}, 3, SetPowerDown,           SET_POWER_DOWN},
     {{"PowDWN","NEXT__","CHANGE","______"}, 3, SetPowerUp,           SET_POWER_UP},
     //{{"IrPow0","S20L20","S30L30","S40L40"}, 4, SetPower1,           SET_POWER1},
@@ -22,11 +24,13 @@
     //{{"Test1_","Debug3","Debug4","Debug5"}, 4, SetStrategy2,        SET_STRATEGY2},
     //{{"Strgy0","Atk0__","Atk1__","Atk2__"}, 4, SetStrategy3,        SET_STRATEGY3},
     //{{"Strgy1","Atk3__","Atk4__","Atk5__"}, 4, SetStrategy4,        SET_STRATEGY4},
-    {{"ClbEnt","Enter_","______","______"}, 2, CalibrationEnter,    CALIBRATION_ENTER},
+    //{{"ClbEnt","Enter_","______","______"}, 2, CalibrationEnter,    CALIBRATION_ENTER},
+    {{"ClbTrn","Tuning","______","______"}, 2, CalibrationTurn,    CALIBRATION_TURN},
     {{"ClbExt","Exit__","______","______"}, 2, CalibrationExit,     CALIBRATION_EXIT},
-    //{{"StrUP_","NEXT__","CHANGE","______"}, 3, SetStrategyDown,           SET_STRATEGY_DOWN},
+    {{"StrUP_","NEXT__","CHANGE","______"}, 3, SetStrategyDown,           SET_STRATEGY_DOWN},
+    {{"StrDWN","NEXT__","CHANGE","______"}, 3, SetStrategyUp,           SET_STRATEGY_UP},
     {{"Kicker","DRIVE_","______","______"}, 2, DriveKicker,           DRIVE_KICKER},
-    {{"StrDWN","NEXT__","CHANGE","______"}, 3, SetStrategyUp,           SET_STRATEGY_UP},
+    {{"Dribbl","DRIVE_","______","______"}, 2, DriveDribblerAndKicker,DRIVE_DRIBBLER_AND_KICKER},
     {{"Start2","Active","______","______"}, 2, Start2,              START2},
     
     //char LcdStr[STATE_NUM_X][BUFSIZE];