From e979a31c4e7c1d54703230ef3335d6e929442493 Mon Sep 17 00:00:00 2001 From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com> Date: 星期一, 30 六月 2025 13:38:16 +0800 Subject: [PATCH] Merge branch 'liuyang' into clh --- SourceCode/Bond/Servo/CPageGraph1.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/SourceCode/Bond/Servo/CPageGraph1.h b/SourceCode/Bond/Servo/CPageGraph1.h index 7609a49..f891489 100644 --- a/SourceCode/Bond/Servo/CPageGraph1.h +++ b/SourceCode/Bond/Servo/CPageGraph1.h @@ -27,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; @@ -41,6 +44,9 @@ 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