From 2ebccf831b56d30089924f2eefa2d790e2b8f3fc Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 07 八月 2025 09:20:21 +0800
Subject: [PATCH] 1.为CVariable增加值的设置和获取 2.当发生Port状态改变为InUse时，此时也刚好获取到CarrierID，上报S6F11_CarrierID_Readed
---
SourceCode/Bond/Servo/TopToolbar.cpp | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/TopToolbar.cpp b/SourceCode/Bond/Servo/TopToolbar.cpp
index 32c9d8a..0208ece 100644
--- a/SourceCode/Bond/Servo/TopToolbar.cpp
+++ b/SourceCode/Bond/Servo/TopToolbar.cpp
@@ -27,9 +27,11 @@
{
CDialogEx::DoDataExchange(pDX);
DDX_Control(pDX, IDC_BUTTON_RUN, m_btnRun);
+ DDX_Control(pDX, IDC_BUTTON_RUN_CT, m_btnRunCt);
DDX_Control(pDX, IDC_BUTTON_STOP, m_btnStop);
DDX_Control(pDX, IDC_BUTTON_ALARM, m_btnAlarm);
DDX_Control(pDX, IDC_BUTTON_SETTINGS, m_btnSettings);
+ DDX_Control(pDX, IDC_BUTTON_PORT_CONFIG, m_btnPortConfig);
DDX_Control(pDX, IDC_BUTTON_ROBOT, m_btnRobot);
DDX_Control(pDX, IDC_BUTTON_OPERATOR, m_btnOperator);
}
@@ -51,10 +53,12 @@
CDialogEx::OnInitDialog();
InitBtn(m_btnRun, "Run_High_32.ico", "Run_Gray_32.ico");
+ InitBtn(m_btnRunCt, "RunCt_High_32.ico", "RunCt_Gray_32.ico");
InitBtn(m_btnStop, "Stop_High_32.ico", "Stop_Gray_32.ico");
InitBtn(m_btnAlarm, "Alarm_o_32.ico", "Alarm_gray_32.ico");
InitBtn(m_btnSettings, "Settings_High_32.ico", "Settings_Gray_32.ico");
InitBtn(m_btnRobot, "Robot_High_32.ico", "Robot_Gray_32.ico");
+ InitBtn(m_btnPortConfig, "PortConfig_High_32.ico", "PortConfig_Gray_32.ico");
InitBtn(m_btnOperator, "Operator_High_32.ico", "Operator_Gray_32.ico");
HMENU hMenu = LoadMenu(AfxGetInstanceHandle(), MAKEINTRESOURCEA(IDR_MENU_OPEATOR));
m_btnOperator.SetMenu(hMenu);
@@ -114,6 +118,11 @@
x += BTN_WIDTH;
x += 2;
+ pItem = GetDlgItem(IDC_BUTTON_RUN_CT);
+ pItem->MoveWindow(x, y, BTN_WIDTH, nBthHeight);
+ x += BTN_WIDTH;
+ x += 2;
+
pItem = GetDlgItem(IDC_BUTTON_STOP);
pItem->MoveWindow(x, y, BTN_WIDTH, nBthHeight);
x += BTN_WIDTH;
@@ -129,6 +138,11 @@
x += 4;
pItem = GetDlgItem(IDC_BUTTON_SETTINGS);
+ pItem->MoveWindow(x, y, BTN_WIDTH, nBthHeight);
+ x += BTN_WIDTH;
+ x += 2;
+
+ pItem = GetDlgItem(IDC_BUTTON_PORT_CONFIG);
pItem->MoveWindow(x, y, BTN_WIDTH, nBthHeight);
x += BTN_WIDTH;
x += 2;
@@ -183,9 +197,11 @@
{
switch (LOWORD(wParam)) {
case IDC_BUTTON_RUN:
+ case IDC_BUTTON_RUN_CT:
case IDC_BUTTON_STOP:
case IDC_BUTTON_ALARM:
case IDC_BUTTON_SETTINGS:
+ case IDC_BUTTON_PORT_CONFIG:
case IDC_BUTTON_ROBOT:
GetParent()->SendMessage(ID_MSG_TOOLBAR_BTN_CLICKED, 0, LOWORD(wParam));
break;
--
Gitblit v1.9.3