From 944e8f3dea723404e21168e97116cca2c09c70cb Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期二, 27 一月 2026 15:26:29 +0800
Subject: [PATCH] 1.扫码事件上报，之前只上报OK一种情况，现在有事种状态。 2.Port事件上报关联PortID, 统一修改为VID：PortID，之前分开很多种。
---
SourceCode/Bond/Servo/Model.h | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.h b/SourceCode/Bond/Servo/Model.h
index 839e949..51a5427 100644
--- a/SourceCode/Bond/Servo/Model.h
+++ b/SourceCode/Bond/Servo/Model.h
@@ -4,6 +4,7 @@
#include "CMaster.h"
#include "CGlassPool.h"
#include <cstdint>
+#include <string>
enum class ControlState : uint8_t {
OfflineEquipment = 0,
@@ -33,9 +34,18 @@
ControlState getControlState() const noexcept { return m_currentControlState; }
void setControlState(ControlState newState);
+ bool raiseSoftAlarm(int alarmId,
+ const std::string& desc = "",
+ int level = -1,
+ int deviceId = 0,
+ int unitId = 0,
+ const char* deviceName = "Software",
+ const char* unitName = "App");
+ void clearSoftAlarm(int alarmId, int deviceId = 0, int unitId = 0);
private:
void refreshDerivedSVs();
+ void notifyControlJobChanged();
public:
int notify(int code);
--
Gitblit v1.9.3