Merge branch 'clh' into liuyang

mrDarker

2025-05-06 cacea2da59a3acd73f3161d819a10e0060762616

 SourceCode/Bond/Servo/CPageGraph1.cpp

@@ -86,6 +86,14 @@
                     UpdateDeviceStatus(INDICATE_ROBOT_ARM1, status);
                     UpdateDeviceStatus(INDICATE_ROBOT_ARM2, status);
                  }
                  else if(EQ_ID_Bonder1 == nID) {
                     DeviceStatus status = bAlive ? DeviceStatus::ONLINE : DeviceStatus::OFFLINE;
                     UpdateDeviceStatus(INDICATE_BONDER1, status);
                  }
                  else if (EQ_ID_Bonder2 == nID) {
                     DeviceStatus status = bAlive ? DeviceStatus::ONLINE : DeviceStatus::OFFLINE;
                     UpdateDeviceStatus(INDICATE_BONDER2, status);
                  }
               }
            }
         }
@@ -171,8 +179,6 @@
   m_pGraph->AddIndicateBox(INDICATE_ROBOT_ARM2, 243, 294, 48, RGB(22, 22, 22),
      RGB(255, 127, 39), EQ_BOX_OFFLINE);
   m_pGraph->SetBoxText(INDICATE_ROBOT_ARM2, "6", "Robot");




   // Vacuum bake
@@ -423,6 +429,29 @@
   if (1 == nIDEvent) {
      KillTimer(1);
      InitRxWindows();

      // 更新状态
      {
         SERVO::CEquipment* pEquipment = (SERVO::CEFEM*)theApp.m_model.m_master.getEquipment(EQ_ID_EFEM);
         ASSERT(pEquipment);
         DeviceStatus status = pEquipment->isAlive() ? DeviceStatus::ONLINE : DeviceStatus::OFFLINE;
         UpdateDeviceStatus(INDICATE_ROBOT_ARM1, status);
         UpdateDeviceStatus(INDICATE_ROBOT_ARM2, status);
      }

      {
         SERVO::CEquipment* pEquipment = theApp.m_model.m_master.getEquipment(EQ_ID_Bonder1);
         ASSERT(pEquipment);
         DeviceStatus status = pEquipment->isAlive() ? DeviceStatus::ONLINE : DeviceStatus::OFFLINE;
         UpdateDeviceStatus(INDICATE_BONDER1, status);
      }

      {
         SERVO::CEquipment* pEquipment = theApp.m_model.m_master.getEquipment(EQ_ID_Bonder2);
         ASSERT(pEquipment);
         DeviceStatus status = pEquipment->isAlive() ? DeviceStatus::ONLINE : DeviceStatus::OFFLINE;
         UpdateDeviceStatus(INDICATE_BONDER2, status);
      }
   }

   CDialogEx::OnTimer(nIDEvent);