Z991239-6329 #comment 常量化

Module/mod_gpio/GpioFSM.cpp

@@ -875,10 +875,10 @@ void CGPIOFSM::OnEventDetect(void* pData)
 	/** 震动感应 */
 	if (DetectBit(btInput, VIBRATIONSENSOR) && !m_bVibrationFlag) {
 		m_bVibrationFlag = true;
-		LogEvent(Severity_Middle, LOG_EVT_VIBRATIONSENSOR, CSimpleStringA::Format("%s [Active]", GetDriverPortString(17)));
+		LogEvent(Severity_Middle, LOG_EVT_VIBRATIONSENSOR, CSimpleStringA::Format("%s [Active]", GetDriverPortString(PIN_DETECT_SHAKE + 1)));
 	}
 	else if (!DetectBit(btInput, VIBRATIONSENSOR) && m_bVibrationFlag) {
-		LogEvent(Severity_Middle, LOG_EVT_VIBRATIONSENSOR_OFF, CSimpleStringA::Format("%s [InActive]", GetDriverPortString(17)));
+		LogEvent(Severity_Middle, LOG_EVT_VIBRATIONSENSOR_OFF, CSimpleStringA::Format("%s [InActive]", GetDriverPortString(PIN_DETECT_SHAKE + 1)));
 		m_bVibrationFlag = false;
 	}
 
@@ -886,13 +886,13 @@ void CGPIOFSM::OnEventDetect(void* pData)
 	if (DetectBit(btInput, OPENSENSOR) && !m_bOpenFlag) {
 		m_bOpenFlag = true;
 		m_DoorOpenTimeStamp = SP::Module::Comm::RVCGetTickCount();
-		LogEvent(Severity_Middle, LOG_EVT_OPENSENSOR_ON, CSimpleStringA::Format("%s [Active]", GetDriverPortString(18)));
+		LogEvent(Severity_Middle, LOG_EVT_OPENSENSOR_ON, CSimpleStringA::Format("%s [Active]", GetDriverPortString(PIN_DETECT_OPENDOOR + 1)));
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode(GpioService_LogCode_Detect_DoorOpen)("[GPIO] The chassis door is open");
 	}
 	else if (!DetectBit(btInput, OPENSENSOR) && m_bOpenFlag) {
 		m_bOpenFlag = false;
 		m_DoorCloseTimeStamp = SP::Module::Comm::RVCGetTickCount();
-		LogEvent(Severity_Middle, LOG_EVT_OPENSENSOR_OFF, CSimpleStringA::Format("%s [InActive]", GetDriverPortString(18)));
+		LogEvent(Severity_Middle, LOG_EVT_OPENSENSOR_OFF, CSimpleStringA::Format("%s [InActive]", GetDriverPortString(PIN_DETECT_OPENDOOR + 1)));
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode(GpioService_LogCode_Detect_DoorClose).setCostTime(m_DoorCloseTimeStamp - m_DoorOpenTimeStamp)("[GPIO] The chassis door is close");
 	}
 
@@ -928,11 +928,11 @@ void CGPIOFSM::OnEventDetect(void* pData)
 			m_bMoveFlag = true;
 			m_moveDisappearTimes = 0;
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("[GPIO] 有人（物体）状态");
-			LogEvent(Severity_Middle, LOG_EVT_MOVESENSOR_ON, CSimpleStringA::Format("%s [Active], times: %lu", GetDriverPortString(20), m_moveHoldTimes));
+			LogEvent(Severity_Middle, LOG_EVT_MOVESENSOR_ON, CSimpleStringA::Format("%s [Active], times: %lu", GetDriverPortString(PIN_DETECT_BODY + 1), m_moveHoldTimes));
 		}
 		/** 只是发一次时间时，发现感知实体没有收到或者不处理第一次发出的时间，所以需要沿用原有的发送频率，再继续发送消失的事件，下同  [Gifur@202496]*/
 		else if (m_moveHoldTimes != 0 && (m_moveHoldTimes % REPEAT_FIRE_TIMEOUT_TIMES) == 0) {
-			LogEvent(Severity_Middle, LOG_EVT_MOVESENSOR_ON, CSimpleStringA::Format("%s [Active], times: %lu", GetDriverPortString(20), m_moveHoldTimes));
+			LogEvent(Severity_Middle, LOG_EVT_MOVESENSOR_ON, CSimpleStringA::Format("%s [Active], times: %lu", GetDriverPortString(PIN_DETECT_BODY + 1), m_moveHoldTimes));
 		}
 		/** TODO:诗友确定  [Gifur@202579]*/
 		const bool toCheck = !!(m_moveHoldTimes != 0 && (m_moveHoldTimes % (10/*mins*/ * 60 * 1000 / ON_EVENT_DETECT_TIMOUE_MILLSECS) == 0));
@@ -941,10 +941,10 @@ void CGPIOFSM::OnEventDetect(void* pData)
 			GetLocalTime(&localTime);
 			if (localTime.wHour < (WORD)8 || (localTime.wHour == 8 && localTime.wMinute <= (WORD)30) || localTime.wHour >= (WORD)18)
 			{
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA2903")("%s is abnormal(off work)", GetDriverPortString(20));
+				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA2903")("%s is abnormal(off work)", GetDriverPortString(PIN_DETECT_BODY + 1));
 			}
 			else {
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA2902")("%s is abnormal(Work time)", GetDriverPortString(20));
+				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA2902")("%s is abnormal(Work time)", GetDriverPortString(PIN_DETECT_BODY + 1));
 			}
 		}
 		m_moveHoldTimes++;
@@ -954,21 +954,21 @@ void CGPIOFSM::OnEventDetect(void* pData)
 			m_bMoveFlag = false;
 			m_moveHoldTimes = 0;
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("[GPIO] 无人（物体）状态");
-			LogEvent(Severity_Middle, LOG_EVT_MOVESENSOR_OFF, CSimpleStringA::Format("%s [InActive]", GetDriverPortString(20)));
+			LogEvent(Severity_Middle, LOG_EVT_MOVESENSOR_OFF, CSimpleStringA::Format("%s [InActive]", GetDriverPortString(PIN_DETECT_BODY + 1)));
 		}
 		else if (m_moveDisappearTimes != 0 && (m_moveDisappearTimes % REPEAT_FIRE_TIMEOUT_TIMES) == 0) {
 			if((m_moveDisappearTimes / REPEAT_FIRE_TIMEOUT_TIMES <= 6/*一分钟内10s打印一次*/) || (m_moveDisappearTimes % (REPEAT_FIRE_TIMEOUT_TIMES * 3/*超过一分钟后半分钟打印一次*/)) == 0)
-				LogEvent(Severity_Middle, LOG_EVT_MOVESENSOR_OFF, CSimpleStringA::Format("%s [InActive]", GetDriverPortString(20)));
+				LogEvent(Severity_Middle, LOG_EVT_MOVESENSOR_OFF, CSimpleStringA::Format("%s [InActive]", GetDriverPortString(PIN_DETECT_BODY + 1)));
 		}
 		m_moveDisappearTimes++;
 	}
 	/*卡嘴异物检测*/
 	if (DetectBit(btInput, CARDGATESENSOR) && !m_bCardGateFlag) {
 		m_bCardGateFlag = true;
-		LogEvent(Severity_Middle, LOG_EVT_CARDGATESENSOR, CSimpleStringA::Format("%s [Active]", GetDriverPortString(21)));
+		LogEvent(Severity_Middle, LOG_EVT_CARDGATESENSOR, CSimpleStringA::Format("%s [Active]", GetDriverPortString(PIN_DETECT_CARDMOUSE_JAM + 1)));
 	}
 	else if (!DetectBit(btInput, CARDGATESENSOR) && m_bCardGateFlag) {
-		LogEvent(Severity_Middle, LOG_EVT_CARDGATESENSOR_OFF, CSimpleStringA::Format("%s [InActive]", GetDriverPortString(21)));
+		LogEvent(Severity_Middle, LOG_EVT_CARDGATESENSOR_OFF, CSimpleStringA::Format("%s [InActive]", GetDriverPortString(PIN_DETECT_CARDMOUSE_JAM + 1)));
 		m_bCardGateFlag = false;
 	}
 

Module/mod_gpio/GpioFSM.h

@@ -101,6 +101,7 @@ enum DevicePinSeq
 	PIN_DETECT_OPENDOOR,
 	PIN_DETECT_PHONE,
 	PIN_DETECT_BODY,
+	PIN_DETECT_CARDMOUSE_JAM,
 	PIN_HSPSCANNER_LIGHT = 25
 };
 struct GpioSet_Info