From 829fe6c6bc33d53fda9c31fd45a37e1df87befff Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 30 一月 2026 11:16:24 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

---
 SourceCode/Bond/Servo/resource.h |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/SourceCode/Bond/Servo/resource.h b/SourceCode/Bond/Servo/resource.h
index 5eacbaf..ef26aa5 100644
--- a/SourceCode/Bond/Servo/resource.h
+++ b/SourceCode/Bond/Servo/resource.h
@@ -349,6 +349,7 @@
 #define IDC_LINE2                       1270
 #define IDC_LABEL_DESCRIPTION           1271
 #define IDC_LABEL_NO_ALARM				1272
+#define IDC_LABEL_JOBSTATE              1273
 #define ID_MENU_HELP_ABOUT              32771
 #define ID_MENU_FILE_EXIT               32772
 #define ID_MENU_FILE_SECSTEST           32773
@@ -381,14 +382,18 @@
 #define ID_MENU_TOOLS_CLIENT_LIST       32801
 #define ID_MENU_WND_TEST_PANEL          32802
 #define ID_MENU_WND_PRO_PANEL           32803
+#define ID_MENU_TEST_ALARM_ON           32804
+#define ID_MENU_TEST_ALARM_OFF          32805
+#define ID_MENU_TOOLS_CURVE_EMPTY       32806
+#define ID_MENU_TOOLS_CURVE_PRODUCTION  32807
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        192
-#define _APS_NEXT_COMMAND_VALUE         32804
-#define _APS_NEXT_CONTROL_VALUE         1273
+#define _APS_NEXT_COMMAND_VALUE         32808
+#define _APS_NEXT_CONTROL_VALUE         1274
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif

--
Gitblit v1.9.3