From 838262ab61d580d7dd5eb3b181c61d8b4d3f54fe Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 26 六月 2025 15:54:53 +0800
Subject: [PATCH] Merge branch 'liuyang' into clh
---
SourceCode/Bond/Servo/CPageGraph1.h | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPageGraph1.h b/SourceCode/Bond/Servo/CPageGraph1.h
index edef11a..7609a49 100644
--- a/SourceCode/Bond/Servo/CPageGraph1.h
+++ b/SourceCode/Bond/Servo/CPageGraph1.h
@@ -1,12 +1,19 @@
锘�#pragma once
#include "ServoGraph.h"
-
+#include "ServoCommo.h"
enum DeviceStatus {
ONLINE, // 鍦ㄧ嚎
OFFLINE, // 绂荤嚎
+ OCCUPIED // 鏈夌墖锛堝崰鐢級
};
+struct RobotPositionMapping {
+ SERVO::ROBOT_POSITION position;
+ float percentage;
+ float angle;
+ int arm; // 0 琛ㄧず ARM1锛�1 琛ㄧず ARM2
+};
// CPageGraph1 瀵硅瘽妗�
@@ -25,6 +32,7 @@
void UpdateRobotPosition(float percentage);
void RotateRobot(float angleInDegrees);
void BindEquipmentToGraph();
+ void MoveRobotToPosition(SERVO::ROBOT_POSITION position);
private:
IObserver* m_pObserver;
@@ -32,6 +40,7 @@
BOOL m_bIsRobotMoving;
COLORREF m_crBkgnd;
HBRUSH m_hbrBkgnd;
+ SERVO::ROBOT_POSITION m_lastRobotPosition;
// 瀵硅瘽妗嗘暟鎹�
#ifdef AFX_DESIGN_TIME
--
Gitblit v1.9.3