#IQRV #comment [Module] DeviceControl和ups实体完成迁移

DevAdapter/cmbsz/devctrl.1.1/devctrl_impl.h

@@ -33,7 +33,7 @@ public:
     //
     virtual ErrorCodeEnum PortControl(ControlType eType)
     {
-        return Error_NotImpl;
+        return Error_Succeed;
     }
 
 private:

Module/CMakeLists.txt

@@ -175,6 +175,9 @@ add_subdirectory(mod_mediacontroller)
 add_subdirectory(mod_ScannerSet)
 add_subdirectory(mod_HSPScanner)
 
+add_subdirectory(mod_DeviceControl)
+add_subdirectory(mod_ups)
+
 # 汇总要依赖拷贝的第三方库
 set(RVC_CONAN_DEP_LIBS ${RVC_CONAN_DEP_LIBS} ${MODULE_CONAN_DEP_LIBS} PARENT_SCOPE)
 

Module/mod_DeviceControl/DeviceControlFSM.cpp

@@ -89,7 +89,7 @@ ErrorCodeEnum CDeviceControlFSM::OnInit()
 		eErr = pEntity->ExtractVendorLibFullPath(dllName);
 		if (eErr != Error_Succeed)
 		{
-			Dbg("load vendor dll(%s) failed.", (LPCTSTR)dllName);
+			Dbg("ExtractVendorLibFullPath(%s) failed.", (LPCTSTR)dllName);
 			return Error_DevLoadFileFailed;
 		}
 		Dbg("%s", (LPCTSTR)dllName);
@@ -97,11 +97,11 @@ ErrorCodeEnum CDeviceControlFSM::OnInit()
 	eErr = m_hDevHelper.LoadUp(dllName);
 	if (eErr != Error_Succeed)
 	{
-		Dbg("Load dll failed.%s", SpStrError(eErr));
+		Dbg("LoadUp failed.%s", SpStrError(eErr));
 		return Error_DevLoadFileFailed;
 	}
 	else {
-		Dbg("load vendor dll suc.");
+		Dbg("load vendor dll and pointer suc.");
 	}
 
 	InitializeTokenLib();
@@ -113,10 +113,11 @@ ErrorCodeEnum CDeviceControlFSM::OnInit()
 		spConfig->ReadConfigValueInt("Device.DeviceControl", "Port", port);
         eErr = m_hDevHelper->DevOpen(port, baudRate);
         if (eErr != Error_Succeed) {
-            Dbg("´ò¿ªÉ豸ʧ°Ü");
 			LOG_DEVCONTROL_ERROR_MSG_MACRO(eErr, DevOpen);
             return Error_DevConnFailed;
-        }
+		} else {
+			Dbg("Open device succ.");
+		}
 		eErr = m_hDevHelper->PortControl(USB_PORT_ENABLE);
 		if (eErr != Error_Succeed) {
             LOG_DEVCONTROL_ERROR_MSG_MACRO(eErr, PortControl);
@@ -237,7 +238,6 @@ unsigned int CDeviceControlFSM::s1_on_event(FSMEvent* pEvt)
 	return 0;
 }
 
-//GetUkeyID
 unsigned int CDeviceControlFSM::s3_on_event(FSMEvent* pEvt)
 {
 	Dbg("s3 %d,%d",pEvt->iEvt,pEvt->param1);
@@ -252,7 +252,6 @@ unsigned int CDeviceControlFSM::s3_on_event(FSMEvent* pEvt)
 	return 0;
 }
 
-//InitToken
 unsigned int CDeviceControlFSM::s4_on_event(FSMEvent* pEvt)
 {
 	Dbg("s4 %d,%d",pEvt->iEvt,pEvt->param1);
@@ -269,13 +268,10 @@ unsigned int CDeviceControlFSM::s4_on_event(FSMEvent* pEvt)
 int CDeviceControlFSM::UsbControl(SpReqAnsContext<DeviceControlService_USB_Req,DeviceControlService_USB_Ans>::Pointer ctx)
 {
 	Dbg("open %d",ctx->Req.open);
-
 	const bool bIsNeedOpenUsb = IsNeedOpenUsb(m_pEntity);
 	if(!bIsNeedOpenUsb){
 		Dbg("no need open/close usb, this machine's usb is always open.");
-
 	} else {
-
         ControlType eType;
         if (ctx->Req.open) {
             eType = USB_PORT_ENABLE;

Module/mod_ups/UpsFSM.cpp

@@ -7,8 +7,6 @@ ErrorCodeEnum CUpsFSM::OnInit()
 {
     LOG_FUNCTION();
     GET_DEV_ENTITY_BASE_POINTER()->InitializeVendorLogSwitch();
-	Dbg("devopen state %d",m_bDevOpen);
-
     CSimpleStringA dllName;
     auto pEntity = GET_DEV_ENTITY_BASE_POINTER();
     auto result = pEntity->ExtractVendorLibFullPath(dllName);
@@ -32,7 +30,7 @@ ErrorCodeEnum CUpsFSM::OnInit()
     int baudRate = 0, port = 0;
     spConfig->ReadConfigValueInt("Device.Ups", "Baudrate", baudRate);
     spConfig->ReadConfigValueInt("Device.Ups", "Port", port);
-    Dbg("%d,%d", port, baudRate);
+    Dbg("port: %d, baudrate: %d", port, baudRate);
 	result = m_hDevHelper->DevOpen(port, baudRate);
     if (result != Error_Succeed) {
         LOG_UPS_ERROR_MSG_MACRO(result, DevOpen);
@@ -46,15 +44,19 @@ ErrorCodeEnum CUpsFSM::OnExit()
 {
 	ErrorCodeEnum eErr = Error_Succeed;
 	m_hDevHelper.TearDown();
+	m_bDevOpen = false;
 	return eErr;
 }
 
 void CUpsFSM::s0_on_entry()
 {
-	LOG_FUNCTION();
 	UpsStatusEnum eUpsState;
 	ErrorCodeEnum eErrCode = m_hDevHelper->GetDevStatus(eUpsState);
-	Dbg("%d,%d",eErrCode,eUpsState);
+	if (eErrCode != Error_Succeed) {
+		LOG_UPS_ERROR_MSG_MACRO(eErrCode, GetDevStatus);
+	} else {
+		Dbg("UpsState: %d", eUpsState);
+	}
 	m_testResult = Error_Succeed;
 }
 void CUpsFSM::s0_on_exit()
@@ -67,14 +69,15 @@ unsigned int CUpsFSM::s0_on_event(FSMEvent* e)
 	{
 	case USER_EVT_SHUTDOWN:
 		{
+			e->SetHandled();
 			ShutDownTask* task = new ShutDownTask(this);
 			ShutDownEvent* sde = dynamic_cast<ShutDownEvent*>(e);
 			task->ctx = sde->ctx; //oiltest
-			Dbg("%d,in %d",sde->ctx->Req.ShutdownTime,sde->ctx->Req.UpTime);
+			Dbg("%d, in %d",sde->ctx->Req.ShutdownTime, sde->ctx->Req.UpTime);
 			GetEntityBase()->GetFunction()->PostThreadPoolTask(task);
-			e->SetHandled();
 			return 0;
 		}
+		break;
 	case USER_EVT_GETSTATUS:
 		{
 			e->SetHandled();
@@ -152,6 +155,7 @@ int CUpsFSM::ShutDown(SpReqAnsContext<UpsService_Shutdown_Req,UpsService_Shutdow
 	}
 	else
 	{
+		LOG_UPS_ERROR_MSG_MACRO(err, Shutdown);
 		ctx->Answer(Error_Unexpect);
 		return 1;
 	}

addin/cfg/HealthManager.ini

@@ -4,9 +4,9 @@ GUIConsole=2
 ;SystemCustomization=2
 ;MobileDial=0
 WatchDog=0
-;Ups=2
+Ups=0
 ;SafeLock=0
-;DeviceControl=0
+DeviceControl=0
 CardReadAdapter=0
 CustMngrAuth=0
 ;please use --test to boot up the entity