#IQRV #comment [DevAdapter] nantian/2021.0616.01

DevAdapter/CMakeLists.txt

@@ -140,7 +140,7 @@ message(STATUS "vendor log library: ${VENDOR_LOG_LIB_NAME}")
 # 通过conan的方式管理厂商库
 if(DEVADAPTER_USING_CONAN)
     set(KEBA_CONAN_LIB_NAME keba/2021.0602.01@LR04.02_VendorLib/testing)
-	set(NANTIAN_CONAN_LIB_NAME nantian/2021.0519.01@LR04.02_VendorLib/testing)
+	set(NANTIAN_CONAN_LIB_NAME nantian/2021.0616.01@LR04.02_VendorLib/testing)
 	set(GRG_CONAN_LIB_NAME grg/2021.0601.01@LR04.02_VendorLib/testing)
 	set(CW_CONAN_LIB_NAME cw/2021.0524.01@LR04.02_VendorLib/testing)
     set(GWI_CONAN_LIB_NAME gwi/2021.0402.01@LR04.02_VendorLib/testing)

DevAdapter/nantian/gpio.1.1/Gpio.nantian.cpp

@@ -13,6 +13,27 @@ GPIO_NT_NAC::GPIO_NT_NAC()
 	m_busy_flag = false;
 	m_read_port_flag = false;
 	m_ptStatus = 0;
+
+	//初始化日志
+	char INIPath[100] = "";
+	CILIX_AUX_X::CILIX_GetModuleCurPath(INIPath);
+	//strcat(INIPath, "log.nantian.ini");
+	strcat(INIPath, "nantian/log.nantian.ini");
+	
+	char log_dir[100] = "";
+	CILIX_AUX_X::CILIX_X_INIKeyString(INIPath, "LOGConfig", "log_dir", log_dir, "/etc/nantian");
+	char log_level[100] = "";
+	CILIX_AUX_X::CILIX_X_INIKeyString(INIPath, "LOGConfig", "log_level", log_level, "3");
+
+	cmb::log_init_config config;
+	config.dev_name = "GPIO";
+	config.log_dir = log_dir;
+	config.log_level = atoi(log_level);
+
+	std::string str;
+	cmb::log4vendor::init(config, str);
+	//LOG4VTM(WARN, "GPIO_NT_NAC::GPIO_NT_NAC "
+	//				  << "libGpio.Nantian.1.1.so -v 1.0.0.2");
 	//加载设备库
 	m_loadDllFlag = LoadNTDRVSO();
 }
@@ -74,25 +95,6 @@ bool GPIO_NT_NAC::LoadNTDRVSO()
 GPIO_API ErrorCodeEnum CreateDevComponent(DeviceBaseClass *&baseObj)
 {
 	baseObj = new GPIO_NT_NAC();
-	//初始化日志
-	char INIPath[100] = "";
-	CILIX_AUX_X::CILIX_GetModuleCurPath(INIPath);
-	strcat(INIPath, "nantian/log.nantian.ini");
-	
-	char log_dir[100] = "";
-	CILIX_AUX_X::CILIX_X_INIKeyString(INIPath, "LOGConfig", "log_dir", log_dir, "/etc/nantian");
-	char log_level[100] = "";
-	CILIX_AUX_X::CILIX_X_INIKeyString(INIPath, "LOGConfig", "log_level", log_level, "3");
-
-	cmb::log_init_config config;
-	config.dev_name = "GPIO";
-	config.log_dir = log_dir;
-	config.log_level = atoi(log_level);
-
-	std::string str;
-	cmb::log4vendor::init(config, str);
-	LOG4VTM(WARN, "GPIO_NT_NAC::GPIO_NT_NAC "
-					  << "libGpio.Nantian.1.1.so -v 1.0.0.2");
 	if (baseObj == NULL)
 		return Error_Resource;
 	return Error_Succeed;

DevAdapter/nantian/ups.1.1/ups.nantian.1.1.cpp

@@ -15,11 +15,25 @@ CUps::CUps()
 	strcpy(m_Error.szErrMsg,"操作成功");
 	m_Error.dwErrMsgLen = strlen(m_Error.szErrMsg);
 	m_trace = NULL;
-	printf("22222\n");
 	m_trace = new CILIXTrace(NULL,"UPS","Ups");
-	printf("33333\n");
 	m_device = new CILIX_TTY_Op();
-	printf("444444\n");
+	char INIPath[100] = "";
+    CILIX_AUX_X::CILIX_GetModuleCurPath(INIPath);
+    strcat(INIPath, "log.nantian.ini");
+
+    char log_dir[100] = "";
+    CILIX_AUX_X::CILIX_X_INIKeyString(INIPath, "LOGConfig", "log_dir", log_dir, "/etc/nantian");
+    char log_level[100] = "";
+    CILIX_AUX_X::CILIX_X_INIKeyString(INIPath, "LOGConfig", "log_level", log_level, "3");
+
+    cmb::log_init_config config;
+    config.dev_name = "ups";
+    config.log_dir = log_dir;
+    config.log_level = atoi(log_level);
+    std::string str;
+	cmb::log4vendor::init(config, str);
+    LOG4VTM(WARN, "<UpsNantian> - "<<"Enter-init");
+
 }
 CUps::~CUps()
 {
@@ -159,9 +173,11 @@ DEVICEBASE_API ErrorCodeEnum ReleaseDevComponent(DeviceBaseClass *&pBaseObj)
 ErrorCodeEnum CUps::DevOpen(DWORD dwPort,DWORD dwBaudRate)
 {
 	m_trace->WriteTrace("DevOpen","传入参数dwPort=%d,dwBaudRate=%d",dwPort,dwBaudRate);
+    LOG4VTM(WARN, "<UpsNantian> - "<<"DevOpen Enter-传入参数dwPor="<<dwPort<<"dwBaudRate="<<dwBaudRate);
 	if (dwPort <= 0 || dwBaudRate == 0)
 	{
 		m_trace->WriteTrace("DevOpen","输入参数不合法");
+    	LOG4VTM(WARN, "<UpsNantian> - "<<"DevOpen -输入参数不合法");
 		memset(m_Error.szErrMsg,0,sizeof(m_Error.szErrMsg));
 		strcpy(m_Error.szErrMsg,"输入参数不合法");
 		m_Error.dwErrMsgLen = strlen(m_Error.szErrMsg);
@@ -232,6 +248,7 @@ ErrorCodeEnum CUps::DevOpen(DWORD dwPort,DWORD dwBaudRate)
 		m_bConnect = TRUE;
 		memset(m_Error.szErrMsg,0,sizeof(m_Error.szErrMsg));
 		strcpy(m_Error.szErrMsg,"设备打开成功");
+    	LOG4VTM(WARN, "<UpsNantian> - "<<"DevOpen -设备打开成功");
 		m_Error.dwErrMsgLen = strlen(m_Error.szErrMsg);
 		return Error_Succeed;
 	}
@@ -241,6 +258,7 @@ ErrorCodeEnum CUps::DevOpen(DWORD dwPort,DWORD dwBaudRate)
 		m_bConnect = FALSE;
 		memset(m_Error.szErrMsg,0,sizeof(m_Error.szErrMsg));
 		strcpy(m_Error.szErrMsg,"串口或系统出错，设备打开失败");
+    	LOG4VTM(WARN, "<UpsNantian> - "<<"DevOpen -串口或系统出错，设备打开失败");
 		m_Error.dwErrMsgLen = strlen(m_Error.szErrMsg);
 		return Error_Hardware;
 	}
@@ -271,7 +289,8 @@ ErrorCodeEnum CUps::GetDevStatus(UpsStatusEnum &eStatus)
 	CILIXAutoTrace at(m_trace,"GetDevStatus",&iret);
 	if (m_bConnect != TRUE)
 	{
-		m_trace->WriteTrace("GetDevStatus","设备没有打开,不能进行查状态操作");
+		// m_trace->WriteTrace("GetDevStatus","设备没有打开,不能进行查状态操作");
+    	LOG4VTM(WARN, "<UpsNantian> - "<<"DevOpen -设备没有打开,不能进行查状态操作");
 		eStatus = UPS_STATUS_ERROR_TO_GET_STATUS;
 		memset(m_Error.szErrMsg,0,sizeof(m_Error.szErrMsg));
 		strcpy(m_Error.szErrMsg,"设备没有打开,不能进行查状态操作");
@@ -296,7 +315,8 @@ ErrorCodeEnum CUps::GetDevStatus(UpsStatusEnum &eStatus)
 	iretval=m_device->Write("\x51\x31\x0D",3,iTimeOut[0]);
 	if (iretval != 3)
 	{
-		m_trace->WriteTrace("GetDevStatus","向串口下发数据失败,iretval=%d",iretval);
+		// m_trace->WriteTrace("GetDevStatus","向串口下发数据失败,iretval=%d",iretval);
+    	LOG4VTM(WARN, "<UpsNantian> - "<<"GetDevStatus -向串口下发数据失败,iretval="<<iretval);
 		memset(m_Error.szErrMsg,0,sizeof(m_Error.szErrMsg));
 		strcpy(m_Error.szErrMsg,"向串口下发数据失败");
 		m_Error.dwErrMsgLen = strlen(m_Error.szErrMsg);
@@ -315,6 +335,7 @@ ErrorCodeEnum CUps::GetDevStatus(UpsStatusEnum &eStatus)
 	if (iretval < 46)
 	{
 		m_trace->WriteTrace("GetDevStatus","读串口错误,iretval=%d",iretval);
+    	LOG4VTM(WARN, "<UpsNantian> - "<<"GetDevStatus -读串口错误,iretval="<<iretval);
 		eStatus = UPS_STATUS_ERROR_TO_GET_STATUS;
 		memset(m_Error.szErrMsg,0,sizeof(m_Error.szErrMsg));
 		strcpy(m_Error.szErrMsg,"读串口错误");
@@ -329,6 +350,7 @@ ErrorCodeEnum CUps::GetDevStatus(UpsStatusEnum &eStatus)
         if (buff[38] == 0x30 && buff[39] == 0x30 && buff[40] == 0x30 && buff[41] == 0x30 && buff[42] == 0x31 &&
                 buff[43] == 0x30 && buff[44] == 0x30 && buff[45] == 0x30)
         {
+    			LOG4VTM(WARN, "<UpsNantian> - "<<"UPS设备通信正常ELECTOR");
                 m_trace->WriteTrace("GetDevStatus","UPS设备通信正常ELECTOR");
                 istatus = 0;
                 memset(m_Error.szErrMsg,0,sizeof(m_Error.szErrMsg));
@@ -339,6 +361,7 @@ ErrorCodeEnum CUps::GetDevStatus(UpsStatusEnum &eStatus)
                 buff[43] == 0x30 && buff[44] == 0x30 && buff[45] == 0x30)
         {
                 m_trace->WriteTrace("GetDevStatus","UPS设备通信正常NOELECTOR");
+    			LOG4VTM(WARN, "<UpsNantian> - "<<"GetDevStatus  UPS设备通信正常NOELECTOR");
                 istatus = 1;
                 memset(m_Error.szErrMsg,0,sizeof(m_Error.szErrMsg));
                 strcpy(m_Error.szErrMsg,"UPS设备通信正常");
@@ -348,6 +371,7 @@ ErrorCodeEnum CUps::GetDevStatus(UpsStatusEnum &eStatus)
 		buff[43] == 0x30 && buff[44] == 0x30 && buff[45] == 0x31)
 	{
 		m_trace->WriteTrace("GetDevStatus","UPS设备通信正常");
+    			LOG4VTM(WARN, "<UpsNantian> - "<<"GetDevStatus  UPS设备通信正常");
 		istatus = 0;
 		memset(m_Error.szErrMsg,0,sizeof(m_Error.szErrMsg));
 		strcpy(m_Error.szErrMsg,"UPS设备通信正常");
@@ -357,6 +381,7 @@ ErrorCodeEnum CUps::GetDevStatus(UpsStatusEnum &eStatus)
 		buff[43] == 0x30 && buff[44] == 0x30 && buff[45] == 0x31)
 	{
 		m_trace->WriteTrace("GetDevStatus","交流输入异常:没有市电供给");
+    			LOG4VTM(WARN, "<UpsNantian> - "<<"GetDevStatus  交流输入异常:没有市电供给");
 		istatus = 1;  //没有电供给
 		memset(m_Error.szErrMsg,0,sizeof(m_Error.szErrMsg));
 		strcpy(m_Error.szErrMsg,"交流输入异常:没有市电供给");
@@ -366,6 +391,7 @@ ErrorCodeEnum CUps::GetDevStatus(UpsStatusEnum &eStatus)
 		buff[43] == 0x30 && buff[44] == 0x30 && buff[45] == 0x31)
 	{
 		m_trace->WriteTrace("GetDevStatus","电池电压低");
+    			LOG4VTM(WARN, "<UpsNantian> - "<<"GetDevStatus  电池电压低");
 		istatus = 2;  //电池电压低
 		memset(m_Error.szErrMsg,0,sizeof(m_Error.szErrMsg));
 		strcpy(m_Error.szErrMsg,"电池电压低");
@@ -375,6 +401,7 @@ ErrorCodeEnum CUps::GetDevStatus(UpsStatusEnum &eStatus)
 		buff[43] == 0x30 && buff[44] == 0x30 && buff[45] == 0x31)
 	{
 		m_trace->WriteTrace("GetDevStatus","Bypass或Buck Active");
+    			LOG4VTM(WARN, "<UpsNantian> - "<<"GetDevStatus  Bypass或Buck Active");
 		istatus = 3;//Bypass或Buck Active
 		memset(m_Error.szErrMsg,0,sizeof(m_Error.szErrMsg));
 		strcpy(m_Error.szErrMsg,"Bypass或Buck Active");
@@ -384,6 +411,7 @@ ErrorCodeEnum CUps::GetDevStatus(UpsStatusEnum &eStatus)
 		buff[43] == 0x30 && buff[44] == 0x30 && buff[45] == 0x31)
 	{
 		m_trace->WriteTrace("GetDevStatus","UPS故障");
+    			LOG4VTM(WARN, "<UpsNantian> - "<<"GetDevStatus  UPS故障");
 		istatus = 4;//UPS故障
 		memset(m_Error.szErrMsg,0,sizeof(m_Error.szErrMsg));
 		strcpy(m_Error.szErrMsg,"UPS故障");
@@ -393,6 +421,7 @@ ErrorCodeEnum CUps::GetDevStatus(UpsStatusEnum &eStatus)
 		buff[43] == 0x30 && buff[44] == 0x31 && buff[45] == 0x31)
 	{
 		m_trace->WriteTrace("GetDevStatus","关机有效");
+    			LOG4VTM(WARN, "<UpsNantian> - "<<"GetDevStatus  关机有效");
 		istatus = 5;//关机有效
 		memset(m_Error.szErrMsg,0,sizeof(m_Error.szErrMsg));
 		strcpy(m_Error.szErrMsg,"关机有效");
@@ -424,6 +453,7 @@ ErrorCodeEnum CUps::Shutdown(DWORD dwShutTime,DWORD dwRestartTime)
 {
 	if (m_bConnect != TRUE)
 	{
+    			LOG4VTM(WARN, "<UpsNantian> - "<<"Shutdown  设备没有打开,不能做开关机操作");
 		m_trace->WriteTrace("Shutdown","设备没有打开,不能做开关机操作");
 		memset(m_Error.szErrMsg,0,sizeof(m_Error.szErrMsg));
 		strcpy(m_Error.szErrMsg,"设备没有打开,不能做开关机操作");
@@ -434,6 +464,7 @@ ErrorCodeEnum CUps::Shutdown(DWORD dwShutTime,DWORD dwRestartTime)
 	if ((dwShutTime <= 0 || dwShutTime > 10) || (dwRestartTime <= 0 || dwRestartTime >9999))
 	{
 		m_trace->WriteTrace("Shutdown","输入参数不合法");
+    			LOG4VTM(WARN, "<UpsNantian> - "<<"Shutdown  输入参数不合法");
 		memset(m_Error.szErrMsg,0,sizeof(m_Error.szErrMsg));
 		strcpy(m_Error.szErrMsg,"输入参数不合法");
 		m_Error.dwErrMsgLen = strlen(m_Error.szErrMsg);
@@ -488,6 +519,7 @@ ErrorCodeEnum CUps::Shutdown(DWORD dwShutTime,DWORD dwRestartTime)
 	if (iretval != 9)
 	{   
 		m_trace->WriteTrace("Shutdown","串口或系统错误,iretval=%d",iretval);
+    			LOG4VTM(WARN, "<UpsNantian> - "<<"Shutdown  串口或系统错误");
 		memset(m_Error.szErrMsg,0,sizeof(m_Error.szErrMsg));
 		strcpy(m_Error.szErrMsg,"串口或系统错误");
 		m_Error.dwErrMsgLen = strlen(m_Error.szErrMsg);

DevAdapter/nantian/ups.1.1/ups.nantian.1.1.h

@@ -13,7 +13,7 @@
 
 #include "UpsClass.h"
 #include "CILIX_AUX_UTILS.h"
-
+#include "../include/log4vendor.h"
 // ´ËÀàÊÇ´Ó Ups.dll µ¼³öµÄ
 class CUps : public UpsClass
 {