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>

 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;

 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

 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 };
    };
}


 SourceCode/Bond/Servo/Servo.rc

Binary files differ

 SourceCode/Bond/Servo/resource.h

Binary files differ