#IQRV #comment [GPIO] 告警支持

Module/mod_gpio/mod_gpio.cpp

@@ -893,7 +893,7 @@ void CGpioEntity::OnPositiveLevelTimerOut(void* pData)
 
             if (initCtt == 1) {
                 if (DetectBit(btInput, VIBRATIONSENSOR)) {
-                    if (!m_bVibrationFlag && m_eMachineType == RVC_Stand2S) {
+                    if (!m_bVibrationFlag && (m_eMachineType == RVC_Stand2S || m_eMachineType == RVC_Stand1SPlus)) {
                         LogEvent(Severity_Middle, LOG_EVT_VIBRATIONSENSOR,  CSimpleStringA::Format("%s [Active] line: %d", GetDriverPortString(17), __LINE__));
                     }
                     m_bVibrationFlag = true;
@@ -905,7 +905,7 @@ void CGpioEntity::OnPositiveLevelTimerOut(void* pData)
 
             if (m_bVibrationRound) {
                 if (DetectBit(btInput, VIBRATIONSENSOR) && !m_bVibrationFlag) {
-                    if (m_eMachineType == RVC_Stand2S)
+                    if (m_eMachineType == RVC_Stand2S || m_eMachineType == RVC_Stand1SPlus)
                         LogEvent(Severity_Middle, LOG_EVT_VIBRATIONSENSOR, CSimpleStringA::Format("%s [Active] line: %d", GetDriverPortString(17), __LINE__));
                     m_bVibrationFlag = true;
                     m_bVibrationRound = false;
@@ -929,12 +929,12 @@ void CGpioEntity::OnPositiveLevelTimerOut(void* pData)
             if (initCtt == 1) {
                 if (DetectBit(btInput, OPENSENSOR)) {
                     if (!m_bOpenFlag) {
-                        if (m_eMachineType == RVC_Stand2S)
+                        if (m_eMachineType == RVC_Stand2S || m_eMachineType == RVC_Stand1SPlus)
                             LogEvent(Severity_Middle, LOG_EVT_OPENSENSOR_ON, CSimpleStringA::Format("%s [Active] line: %d", GetDriverPortString(18), __LINE__));
                         m_bOpenFlag = true;
                     }
                 } else if (m_bOpenFlag) {
-                    if (m_eMachineType == RVC_Stand2S)
+                    if (m_eMachineType == RVC_Stand2S || m_eMachineType == RVC_Stand1SPlus)
                         LogEvent(Severity_Middle, LOG_EVT_OPENSENSOR_OFF, CSimpleStringA::Format("%s [InActive] line: %d", GetDriverPortString(18), __LINE__));
                     m_bOpenFlag = false;
                 }
@@ -943,13 +943,13 @@ void CGpioEntity::OnPositiveLevelTimerOut(void* pData)
 
             if (m_bOpenRound) {
                 if (DetectBit(btInput, OPENSENSOR) && !m_bOpenFlag) {
-                    if (m_eMachineType == RVC_Stand2S)
+                    if (m_eMachineType == RVC_Stand2S || m_eMachineType == RVC_Stand1SPlus)
                         LogEvent(Severity_Middle, LOG_EVT_OPENSENSOR_ON, CSimpleStringA::Format("%s [Active] line: %d", GetDriverPortString(18), __LINE__));
                     m_bOpenFlag = true;
                     m_bOpenRound = false;
                 }
             } else if (!DetectBit(btInput, OPENSENSOR) && m_bOpenFlag) {
-                if (m_eMachineType == RVC_Stand2S)
+                if (m_eMachineType == RVC_Stand2S || m_eMachineType == RVC_Stand1SPlus)
                     LogEvent(Severity_Middle, LOG_EVT_OPENSENSOR_OFF, CSimpleStringA::Format("%s [InActive] line: %d", GetDriverPortString(18), __LINE__));
                 m_bOpenFlag = false;
                 m_bOpenRound = true;
@@ -978,7 +978,7 @@ void CGpioEntity::OnPositiveLevelTimerOut(void* pData)
                     if (DetectBit(btInput, PICKUPSENSOR)) {
                         if (m_ePickUpFlag == InActive) {
 
-                            if (m_eMachineType == RVC_Stand2S)
+                            if (m_eMachineType == RVC_Stand2S || m_eMachineType == RVC_Stand1SPlus)
                                 LogEvent(Severity_Middle, LOG_EVT_PICKUP, "话机提起");
 
                             m_ePickUpFlag = Actived;
@@ -986,7 +986,7 @@ void CGpioEntity::OnPositiveLevelTimerOut(void* pData)
 
                     } else if (m_ePickUpFlag == Actived) {
 
-                        if (m_eMachineType == RVC_Stand2S)
+                        if (m_eMachineType == RVC_Stand2S || m_eMachineType == RVC_Stand1SPlus)
                             LogEvent(Severity_Middle, LOG_EVT_ONHOOK, "话机放下");
 
                         m_ePickUpFlag = InActive;
@@ -1001,7 +1001,7 @@ void CGpioEntity::OnPositiveLevelTimerOut(void* pData)
 
                     if (m_ePickUpFlag == InActive) {
 
-                        if (m_eMachineType == RVC_Stand2S)
+                        if (m_eMachineType == RVC_Stand2S || m_eMachineType == RVC_Stand1SPlus)
                             LogEvent(Severity_Middle, LOG_EVT_PICKUP, "话机提起");
 
                         m_ePickUpFlag = Actived;
@@ -1015,7 +1015,7 @@ void CGpioEntity::OnPositiveLevelTimerOut(void* pData)
 
                 if (m_ePickUpFlag == Actived) {
 
-                    if (m_eMachineType == RVC_Stand2S)
+                    if (m_eMachineType == RVC_Stand2S || m_eMachineType == RVC_Stand1SPlus)
                         LogEvent(Severity_Middle, LOG_EVT_ONHOOK, "话机放下");
 
                     m_ePickUpFlag = InActive;
@@ -1038,7 +1038,7 @@ void CGpioEntity::OnPositiveLevelTimerOut(void* pData)
         do {
             if (initCtt == 1) {
                 if (DetectBit(btInput, MOVESENSOR)) {
-                    if (m_eMachineType == RVC_Stand2S)
+                    if (m_eMachineType == RVC_Stand2S || m_eMachineType == RVC_Stand1SPlus)
                         LogEvent(Severity_Middle, LOG_EVT_MOVESENSOR_ON, CSimpleStringA::Format("%s [Active] line: %d", GetDriverPortString(20), __LINE__));
                 }
                 break;
@@ -1049,11 +1049,11 @@ void CGpioEntity::OnPositiveLevelTimerOut(void* pData)
                     m_moveDisappearTimes = 0;
                     if (m_moveHoldTimes < MAX_MOVE_HOLD_TIMES) { // 100ms * 5000
                         if ((m_moveHoldTimes % LOG_TIME_VALUE) == 0) {  //100ms * 25 = 2.5s 但因为厂家接口调用，不进来计数，需要800ms+
-                            if (m_eMachineType == RVC_Stand2S)
+                            if (m_eMachineType == RVC_Stand2S || m_eMachineType == RVC_Stand1SPlus)
                                 LogEvent(Severity_Middle, LOG_EVT_MOVESENSOR_ON, CSimpleStringA::Format("%s [Active] line: %d", GetDriverPortString(20), __LINE__));
                         }
                     } else if ((m_moveHoldTimes % MAX_MOVE_HOLD_TIMES) == 0) { //难道8分钟一直有人就异常？还有一个 Round 标识
-                        if (m_eMachineType == RVC_Stand2S)
+                        if (m_eMachineType == RVC_Stand2S || m_eMachineType == RVC_Stand1SPlus)
                             LogWarn(Severity_Middle, Error_Unexpect, LOG_EVT_MOVEDETECT_ABNORMAL, "移动次数异常");
                     }
                     m_moveHoldTimes++;
@@ -1062,7 +1062,7 @@ void CGpioEntity::OnPositiveLevelTimerOut(void* pData)
             } else if (!DetectBit(btInput, MOVESENSOR)) {
                 m_moveHoldTimes = 0;
                 if ((m_moveDisappearTimes % LOG_TIME_VALUE) == 0) {
-                    if (m_eMachineType == RVC_Stand2S)
+                    if (m_eMachineType == RVC_Stand2S || m_eMachineType == RVC_Stand1SPlus)
                         LogEvent(Severity_Middle, LOG_EVT_MOVESENSOR_OFF, CSimpleStringA::Format("%s [InActive] line: %d", GetDriverPortString(20), __LINE__));
                 }
                 m_moveDisappearTimes++;
@@ -1083,7 +1083,7 @@ void CGpioEntity::OnPositiveLevelTimerOut(void* pData)
             if (initCtt == 1) {
                 if (DetectBit(btInput, CARDGATESENSOR)) {
                     if (!m_bCardGateFlag) {
-                        if (m_eMachineType == RVC_Stand2S)
+                        if (m_eMachineType == RVC_Stand2S || m_eMachineType == RVC_Stand1SPlus)
                             LogEvent(Severity_Middle, LOG_EVT_CARDGATESENSOR, CSimpleStringA::Format("%s [Active] line: %d", GetDriverPortString(21), __LINE__));
                         m_bCardGateFlag = true;
                     }
@@ -1094,7 +1094,7 @@ void CGpioEntity::OnPositiveLevelTimerOut(void* pData)
 
             if (m_bCardGateRound) {
                 if (DetectBit(btInput, CARDGATESENSOR) && !m_bCardGateFlag) {
-                    if (m_eMachineType == RVC_Stand2S)
+                    if (m_eMachineType == RVC_Stand2S || m_eMachineType == RVC_Stand1SPlus)
                         LogEvent(Severity_Middle, LOG_EVT_CARDGATESENSOR, CSimpleStringA::Format("%s [Active] line: %d", GetDriverPortString(21), __LINE__));
                     m_bCardGateFlag = true;
                     m_bCardGateRound = false;