From 238f41fd4edac2febc03d2e428bce7206f609e99 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期四, 29 一月 2026 15:38:58 +0800
Subject: [PATCH] 1.完善CJ/PJ事件上报；
---
SourceCode/Bond/Servo/Model.h | 45 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 44 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.h b/SourceCode/Bond/Servo/Model.h
index b6b954f..78d7af5 100644
--- a/SourceCode/Bond/Servo/Model.h
+++ b/SourceCode/Bond/Servo/Model.h
@@ -1,5 +1,21 @@
#pragma once
#include "Configuration.h"
+#include "HsmsPassive.h"
+#include "CMaster.h"
+#include "CGlassPool.h"
+#include "ProcessJob.h"
+#include <cstdint>
+#include <map>
+#include <string>
+
+enum class ControlState : uint8_t {
+ OfflineEquipment = 0,
+ OfflineAttempt = 1,
+ Online = 2,
+ OfflineHost = 3,
+ OnlineLocal = 4,
+ OnlineRemote = 5,
+};
class CModel
{
@@ -9,9 +25,30 @@
public:
IObservable* getObservable();
+ SERVO::CMaster& getMaster();
void setWorkDir(const char* pszWorkDir);
+ void loadPortParams();
+ void setPortType(unsigned int index, SERVO::PortType type);;
+ void setPortCassetteType(unsigned int index, SERVO::CassetteType type);
+ void setPortEnable(unsigned int index, BOOL bEnable);
int init();
int term();
+
+ 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();
+ void emitPjStateEvents();
public:
int notify(int code);
@@ -29,11 +66,17 @@
public:
CConfiguration m_configuration;
+ CHsmsPassive m_hsmsPassive;
+ SERVO::CGlassPool m_glassPool;
+ SERVO::CMaster m_master;
private:
IObservable* m_pObservable;
IObservableEmitter* m_pObservableEmitter;
CString m_strWorkDir;
CString m_strDataDir;
-};
+private:
+ ControlState m_currentControlState{ ControlState::OfflineEquipment };
+ std::map<std::string, SERVO::PJState> m_prevPjStates;
+};
--
Gitblit v1.9.3