Browse Source

#IQRV #comment [Merge] GPIO同步

gifur 2 years ago
parent
commit
677d2272b4
2 changed files with 3 additions and 14 deletions
  1. 2 12
      Module/mod_gpio/mod_gpio.cpp
  2. 1 2
      Module/mod_gpio/mod_gpio.h

+ 2 - 12
Module/mod_gpio/mod_gpio.cpp

@@ -167,16 +167,14 @@ void CGpioEntity::ToLogRootINIInfo()
     spConfigRoot->ReadConfigValue(sectionName.GetData(), "Baudrate", csBaudrate);
 
     std::map<std::string, std::string> rootInfo;
-    CSimpleStringA csPortNum(true), csCheckData(true), csKeySN(true), csInOutDir(true);
+    CSimpleStringA csPortNum(true), csCheckData(true), csKeySN(true);
     rootInfo["Vendor"] = csVendor;
     rootInfo["Version"] = csVersion;
     rootInfo["Batch"] = csBatch;
     rootInfo["Port"] = csPort;
     rootInfo["Baudrate"] = csBaudrate;
     spConfigRoot->ReadConfigValue(sectionName.GetData(), "PortNum", csPortNum);
-    spConfigRoot->ReadConfigValue(sectionName.GetData(), "InOutDir", csInOutDir);
     rootInfo["PortNum"] = csPortNum;
-    rootInfo["InOutDir"] = csInOutDir;
 
     std::pair<bool, std::string> strResult;
     strResult = generateJsonStr(rootInfo);
@@ -278,8 +276,6 @@ void CGpioEntity::ToLogWarnInfoAboutTerm(const AdapterInfo& m_adapterInfo)
 	termInfo["Port"] = m_port;
 	termInfo["PortNum"] = m_portNum;
 	termInfo["Baudrate"] = m_Baudrate;
-	termInfo["InOutDir"] = m_InOutDir;
-
 	if (strFileHash != nullptr) {
 		delete[] strFileHash;
 		strFileHash = nullptr;
@@ -343,17 +339,12 @@ ErrorCodeEnum CGpioEntity::Initial()
     int initTries = 0;
     do {
         DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("to open device.");
-        int portNum, inOutDir, port, baudRate;
+        int portNum, port, baudRate;
         err = spConfig->ReadConfigValueInt("Device.Gpio", "PortNum", portNum);
         if (err == Error_Succeed)
             m_dwPortNum = portNum;
         else
             return Error_IO;
-        err = spConfig->ReadConfigValueInt("Device.Gpio", "InOutDir", inOutDir);
-        if (err == Error_Succeed)
-            m_dwInOutDir = inOutDir;
-        else
-            return Error_IO;
         spConfig->ReadConfigValueInt("Device.Gpio", "Port", port);
         spConfig->ReadConfigValueInt("Device.Gpio", "BaudRate", baudRate);
 
@@ -361,7 +352,6 @@ ErrorCodeEnum CGpioEntity::Initial()
 		m_port = CSimpleStringA::Format("%d", port);
 		m_Baudrate = CSimpleStringA::Format("%d", baudRate);
 		m_portNum = CSimpleStringA::Format("%d", portNum);
-		m_InOutDir = CSimpleStringA::Format("%d", inOutDir);
         GpioInitParam initParam;
         if (!m_bNewVersion) {
             initParam.dwPortNum = 3;

+ 1 - 2
Module/mod_gpio/mod_gpio.h

@@ -149,7 +149,7 @@ public:
 		, m_pLogListener(NULL), m_bHeadLightFlag(false), m_headlightDevPort(0), m_moveHoldTimes(0)
 		, m_moveDisappearTimes(0),m_eMachineType(SP::Module::Comm::RVC_UNKNOWN)
 		, m_bNewVersion(FALSE), m_FirstStart(true)
-		, m_csDevNo(true), m_port(true), m_portNum(true), m_Baudrate(true), m_InOutDir(true)
+		, m_csDevNo(true), m_port(true), m_portNum(true), m_Baudrate(true)
 	{
 		m_timerID = 1;
 		currDevStatus.dir = 0x3eFC0;
@@ -263,7 +263,6 @@ private:
 	CSimpleStringA m_port;
 	CSimpleStringA m_portNum;
 	CSimpleStringA m_Baudrate;
-	CSimpleStringA m_InOutDir;
 	bool m_FirstStart;
 };