已修改6个文件
44 ■■■■ 文件已修改
SourceCode/Bond/Servo/CBakeCooling.cpp 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SourceCode/Bond/Servo/CEquipment.cpp 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SourceCode/Bond/Servo/CPageGraph2.cpp 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SourceCode/Bond/Servo/CSlot.cpp 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SourceCode/Bond/Servo/CSlot.h 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SourceCode/Bond/Servo/ServoDlg.cpp 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SourceCode/Bond/Servo/CBakeCooling.cpp
@@ -45,18 +45,22 @@
        m_slot[0].setPosition(m_nID);
        m_slot[0].setNo(1);
        m_slot[0].setName("Bake 1");
        m_slot[0].setLinkSignalPath(0);
        m_slot[1].enable();
        m_slot[1].setPosition(m_nID);
        m_slot[1].setNo(2);
        m_slot[1].setName("Bake 2");
        m_slot[1].setLinkSignalPath(0);
        m_slot[2].enable();
        m_slot[2].setPosition(m_nID);
        m_slot[2].setNo(3);
        m_slot[2].setName("Cooling 1");
        m_slot[2].setLinkSignalPath(1);
        m_slot[3].enable();
        m_slot[3].setPosition(m_nID);
        m_slot[3].setNo(4);
        m_slot[3].setName("Cooling 2");
        m_slot[3].setLinkSignalPath(1);
    }
    void CBakeCooling::onTimer(UINT nTimerid)
SourceCode/Bond/Servo/CEquipment.cpp
@@ -1149,10 +1149,11 @@
            if (m_slot[i].isLock()) continue;
            CGlass* pGlass = (CGlass*)m_slot[i].getContext();
            if (pGlass == nullptr) continue;
            if(!m_bLinkSignal[0][SIGNAL_UPSTREAM_INLINE]
                || m_bLinkSignal[0][SIGNAL_UPSTREAM_TROUBLE]
                || !m_bLinkSignal[0][SIGNAL_INTERLOCK]
                || !m_bLinkSignal[0][SIGNAL_SEND_ABLE] ) continue;
            int lsPath = m_slot[i].getLinkSignalPath();
            if(!m_bLinkSignal[lsPath][SIGNAL_UPSTREAM_INLINE]
                || m_bLinkSignal[lsPath][SIGNAL_UPSTREAM_TROUBLE]
                || !m_bLinkSignal[lsPath][SIGNAL_INTERLOCK]
                || !m_bLinkSignal[lsPath][SIGNAL_SEND_ABLE] ) continue;
            MaterialsType glassType = pGlass->getType();
            if (glassType == MaterialsType::G1 && putSlotType == MaterialsType::G2) continue;
@@ -1173,10 +1174,11 @@
                    if (m_slot[i].isLock()) continue;
                    CGlass* pGlass = (CGlass*)m_slot[i].getContext();
                    if (pGlass == nullptr) continue;
                    if (!m_bLinkSignal[0][SIGNAL_UPSTREAM_INLINE]
                        || m_bLinkSignal[0][SIGNAL_UPSTREAM_TROUBLE]
                        || !m_bLinkSignal[0][SIGNAL_INTERLOCK]
                        || !m_bLinkSignal[0][SIGNAL_SEND_ABLE]) continue;
                    int lsPath = m_slot[i].getLinkSignalPath();
                    if (!m_bLinkSignal[lsPath][SIGNAL_UPSTREAM_INLINE]
                        || m_bLinkSignal[lsPath][SIGNAL_UPSTREAM_TROUBLE]
                        || !m_bLinkSignal[lsPath][SIGNAL_INTERLOCK]
                        || !m_bLinkSignal[lsPath][SIGNAL_SEND_ABLE]) continue;
                    MaterialsType glassType = pGlass->getType();
                    if (glassType == MaterialsType::G1 && putSlotType == MaterialsType::G2) continue;
SourceCode/Bond/Servo/CPageGraph2.cpp
@@ -269,6 +269,10 @@
                pEquipment->setLinkSignal(0, SIGNAL_UPSTREAM_TROUBLE, FALSE);
                pEquipment->setLinkSignal(0, SIGNAL_INTERLOCK, TRUE);
                pEquipment->setLinkSignal(0, SIGNAL_SEND_ABLE, TRUE);
                pEquipment->setLinkSignal(1, SIGNAL_UPSTREAM_INLINE, TRUE);
                pEquipment->setLinkSignal(1, SIGNAL_UPSTREAM_TROUBLE, FALSE);
                pEquipment->setLinkSignal(1, SIGNAL_INTERLOCK, TRUE);
                pEquipment->setLinkSignal(1, SIGNAL_SEND_ABLE, TRUE);
            }
            if (pEquipment != nullptr && (pEquipment->getID() == EQ_ID_Bonder1
SourceCode/Bond/Servo/CSlot.cpp
@@ -12,6 +12,7 @@
        m_bLock = FALSE;
        m_pContext = nullptr;
        m_pTempContext = nullptr;
        m_nLinkSignalPath = 0;
    }
    CSlot::~CSlot()
@@ -119,6 +120,16 @@
        return m_pTempContext;
    }
    void CSlot::setLinkSignalPath(int path)
    {
        m_nLinkSignalPath = path;
    }
    int CSlot::getLinkSignalPath()
    {
        return m_nLinkSignalPath;
    }
    void CSlot::serialize(CArchive& ar)
    {
        if (ar.IsStoring()) {
SourceCode/Bond/Servo/CSlot.h
@@ -29,6 +29,8 @@
        CContext* getContext();
        CContext* getTempContext();
        void setContext(CContext* pContext);
        void setLinkSignalPath(int path);
        int getLinkSignalPath();
        void serialize(CArchive& ar);
    private:
@@ -44,6 +46,7 @@
        CContext* m_pTempContext;
        BOOL m_bEnable;
        BOOL m_bLock;
        int m_nLinkSignalPath;
    };
}
SourceCode/Bond/Servo/ServoDlg.cpp
@@ -174,6 +174,7 @@
            else if (RX_CODE_MASTER_STATE_CHANGED == code) {
                SERVO::MASTERSTATE state = theApp.m_model.getMaster().getState();
                if (state == SERVO::MASTERSTATE::READY) {
                    m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->EnableWindow(TRUE);
                    m_pMyStatusbar->setBackgroundColor(STATUSBAR_BK_NORMAL);
                    m_pMyStatusbar->setForegroundColor(RGB(0, 0, 0));
                    KillTimer(TIMER_ID_UPDATE_RUMTIME);
@@ -182,6 +183,7 @@
                    m_pMyStatusbar->setRunTimeText((LPTSTR)(LPCTSTR)strText);
                }
                else if (state == SERVO::MASTERSTATE::RUNNING) {
                    m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(TRUE);
                    m_pMyStatusbar->setBackgroundColor(STATUSBAR_BK_RUNNING);
                    m_pMyStatusbar->setForegroundColor(RGB(255, 255, 255));
                    SetTimer(TIMER_ID_UPDATE_RUMTIME, 500, nullptr);
@@ -793,11 +795,9 @@
    if (id == IDC_BUTTON_RUN) {
        theApp.m_model.getMaster().start();
        m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->EnableWindow(FALSE);
        m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(TRUE);
    }
    else if (id == IDC_BUTTON_STOP) {
        theApp.m_model.getMaster().stop();
        m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->EnableWindow(TRUE);
        m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(FALSE);
    }
    else if (id == IDC_BUTTON_ROBOT) {