From 3c387cc7bcd469938fbfac8bc5435bb1e846c70f Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 17 六月 2025 17:42:53 +0800
Subject: [PATCH] Merge branch 'liuyang' into clh
---
SourceCode/Bond/Servo/CEFEM.cpp | 66 ++++----------------------------
1 files changed, 9 insertions(+), 57 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEFEM.cpp b/SourceCode/Bond/Servo/CEFEM.cpp
index ff4581d..dd297b1 100644
--- a/SourceCode/Bond/Servo/CEFEM.cpp
+++ b/SourceCode/Bond/Servo/CEFEM.cpp
@@ -22,7 +22,7 @@
m_pPort[3] = nullptr;
m_pAligner = nullptr;
m_pFliper = nullptr;
- m_robotData.status = ROBOT_STATUS::Idle;
+ m_robotData.status = ROBOT_STATUS::Setup;
m_robotData.position = ROBOT_POSITION::Port1;
m_robotData.armState[0] = FALSE;
m_robotData.armState[1] = FALSE;
@@ -366,7 +366,7 @@
// Eq mode
CEqModeStep* pStep = new CEqModeStep();
pStep->setName(STEP_MODE);
- pStep->setWriteSignalDev(0x50);
+ pStep->setWriteSignalDev(0x40);
pStep->setModeDev(0x5d7d);
if (addStep(STEP_ID_EQMODE_CHANGED, pStep) != 0) {
delete pStep;
@@ -377,7 +377,7 @@
// Eq Status
CEqStatusStep* pStep = new CEqStatusStep();
pStep->setName(STEP_STATUS);
- pStep->setWriteSignalDev(0x51);
+ pStep->setWriteSignalDev(0x41);
pStep->setStatusDev(0x5d59);
if (addStep(STEP_ID_EQSTATUS_CHANGED, pStep) != 0) {
delete pStep;
@@ -388,7 +388,7 @@
// Eq Alarm
static char* pszName[] = { STEP_ALARM_BLOCK1, STEP_ALARM_BLOCK2, STEP_ALARM_BLOCK3, STEP_ALARM_BLOCK4, STEP_ALARM_BLOCK5 };
static int dev[] = { 0x5f0e , 0x5f3b, 0x5f68, 0x5f95, 0x5fc2 };
- static int writeSignalDev[] = { 0x52, 0x53, 0x54, 0x55, 0x56 };
+ static int writeSignalDev[] = { 0x42, 0x43, 0x44, 0x45, 0x46 };
static int addr[] = { STEP_ID_EQALARM1, STEP_ID_EQALARM2, STEP_ID_EQALARM3, STEP_ID_EQALARM4, STEP_ID_EQALARM5 };
for (int i = 0; i < 5; i++) {
@@ -407,7 +407,7 @@
// eq process
CEqProcessStep* pStep = new CEqProcessStep();
pStep->setName(STEP_PROCESS);
- pStep->setWriteSignalDev(0x57);
+ pStep->setWriteSignalDev(0x47);
pStep->setProcessDev(0x6b55);
if (addStep(STEP_ID_PROCESS_DATA_REPORT, pStep) != 0) {
delete pStep;
@@ -439,7 +439,7 @@
{
// CIM Message Confirm
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT32, 0x5f80);
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT32, 0x5d80);
pStep->setName(STEP_EQ_CIM_MESSAGE_CONFIRM);
pStep->setWriteSignalDev(0x49);
if (addStep(STEP_ID_CIM_MSG_CONFIRM_REPORT, pStep) != 0) {
@@ -502,7 +502,7 @@
// eq mode change
CEqModeChangeStep* pStep = new CEqModeChangeStep();
pStep->setName(STEP_EQ_MODE_CHANGE);
- pStep->setWriteSignalDev(0x65);
+ pStep->setWriteSignalDev(0x40);
pStep->setEqModeDev(0x1E);
if (addStep(STEP_ID_EQMODE_CHANGE_CMD_REPLY, pStep) != 0) {
delete pStep;
@@ -549,55 +549,7 @@
pStep->setName(szBuffer);
pStep->setProp("Upstream", (void*)(__int64)(i + 1));
pStep->setWriteSignalDev(0x0 + i);
- if (addStep(STEP_ID_FETCHED_OUT_JOB_REPORT1 + i, pStep) != 0) {
- delete pStep;
- }
- }
- }
-
- {
- // Fetched Out Job Report #1~15
- char szBuffer[256];
- for (int i = 0; i < 15; i++) {
- CEqReadStep* pStep = new CEqReadStep(0x5c31 + 18 * i, 18 * 2,
- [&](void* pFrom, int code, const char* pszData, size_t size) -> int {
- if (code == ROK && pszData != nullptr && size > 0) {
- int port = (int)(__int64)((CEqReadStep*)pFrom)->getProp("Port");
- if (port > 0) {
- decodeFetchedOutJobReport((CStep*)pFrom, port, pszData, size);
- }
- }
- return -1;
- });
- sprintf_s(szBuffer, "%s%d", STEP_EQ_FETCHED_OUT_JOBn, i+1);
- pStep->setName(szBuffer);
- pStep->setProp("Port", (void*)(__int64)(i + 1));
- pStep->setWriteSignalDev(0x023 + i);
- if (addStep(STEP_ID_FETCHED_OUT_JOB_REPORT1 + i, pStep) != 0) {
- delete pStep;
- }
- }
- }
-
- {
- // Store Job Report #1~15
- char szBuffer[256];
- for (int i = 0; i < 15; i++) {
- CEqReadStep* pStep = new CEqReadStep(0x5b23 + 18 * i, 18 * 2,
- [&](void* pFrom, int code, const char* pszData, size_t size) -> int {
- if (code == ROK && pszData != nullptr && size > 0) {
- int port = (int)(__int64)((CEqReadStep*)pFrom)->getProp("Port");
- if (port > 0) {
- decodeStoredJobReport((CStep*)pFrom, port, pszData, size);
- }
- }
- return -1;
- });
- sprintf_s(szBuffer, "%s%d", STEP_EQ_STORED_JOBn, i + 1);
- pStep->setName(szBuffer);
- pStep->setProp("Port", (void*)(__int64)(i + 1));
- pStep->setWriteSignalDev(0x014 + i);
- if (addStep(STEP_ID_STORE_JOB_REPORT1 + i, pStep) != 0) {
+ if (addStep(STEP_ID_RECIVE_JOB_UPS1 + i, pStep) != 0) {
delete pStep;
}
}
@@ -619,7 +571,7 @@
CEqWriteStep* pStep = new CEqWriteStep();
pStep->setName(STEP_EFEM_ROBOT_CMD);
pStep->setWriteSignalDev(0x14D);
- pStep->setDataDev(0x90a);
+ pStep->setDataDev(0x5c7);
if (addStep(STEP_ID_ROBOT_CMD_REPLY, pStep) != 0) {
delete pStep;
}
--
Gitblit v1.9.3