From 84925ada39fdef3f5bd7266005010103897713a6 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 11 七月 2025 17:49:15 +0800
Subject: [PATCH] 1.EAP模拟器,启用或禁用警告上报功能实现和模拟测试; 2.Master端,收到EAP的启用或警告消息上报消息后,保存相关配置,如后续机器发生警告,根据配置决定是否上报警告消息;
---
SourceCode/Bond/Servo/CPageGraph1.h | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPageGraph1.h b/SourceCode/Bond/Servo/CPageGraph1.h
index 8a2b044..f891489 100644
--- a/SourceCode/Bond/Servo/CPageGraph1.h
+++ b/SourceCode/Bond/Servo/CPageGraph1.h
@@ -5,6 +5,7 @@
enum DeviceStatus {
ONLINE, // 鍦ㄧ嚎
OFFLINE, // 绂荤嚎
+ OCCUPIED // 鏈夌墖锛堝崰鐢級
};
struct RobotPositionMapping {
@@ -26,12 +27,15 @@
public:
+ std::string GetConfigPath();
void InitRxWindows();
void UpdateDeviceStatus(int id, DeviceStatus status);
void UpdateRobotPosition(float percentage);
void RotateRobot(float angleInDegrees);
void BindEquipmentToGraph();
void MoveRobotToPosition(SERVO::ROBOT_POSITION position);
+ POINT LoadArmOffset(const std::string& armName);
+ void SaveArmOffset(const std::string& armName, const POINT& pt);
private:
IObserver* m_pObserver;
@@ -39,6 +43,10 @@
BOOL m_bIsRobotMoving;
COLORREF m_crBkgnd;
HBRUSH m_hbrBkgnd;
+ SERVO::ROBOT_POSITION m_lastRobotPosition;
+ BOOL m_lastArmState[2];
+ POINT m_arm1Offset; // ARM1 浠庝腑蹇冨悜宸�47, 鍚戜笂33
+ POINT m_arm2Offset; // ARM2 浠庝腑蹇冨悜鍙�10, 鍚戜笂33
// 瀵硅瘽妗嗘暟鎹�
#ifdef AFX_DESIGN_TIME
--
Gitblit v1.9.3