From 6753bdaab1755dee3338d0fc5d634018cdae1252 Mon Sep 17 00:00:00 2001 From: "zhengxuan.zhang" Date: Wed, 17 Jul 2024 10:36:05 +0800 Subject: [PATCH] =?UTF-8?q?#0007=E6=80=A5=E5=81=9C=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=9A=E8=AF=A2=E9=97=AE=E6=80=A5=E5=81=9C?= =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8Cmetus=E5=B1=82=E9=9D=A2=E4=B8=8D?= =?UTF-8?q?=E5=8F=82=E4=B8=8E=E6=80=A5=E5=81=9C=E9=80=BB=E8=BE=91=EF=BC=8C?= =?UTF-8?q?=E5=8F=AA=E8=B4=9F=E8=B4=A3=E9=80=9A=E7=9F=A5=EF=BC=8C=E5=85=B7?= =?UTF-8?q?=E4=BD=93=E9=80=BB=E8=BE=91=E7=94=B1=E7=94=B5=E6=B0=94=E5=B1=82?= =?UTF-8?q?=E5=86=B3=E5=AE=9A=EF=BC=9B=E9=80=9A=E8=BF=87=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E6=80=A5=E5=81=9C=E7=8A=B6=E6=80=81=EF=BC=8C?= =?UTF-8?q?metus=E5=B1=82=E9=9D=A2=E6=B2=A1=E6=9C=89=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=EF=BC=8C=E6=94=B9=E7=94=B1=20=E4=B8=AD=E9=97=B4=E4=BB=B6?= =?UTF-8?q?=E5=B1=82=E9=9D=A2=E5=BD=93=E8=BF=90=E5=8A=A8=E6=80=A5=E5=81=9C?= =?UTF-8?q?=E5=90=8E=E5=BC=B9=E7=AA=97=E9=80=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HSI_HexagonMI_EF3/HSI_HexagonMI_EF3.vcxproj | 5 +++-- HSI_HexagonMI_EF3/HSI_Motion.cpp | 2 +- HSI_HexagonMI_EF3/HSI_Sevenocean_EF3.cpp | 11 +++++++++++ HSI_HexagonMI_EF3/version.h | 4 ++-- HexcalMC/HexcalMC.csproj | 1 + 5 files changed, 18 insertions(+), 5 deletions(-) diff --git a/HSI_HexagonMI_EF3/HSI_HexagonMI_EF3.vcxproj b/HSI_HexagonMI_EF3/HSI_HexagonMI_EF3.vcxproj index 2293826..e8d4191 100644 --- a/HSI_HexagonMI_EF3/HSI_HexagonMI_EF3.vcxproj +++ b/HSI_HexagonMI_EF3/HSI_HexagonMI_EF3.vcxproj @@ -70,8 +70,9 @@ C:\Program Files (x86)\Windows Kits\10\Lib\10.0.17763.0\ucrt\x64;$(LocalDebuggerWorkingDirectory)\ACS;%(AdditionalLibraryDirectories) - 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" + 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" version.cmd diff --git a/HSI_HexagonMI_EF3/HSI_Motion.cpp b/HSI_HexagonMI_EF3/HSI_Motion.cpp index 1113320..e88e73b 100644 --- a/HSI_HexagonMI_EF3/HSI_Motion.cpp +++ b/HSI_HexagonMI_EF3/HSI_Motion.cpp @@ -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); diff --git a/HSI_HexagonMI_EF3/HSI_Sevenocean_EF3.cpp b/HSI_HexagonMI_EF3/HSI_Sevenocean_EF3.cpp index 731e20e..4175495 100644 --- a/HSI_HexagonMI_EF3/HSI_Sevenocean_EF3.cpp +++ b/HSI_HexagonMI_EF3/HSI_Sevenocean_EF3.cpp @@ -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; } diff --git a/HSI_HexagonMI_EF3/version.h b/HSI_HexagonMI_EF3/version.h index fd4f92a..cff58f9 100644 --- a/HSI_HexagonMI_EF3/version.h +++ b/HSI_HexagonMI_EF3/version.h @@ -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 ") diff --git a/HexcalMC/HexcalMC.csproj b/HexcalMC/HexcalMC.csproj index b6433b9..1035b59 100644 --- a/HexcalMC/HexcalMC.csproj +++ b/HexcalMC/HexcalMC.csproj @@ -236,6 +236,7 @@ True +