darker
2025-02-18 94fafb0f07b1df0e86f170cbf03d657ba39a16ff
1. 添加设备属性对话框 2. 在配置文件中添加设备ID
已修改7个文件
14 ■■■■ 文件已修改
SourceCode/Bond/Servo/CMaster.cpp 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SourceCode/Bond/Servo/Common.h 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SourceCode/Bond/Servo/Servo.rc 补丁 | 查看 | 原始文档 | blame | 历史
SourceCode/Bond/Servo/Servo.vcxproj 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SourceCode/Bond/Servo/Servo.vcxproj.filters 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SourceCode/Bond/Servo/ServoDlg.cpp 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
SourceCode/Bond/Servo/resource.h 补丁 | 查看 | 原始文档 | blame | 历史
SourceCode/Bond/Servo/CMaster.cpp
@@ -1,4 +1,5 @@
#include "stdafx.h"
#include "Common.h"
#include "CMaster.h"
namespace SERVO {
@@ -64,7 +65,7 @@
        // 初始化添加各子设备
        {
            CEFEM* pEquipment = new CEFEM();
            pEquipment->setID(1);
            pEquipment->setID(EQ_ID_EFEM);
            pEquipment->setName("EFEM(ROBOT)");
            pEquipment->setDescription("EFEM(ROBOT).");
            pEquipment->setReadBitBlock(0x4000, 0x45ff);
SourceCode/Bond/Servo/Common.h
@@ -26,3 +26,8 @@
#define BTN_LOG_BKGND_NORMAL            RGB(232, 232, 232)
#define BTN_LOG_BKGND_HOVER                RGB(153, 217, 234)
#define BTN_LOG_BKGND_PRESS                RGB(133, 203, 225)
/* Equipment ID */
#define EQ_ID_EFEM            1
#define EQ_ID_Bonder1        2
#define EQ_ID_Bonder2        3
SourceCode/Bond/Servo/Servo.rc
Binary files differ
SourceCode/Bond/Servo/Servo.vcxproj
@@ -200,6 +200,7 @@
    <ClInclude Include="CBonder.h" />
    <ClInclude Include="CCLinkPerformance\CCLinkIEControl.h" />
    <ClInclude Include="CCLinkPerformance\PerformanceMelsec.h" />
    <ClInclude Include="DevicePropertyDlg.h" />
    <ClInclude Include="CEFEM.h" />
    <ClInclude Include="CEquipment.h" />
    <ClInclude Include="CMaster.h" />
@@ -229,6 +230,7 @@
    <ClCompile Include="CBonder.cpp" />
    <ClCompile Include="CCLinkPerformance\CCLinkIEControl.cpp" />
    <ClCompile Include="CCLinkPerformance\PerformanceMelsec.cpp" />
    <ClCompile Include="DevicePropertyDlg.cpp" />
    <ClCompile Include="CEFEM.cpp" />
    <ClCompile Include="CEquipment.cpp" />
    <ClCompile Include="CMaster.cpp" />
SourceCode/Bond/Servo/Servo.vcxproj.filters
@@ -35,6 +35,7 @@
    <ClCompile Include="CMaster.cpp" />
    <ClCompile Include="CEFEM.cpp" />
    <ClCompile Include="ToolUnits.cpp" />
    <ClCompile Include="DevicePropertyDlg.cpp" />
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="AlarmManager.h" />
@@ -68,6 +69,7 @@
    <ClInclude Include="CMaster.h" />
    <ClInclude Include="CEFEM.h" />
    <ClInclude Include="ToolUnits.h" />
    <ClInclude Include="DevicePropertyDlg.h" />
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="Servo.rc" />
SourceCode/Bond/Servo/ServoDlg.cpp
@@ -151,7 +151,7 @@
                    if (pEquipment != nullptr) {
                        int nID = pEquipment->getID();
                        BOOL bAlive = pEquipment->isAlive();
                        if (1 == nID) {
                        if (EQ_ID_EFEM == nID) {
                            DeviceStatus status = bAlive ? DeviceStatus::ONLINE : DeviceStatus::OFFLINE;
                            UpdateDeviceStatus(INDICATE_ROBOT_ARM1, status);
                            UpdateDeviceStatus(INDICATE_ROBOT_ARM2, status);
SourceCode/Bond/Servo/resource.h
Binary files differ