xhouse/LM-Middleware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#0007急停弹窗逻辑：询问急停逻辑，metus层面不参与急停逻辑，只负责通知，具体逻辑由电气层决定；通过事件通知急停状态，metus层面没有弹窗，改由 中间件层面当运动急停后弹窗通

Browse Source
This commit is contained in:
zhengxuan.zhang
2024-07-17 10:36:05 +08:00
parent 9cfafb4c30
commit 6753bdaab1
5 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HSI_HexagonMI_EF3/HSI_HexagonMI_EF3.vcxproj
+3 -2
View File
@@ -70,8 +70,9 @@
<AdditionalLibraryDirectories>C:\Program Files (x86)\Windows Kits\10\Lib\10.0.17763.0\ucrt\x64;$(LocalDebuggerWorkingDirectory)\ACS;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
<PostBuildEvent>
<Command>copy "$(TargetDir)$(ProjectName).dll" "$(SolutionDir)HSI_SEVENOCEAN_EF1_CsTest\bin\Debug\HSI_Sevenocean_EF3.dll"
copy "$(TargetDir)$(ProjectName).dll" "C:\Program Files\Hexagon\Metus\Metus-7.10.1967\HSI_Sevenocean_EF3.dll" </Command>
<Command>copy "$(TargetDir)$(ProjectName).dll" "$(SolutionDir)HSI_SEVENOCEAN_EF1_CsTest\bin\Debug\HSI.dll"
copy "$(TargetDir)$(ProjectName).dll" "C:\Program Files\Hexagon\Metus\Metus-7.10.1967\HSI_Sevenocean_EF3.dll"
copy "$(TargetDir)$(ProjectName).dll" "D:\HSI_Sevenocean_EF3.dll" </Command>
</PostBuildEvent>
<PreBuildEvent>
<Command>version.cmd</Command>
HSI_HexagonMI_EF3/HSI_Motion.cpp
+1 -1
View File
@@ -234,7 +234,7 @@ HSI_Motion::HSI_Motion()
//是否启用日志
CTime tm = CTime::GetCurrentTime();
CString csTime = tm.Format("%Y-%m-%d_%H-%M-%S"); //构造时间字符串
CString csTime = tm.Format("%Y%m%d_%H-%M-%S"); //构造时间字符串
//CString csTime = tm.Format("%Y-%m-%d"); //构造时间字符串
CString dir = L"\\Log\\" + csTime += L"_Motion.Log";
g_pLogger = new CLogger(dir);
HSI_HexagonMI_EF3/HSI_Sevenocean_EF3.cpp
+11
View File
@@ -66,6 +66,17 @@ HSI_STATUS HSI_Sevenocean_EF3::SetEventCallback(pEventCallback _pCallback)
//sEvenProp.EventResponse = HSI_EVENT_FUNCTION_OK;
//strcpy_s(sEvenProp.EventData, HSI_MaxStringLength, "Set callback succeed!");
//EventCallback(sEvenProp);
// 2024.7.17 询问急停逻辑，metus层面不参与急停逻辑，只负责通知，具体逻辑由电气层决定
// 通过事件通知急停状态，metus层面没有弹窗，改由 中间件层面当运动急停后弹窗通知
//sEvenProp.Init();
//sEvenProp.EventType = HSI_EVENT_NOTIFY;
//sEvenProp.EventID = HSI_NOTIFY_EMERGENCY_STATE;
//sEvenProp.EventResponse = HSI_EVENT_RESPONSE_OK;
//strcpy_s(sEvenProp.EventData, HSI_MaxStringLength, "急停已触发！！！");
//EventCallback(sEvenProp);
//AfxMessageBox(_T("急停或安全门或安全光幕触发！"));
}
return rStatus;
}
HSI_HexagonMI_EF3/version.h
+2 -2
View File
@@ -12,5 +12,5 @@
#define HSI_VERSION_REVNUM
#define HSI_VERSION_BUILD_DATE _T(__DATE__ )
#define HSI_VERSION_BUILD_TIME _T(__TIME__ )
#define HSI_FILE_DESCRIPTION "周五 2.24.07 / 17:38 "
#define HSI_FILE_CSDESCRIPTION _T("周五 2.24.07 / 17:38 ")
#define HSI_FILE_DESCRIPTION "周三 2.24.07 / 10:32 "
#define HSI_FILE_CSDESCRIPTION _T("周三 2.24.07 / 10:32 ")
HexcalMC/HexcalMC.csproj
+1
View File
@@ -236,6 +236,7 @@
<DesignTime>True</DesignTime>
</Compile>
<None Include="app.config" />
<None Include="ClassDiagram1.cd" />
<None Include="HexcalMC_TemporaryKey.pfx" />
<None Include="packages.config" />
<None Include="Properties\Settings.settings">