Diff: HbUserOpe.cpp

Revision:

30:13ada1a24c59

Parent:

26:732bc37fbefd

Child:

31:56c554c560c1

--- a/HbUserOpe.cpp	Mon Dec 17 13:25:00 2018 +0000
+++ b/HbUserOpe.cpp	Tue Dec 18 11:57:37 2018 +0000
@@ -19,25 +19,28 @@
     curOpe.w = fpgaGetUserSw();
     return curOpe;
 }
+// bool HbUserOpe::ChkCtrlSW(SW_TYPE styp)
+// {
+//             if(styp == ACCEL_R){return curOpe.bf.brk_l;}
+//     else    if(styp == ACCEL_L){return curOpe.bf.axl_l;}
+//     else    if(styp == STOP){return curOpe.bf.stop;}
+//     else    if(styp == YAW_CTRL){return curOpe.bf.y_ctrl;}
+//     else/*if(styp == ENG_STOP)*/{return curOpe.bf.eng_stop;}
+// //    UINT16 mask = 0x1 << styp;
+// //    return curOpe.w & mask;
+// }
 bool HbUserOpe::ChkCtrlSW(SW_TYPE styp)
 {
-            if(styp == ACCEL_R){return curOpe.bf.axl_r;}
-    else    if(styp == ACCEL_L){return curOpe.bf.axl_l;}
-    else    if(styp == STOP){return curOpe.bf.stop;}
-    else    if(styp == YAW_CTRL){return curOpe.bf.y_ctrl;}
-    else/*if(styp == ENG_STOP)*/{return curOpe.bf.eng_stop;}
-//    UINT16 mask = 0x1 << styp;
-//    return curOpe.w & mask;
-}
-bool HbUserOpe::ChkCtrlSW(SW_TYPE2 styp)
-{
-            if(styp == F_L){return curOpe.bf.axl_r;}
-    else    if(styp == F_R){return curOpe.bf.axl_l;}
-    else    if(styp == R_L){return curOpe.bf.stop;}
-    else    if(styp == R_R){return curOpe.bf.y_ctrl;}
-    else/*if(styp == ENG_STOP)*/{return curOpe.bf.eng_stop;}
-//    UINT16 mask = 0x1 << styp;
-//    return curOpe.w & mask;
+            if(styp == BRK_L)   {return curOpe.bf.brk_l;}
+    else    if(styp == BRK_R)   {return curOpe.bf.brk_r;}
+    else    if(styp == R_1)     {return curOpe.bf.resv_1;}
+    else    if(styp == R_2)     {return curOpe.bf.resv_2;}
+    else    if(styp == MOT_STOP){return curOpe.bf.mot_stop;}
+    else    if(styp == R_3)     {return curOpe.bf.resv_3;}
+    else    if(styp == R_4)     {return curOpe.bf.resv_4;}
+    else    if(styp == R_5)     {return curOpe.bf.resv_5;}
+    else    if(styp == R_6)     {return curOpe.bf.resv_6;}
+    else    if(styp == ALL_STOP){return curOpe.bf.all_stop;}
 }
 bool HbUserOpe::ChkCtrlSwAny()
 {
@@ -50,13 +53,16 @@
     }
     return false;
 }
-bool HbUserOpe::ChkCtrlSwRiseEdge(SW_TYPE2 styp)
+bool HbUserOpe::ChkCtrlSwRiseEdge(SW_TYPE styp)
 {
-            if(styp == F_L){return curOpe.bf.axl_r && !oldOpe.bf.axl_r;}
-    else    if(styp == F_R){return curOpe.bf.axl_l && !oldOpe.bf.axl_l;}
-    else    if(styp == R_L){return curOpe.bf.stop && !oldOpe.bf.stop;}
-    else    if(styp == R_R){return curOpe.bf.y_ctrl && !oldOpe.bf.y_ctrl;}
-    else/*if(styp == ENG_STOP)*/{return curOpe.bf.eng_stop && !oldOpe.bf.eng_stop;}
-//    UINT16 mask = 0x1 << styp;
-//    return curOpe.w & mask;
+            if(styp == BRK_L)   {return curOpe.bf.brk_l     && !oldOpe.bf.brk_l;}
+    else    if(styp == BRK_R)   {return curOpe.bf.brk_r     && !oldOpe.bf.brk_r;}
+    else    if(styp == R_1)     {return curOpe.bf.resv_1    && !oldOpe.bf.resv_1;}
+    else    if(styp == R_2)     {return curOpe.bf.resv_2    && !oldOpe.bf.resv_2;}
+    else    if(styp == MOT_STOP){return curOpe.bf.mot_stop  && !oldOpe.bf.mot_stop;}
+    else    if(styp == R_3)     {return curOpe.bf.resv_3    && !oldOpe.bf.resv_3;}
+    else    if(styp == R_4)     {return curOpe.bf.resv_4    && !oldOpe.bf.resv_4;}
+    else    if(styp == R_5)     {return curOpe.bf.resv_5    && !oldOpe.bf.resv_5;}
+    else    if(styp == R_6)     {return curOpe.bf.resv_6    && !oldOpe.bf.resv_6;}
+    else    if(styp == ALL_STOP){return curOpe.bf.all_stop  && !oldOpe.bf.all_stop;}
 }