Diff: HbUserOpe.cpp

Revision:

57:56b7e66a0c3d

Parent:

54:283bb711e0fa

diff -r f363a6877c6a -r 56b7e66a0c3d HbUserOpe.cpp
--- a/HbUserOpe.cpp	Wed Mar 06 02:18:47 2019 +0000
+++ b/HbUserOpe.cpp	Thu Mar 07 04:01:10 2019 +0000
@@ -30,7 +30,7 @@
     }
     }
     if(gf_Print.d2.bf.sw){
-        sp.printf("SW : %d%d%d%d%d%d%d%d%d%d ",curOpe.bf.brk_l,curOpe.bf.flt_off,curOpe.bf.r_eng_down,curOpe.bf.r_eng_up,curOpe.bf.rsv_1
+        sp.printf("SW : %d%d%d%d%d%d%d%d%d%d ",curOpe.bf.brk_l,curOpe.bf.flt_off,curOpe.bf.r_eng_down,curOpe.bf.r_eng_up,curOpe.bf.ctrl_sw
                         ,curOpe.bf.brk_r,curOpe.bf.flt_on,curOpe.bf.f_eng_down,curOpe.bf.f_eng_up, curOpe.bf.all_stop);
         //sp.printf("SW : [%04X] ", curOpe.w);
     }
@@ -91,7 +91,7 @@
     else    if(styp == F_ENG_DOWN)  {return curOpe.bf.f_eng_down;}
     else    if(styp == R_ENG_UP)    {return curOpe.bf.r_eng_up;}
     else    if(styp == R_ENG_DOWN)  {return curOpe.bf.r_eng_down;}
-    else    if(styp == R_1)         {return curOpe.bf.rsv_1;}
+    else    if(styp == CTRL_SW)         {return curOpe.bf.ctrl_sw;}
     else    if(styp == ALL_STOP)    {return curOpe.bf.all_stop;}
     else {return false;}
 }
@@ -118,7 +118,7 @@
     else    if(styp1 == F_ENG_DOWN)  {sw1 = curOpe.bf.f_eng_down;}
     else    if(styp1 == R_ENG_UP)    {sw1 = curOpe.bf.r_eng_up;}
     else    if(styp1 == R_ENG_DOWN)  {sw1 = curOpe.bf.r_eng_down;}
-    else    if(styp1 == R_1)         {sw1 = curOpe.bf.rsv_1;}
+    else    if(styp1 == CTRL_SW)         {sw1 = curOpe.bf.ctrl_sw;}
     else    if(styp1 == ALL_STOP)    {sw1 = curOpe.bf.all_stop;}
     else {sw1 = false;}
             if(styp2 == BRK_L)       {sw2 = curOpe.bf.brk_l;}
@@ -129,7 +129,7 @@
     else    if(styp2 == F_ENG_DOWN)  {sw2 = curOpe.bf.f_eng_down;}
     else    if(styp2 == R_ENG_UP)    {sw2 = curOpe.bf.r_eng_up;}
     else    if(styp2 == R_ENG_DOWN)  {sw2 = curOpe.bf.r_eng_down;}
-    else    if(styp2 == R_1)         {sw2 = curOpe.bf.rsv_1;}
+    else    if(styp2 == CTRL_SW)         {sw2 = curOpe.bf.ctrl_sw;}
     else    if(styp2 == ALL_STOP)    {sw2 = curOpe.bf.all_stop;}
     else {sw2 = false;}
 
@@ -148,7 +148,7 @@
     //     if(styp == F_ENG_DOWN){ if(!curOpe.bf.f_eng_down && oldOpe.bf.f_eng_down){ counter[styp].bf.cnt = 0; } }
     //     if(styp == R_ENG_UP){ if(!curOpe.bf.r_eng_up && oldOpe.bf.r_eng_up){ counter[styp].bf.cnt = 0; } }
     //     if(styp == R_ENG_DOWN){ if(!curOpe.bf.r_eng_down && oldOpe.bf.r_eng_down){ counter[styp].bf.cnt = 0; } }
-    //     if(styp == R_1){ if(!curOpe.bf.rsv_1 && oldOpe.bf.rsv_1){ counter[styp].bf.cnt = 0; } }
+    //     if(styp == CTRL_SW){ if(!curOpe.bf.ctrl_sw && oldOpe.bf.ctrl_sw){ counter[styp].bf.cnt = 0; } }
     //     if(styp == ALL_STOP){ if(!curOpe.bf.all_stop && oldOpe.bf.all_stop){ counter[styp].bf.cnt = 0; } }
     //     if(counter[styp].bf.cnt > CNT_NUM_RE){
     //         counter[styp].bf.cnt = 0;
@@ -164,7 +164,7 @@
     //     if(styp == F_ENG_DOWN) return counter[F_ENG_DOWN].bf.flg = curOpe.bf.f_eng_down && !oldOpe.bf.f_eng_down;
     //     if(styp == R_ENG_UP) return counter[R_ENG_UP].bf.flg = curOpe.bf.r_eng_up && !oldOpe.bf.r_eng_up;
     //     if(styp == R_ENG_DOWN) return counter[R_ENG_DOWN].bf.flg = curOpe.bf.r_eng_down && !oldOpe.bf.r_eng_down;
-    //     if(styp == R_1) return counter[R_1].bf.flg = curOpe.bf.rsv_1 && !oldOpe.bf.rsv_1;
+    //     if(styp == CTRL_SW) return counter[CTRL_SW].bf.flg = curOpe.bf.ctrl_sw && !oldOpe.bf.ctrl_sw;
     //     if(styp == ALL_STOP) return counter[ALL_STOP].bf.flg = curOpe.bf.all_stop && !oldOpe.bf.all_stop;
     //     return false;
     // }
@@ -177,7 +177,7 @@
     else if(styp == F_ENG_DOWN) {   return curOpe.bf.f_eng_down && !oldOpe.bf.f_eng_down;    }
     else if(styp == R_ENG_UP)   {   return curOpe.bf.r_eng_up   && !oldOpe.bf.r_eng_up;    }
     else if(styp == R_ENG_DOWN) {   return curOpe.bf.r_eng_down && !oldOpe.bf.r_eng_down;    }
-    else if(styp == R_1)        {   return curOpe.bf.rsv_1      && !oldOpe.bf.rsv_1;    }
+    else if(styp == CTRL_SW)        {   return curOpe.bf.ctrl_sw      && !oldOpe.bf.ctrl_sw;    }
     else if(styp == ALL_STOP)   {   return curOpe.bf.all_stop   && !oldOpe.bf.all_stop;    }
     else                        {   return false;    }
 }