From 245f29ffb5584ce7dc07f2abbd2658c15840a514 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期三, 05 十一月 2025 17:28:22 +0800
Subject: [PATCH] 1.SVData持续读取，去掉信息交握；
---
SourceCode/Bond/Servo/CReadStep.cpp | 1 +
SourceCode/Bond/Servo/CEquipment.cpp | 10 +++++++++-
SourceCode/Bond/Servo/CReadStep.h | 2 ++
SourceCode/Bond/BondEq/BondEq.vcxproj | 6 +++---
4 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/BondEq/BondEq.vcxproj b/SourceCode/Bond/BondEq/BondEq.vcxproj
index 06553f1..432fb35 100644
--- a/SourceCode/Bond/BondEq/BondEq.vcxproj
+++ b/SourceCode/Bond/BondEq/BondEq.vcxproj
@@ -21,7 +21,7 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{7864134E-C538-4C0F-AF24-215FFCCBBAB4}</ProjectGuid>
<RootNamespace>BondServo</RootNamespace>
- <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.22000.0</WindowsTargetPlatformVersion>
<Keyword>MFCProj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -43,14 +43,14 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
+ <PlatformToolset>v142</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
<UseOfMfc>Dynamic</UseOfMfc>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
+ <PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<UseOfMfc>Dynamic</UseOfMfc>
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index f9d930a..792ba3f 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -510,7 +510,14 @@
CHECK_READ_STEP_SIGNAL(STEP_ID_PROCESS_DATA_REPORT, pszData, size);
// FAC Data report
- CHECK_READ_STEP_SIGNAL(STEP_ID_FAC_DATA_REPORT, pszData, size);
+ // CHECK_READ_STEP_SIGNAL(STEP_ID_FAC_DATA_REPORT, pszData, size);
+ {
+ SERVO::CStep* pStep = getStep(STEP_ID_FAC_DATA_REPORT);
+ if (pStep != nullptr) {
+ ((CReadStep*)pStep)->onReadSignal(TRUE);
+ }
+ }
+
// 配方改变
CHECK_READ_STEP_SIGNAL(STEP_ID_CURRENT_RECIPE_CHANGE_REPORT, pszData, size);
@@ -2243,6 +2250,7 @@
});
pStep->setName(STEP_EQ_FAC_DATA_REPORT);
pStep->setProp("Port", (void*)(__int64)port);
+ pStep->setReadContinue(TRUE);
pStep->setWriteSignalDev(writeSignalDev);
if (addStep(STEP_ID_FAC_DATA_REPORT, pStep) != 0) {
delete pStep;
diff --git a/SourceCode/Bond/Servo/CReadStep.cpp b/SourceCode/Bond/Servo/CReadStep.cpp
index c6aa36f..06181b8 100644
--- a/SourceCode/Bond/Servo/CReadStep.cpp
+++ b/SourceCode/Bond/Servo/CReadStep.cpp
@@ -95,6 +95,7 @@
ASSERT(m_pEquipment);
m_pEquipment->onStepEvent(this, STEP_EVENT_READDATA);
}
+ if (m_bReadContinue) continue;
// 0426新增
// 1.1，写return code or data
diff --git a/SourceCode/Bond/Servo/CReadStep.h b/SourceCode/Bond/Servo/CReadStep.h
index dcb3c56..8d048a4 100644
--- a/SourceCode/Bond/Servo/CReadStep.h
+++ b/SourceCode/Bond/Servo/CReadStep.h
@@ -11,6 +11,7 @@
public:
unsigned WorkingProc();
+ virtual void setReadContinue(BOOL bContinue) { m_bReadContinue = bContinue; };
virtual void setWriteSignalDev(int dev);
virtual void setReturnDev(int dev);
virtual void onReadSignal(int nSignalType);
@@ -40,6 +41,7 @@
char m_szReturnBuf[1024];
int m_nReturnDataSize;
int m_nReturnDevNo;
+ BOOL m_bReadContinue{ FALSE };
};
}
--
Gitblit v1.9.3