1.轴参数设定，调试，合并；

LAPTOP-SNT8I5JK\Boounion

2024-12-06 2d8047ec3451b7b411812970ee7b149bf1a9b2d6

 SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp

@@ -11,8 +11,6 @@

#define TIMER_INIT            1
#define TIMER_READ_PLC_DATA      2
#define TIMER_JOG_ADD           3
#define TIMER_JOG_SUB           4

// CAxisSettingsDlg 对话框

@@ -24,6 +22,8 @@
   m_nInitialWidth = 0;
   m_nInitialHeight = 0;
   m_pPLC = nullptr;
   m_bJogAddState = FALSE;
   m_bJogSubState = FALSE;
}

CAxisSettingsDlg::~CAxisSettingsDlg()
@@ -191,17 +191,11 @@
   label.UpdateWindow();
}

void CAxisSettingsDlg::SetStatusColor(CBLLabel& label, BOOL bStatus)
void CAxisSettingsDlg::SetLabelColor(CBLLabel& label, COLORREF clr)
{
   if (bStatus) {
      label.SetBkColor(RGB(0, 255, 0)); // 绿色
   }
   else {
      label.SetBkColor(RGB(255, 0, 0)); // 红色
   }

   label.Invalidate();              // 标记区域无效
   label.UpdateWindow();            // 立即刷新
   label.SetBkColor(clr);
   label.Invalidate();               // 标记区域无效
   label.UpdateWindow();             // 立即刷新
}

void CAxisSettingsDlg::updatePageButtonStates()
@@ -421,24 +415,87 @@
   }
}

bool CAxisSettingsDlg::ParsePLCAddress(const CString& address, MC::SOFT_COMPONENT& component, int& addr)
{
   if (address.GetLength() < 2) {
      return false;
   }

   // 提取组件类型（第一个字符）
   TCHAR componentChar = address[0];
   if (address.Left(2) == _T("ZR")) {
      component = MC::SOFT_COMPONENT::ZR;
      // 提取数字部分（去除ZR前缀）
      CString numericAddress = address.Mid(2);
      addr = _ttoi(numericAddress);
      return addr != 0 || numericAddress.CompareNoCase(_T("0")) == 0;  // 如果是 "0"，也认为有效
   }

   // 对于其他组件，按照常规规则处理
   CString hexAddress = address.Mid(1);
   switch (componentChar) {
   case 'D':
      component = MC::SOFT_COMPONENT::D;
      addr = _ttoi(hexAddress);
      break;
   case 'M':
      component = MC::SOFT_COMPONENT::M;
      addr = _tcstoul(hexAddress, nullptr, 16);
      break;
   case 'X':
      component = MC::SOFT_COMPONENT::X;
      addr = _tcstoul(hexAddress, nullptr, 16);
      break;
   case 'Y':
      component = MC::SOFT_COMPONENT::Y;
      addr = _tcstoul(hexAddress, nullptr, 16);
      break;
   case 'W':
      component = MC::SOFT_COMPONENT::W;
      addr = _tcstoul(hexAddress, nullptr, 16);
      break;
   case 'L':
      component = MC::SOFT_COMPONENT::L;
      addr = _tcstoul(hexAddress, nullptr, 16);
      break;
   case 'S':
      component = MC::SOFT_COMPONENT::S;
      addr = _tcstoul(hexAddress, nullptr, 16);
      break;
   case 'B':
      component = MC::SOFT_COMPONENT::B;
      addr = _tcstoul(hexAddress, nullptr, 16);
      break;
   case 'F':
      component = MC::SOFT_COMPONENT::F;
      addr = _tcstoul(hexAddress, nullptr, 16);
      break;
   default:
      return false;
   }

   // 检查地址是否有效
   if (addr == 0 && hexAddress.CompareNoCase(_T("0")) != 0) {
      return false;
   }

   return true;
}

void CAxisSettingsDlg::writeAxisDataToPLC(int nAxisId)
{
   // 从 RecipeManager 获取轴数据
   RecipeManager& recipeManager = RecipeManager::getInstance();
   auto axisData = recipeManager.getAxis(nAxisId);

   // 去除非数字字符并转换起始地址
   std::string cleanAddress = axisData.startAddress;
   cleanAddress.erase(std::remove_if(cleanAddress.begin(), cleanAddress.end(),
      [](char c) { return !std::isdigit(c); }), cleanAddress.end());
   if (cleanAddress.empty()) {
   int startAddress;
   MC::SOFT_COMPONENT component;
   if (!ParsePLCAddress(CString(axisData.startAddress.c_str()), component, startAddress)) {
      AfxMessageBox(_T("无效的起始地址！"));
      return;
   }
   int startAddress = std::stoi(cleanAddress);

   // 写入手动速度
   m_pPLC->writeWord(MC::SOFT_COMPONENT::D, 5120, (int)axisData.manualSpeed, [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
   m_pPLC->writeDWord(component, startAddress + 82, (int)axisData.manualSpeed * 1000, [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
      if (flag == 0) {
         TRACE("\n写入成功: 手动速度, 地址: %d, 值: %lu\n", addr, value);
      }
@@ -448,7 +505,7 @@
   });

   // 写入自动速度
   m_pPLC->writeWord(MC::SOFT_COMPONENT::D, startAddress + 2, (int)axisData.autoSpeed, [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
   m_pPLC->writeDWord(component, startAddress + 84, (int)(axisData.autoSpeed * 1000.0), [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
      if (flag == 0) {
         TRACE("\n写入成功: 自动速度, 地址: %d, 值: %lu\n", addr, value);
      }
@@ -458,7 +515,7 @@
   });

   // 写入加速时间, 转换为毫秒
   m_pPLC->writeWord(MC::SOFT_COMPONENT::D, startAddress + 4, (int)(axisData.accelerationTime * 1000), [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
   m_pPLC->writeDWord(component, startAddress + 62, (int)(axisData.accelerationTime * 1000.0), [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
      if (flag == 0) {
         TRACE("\n写入成功: 加速时间, 地址: %d, 值: %lu\n", addr, value);
      }
@@ -468,7 +525,7 @@
   });

   // 写入减速时间, 转换为毫秒
   m_pPLC->writeWord(MC::SOFT_COMPONENT::D, startAddress + 6, (int)(axisData.decelerationTime * 1000), [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
   m_pPLC->writeDWord(component, startAddress + 64, (int)(axisData.decelerationTime * 1000.0), [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
      if (flag == 0) {
         TRACE("\n写入成功: 减速时间, 地址: %d, 值: %lu\n", addr, value);
      }
@@ -478,7 +535,7 @@
   });

   // 写入微动量
   m_pPLC->writeWord(MC::SOFT_COMPONENT::D, startAddress + 8, (int)axisData.jogDistance, [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
   m_pPLC->writeWord(component, startAddress + 81, (int)(axisData.jogDistance * 1000.0), [](IMcChannel* pChannel, int addr, DWORD value, int flag) {
      if (flag == 0) {
         TRACE("\n写入成功: 微动量, 地址: %d, 值: %lu\n", addr, value);
      }
@@ -488,12 +545,13 @@
   });

   // 写入定位点数据
   int positionStartAddress = startAddress + 10;
   /*
   int positionStartAddress = startAddress + 100;
   for (size_t i = 0; i < axisData.positions.size(); ++i) {
      const auto& position = axisData.positions[i];
      int positionAddress = positionStartAddress + (i * 2);
      unsigned int positionAddress = positionStartAddress + (i * 4);

      m_pPLC->writeWord(MC::SOFT_COMPONENT::D, positionAddress, (int)position.second, [i](IMcChannel* pChannel, int addr, DWORD value, int flag) {
      m_pPLC->writeWord(component, positionAddress, (int)position.second, [i](IMcChannel* pChannel, int addr, DWORD value, int flag) {
         if (flag == 0) {
            TRACE("\n写入成功: 定位点 %d, 地址: %d, 值: %lu\n", i + 1, addr, value);
         }
@@ -502,6 +560,7 @@
         }
      });
   }
   */
}

void CAxisSettingsDlg::handleAxisOperation(AxisOperationType eOpType, bool bPressed)
@@ -516,45 +575,44 @@
   RecipeManager& recipeManager = RecipeManager::getInstance();
   auto axisData = recipeManager.getAxis(nAxisId);

   std::string strCleanAddress = axisData.startAddress;
   strCleanAddress.erase(std::remove_if(strCleanAddress.begin(), strCleanAddress.end(),
      [](unsigned char c) { return !std::isdigit(c); }), strCleanAddress.end());
   if (strCleanAddress.empty()) {
   int startAddress;
   MC::SOFT_COMPONENT component;
   if (!ParsePLCAddress(CString(axisData.startAddress.c_str()), component, startAddress)) {
      AfxMessageBox(_T("无效的起始地址！"));
      return;
   }

   int nStartAddress = std::stoi(strCleanAddress);

   // 根据操作类型计算目标地址
   int nTargetAddress = nStartAddress;
   char szWrite[4] = {0x0, 0x0, 0x0, 0x0};
   switch (eOpType) {
   case AxisOperationType::OPR:
      nTargetAddress += 10; // OPR 信号地址
      startAddress += 0; // OPR 信号地址 0,闪动信息04.0
      szWrite[0] = 0x1;
      break;
   case AxisOperationType::JOG_ADD:
      nTargetAddress += 12; // JOG+ 信号地址
      startAddress += 01; // JOG+ 信号地址 c
      szWrite[1] = bPressed ? 0x10 : 0;
      break;
   case AxisOperationType::JOG_SUB:
      nTargetAddress += 13; // JOG- 信号地址
      startAddress += 01; // JOG- 信号地址 d
      szWrite[1] = bPressed ? 0x20 : 0;
      break;
   case AxisOperationType::STOP:
      nTargetAddress += 14; // STOP 信号地址
      startAddress += 14; // STOP 信号地址
      break;
   case AxisOperationType::POSITION_1:
      nTargetAddress += 16; // 定位点 1 信号地址
      startAddress += 16; // 定位点 1 信号地址
      break;
   case AxisOperationType::POSITION_2:
      nTargetAddress += 18; // 定位点 2 信号地址
      startAddress += 18; // 定位点 2 信号地址
      break;
   case AxisOperationType::POSITION_3:
      nTargetAddress += 20; // 定位点 3 信号地址
      startAddress += 20; // 定位点 3 信号地址
      break;
   case AxisOperationType::POSITION_4:
      nTargetAddress += 22; // 定位点 4 信号地址
      startAddress += 22; // 定位点 4 信号地址
      break;
   case AxisOperationType::POSITION_5:
      nTargetAddress += 24; // 定位点 5 信号地址
      startAddress += 24; // 定位点 5 信号地址
      break;
   default:
      AfxMessageBox(_T("未知操作类型！"));
@@ -562,7 +620,7 @@
   }

   // 向 PLC 写入信号
   m_pPLC->writeBit(MC::SOFT_COMPONENT::D, nTargetAddress, bPressed, [eOpType, nTargetAddress, bPressed](IMcChannel* pChannel, int nAddr, DWORD nValue, int nFlag) {
   m_pPLC->writeData(component, startAddress, szWrite, 2, [eOpType, startAddress, bPressed](IMcChannel* pChannel, int nAddr, DWORD nValue, int nFlag) {
      if (nFlag == 0) {
         TRACE("操作成功：类型=%d，地址=%d，值=%d\n", static_cast<int>(eOpType), nAddr, bPressed);
      }
@@ -572,6 +630,94 @@
   });
}

void CAxisSettingsDlg::readPLCDataToUI(int nAxisId)
{	
   // 从 RecipeManager 获取轴数据
   RecipeManager& recipeManager = RecipeManager::getInstance();
   auto axisData = recipeManager.getAxis(nAxisId);

   MC::SOFT_COMPONENT component;
   int startAddress, endAddress, readSize;
   if (!ParsePLCAddress(CString(axisData.startAddress.c_str()), component, startAddress)) {
      AfxMessageBox(_T("无效的起始地址！"));
   }
   endAddress = startAddress + 300;
   readSize = (endAddress - startAddress + 1) * 2;

   {
      auto funOnReadData = [&, startAddress, readSize](IMcChannel* pChannel, int addr, char* pData, unsigned int nDataSize, int flag) -> void {
         if (nDataSize == readSize && flag == 0 && ::IsWindow(m_hWnd)) {
            double fCurPos = CToolUnits::toInt32(&pData[20*2]) * 0.001;
            double fManualSpeed = CToolUnits::toInt32(&pData[82 * 2]) * 0.001;
            double fAutoSpeed = CToolUnits::toInt32(&pData[84 * 2]) * 0.001;
            double fPrm = CToolUnits::toInt32(&pData[50 * 2]) * 0.1;
            int nLoad = CToolUnits::toInt16(&pData[54 * 2]);
            int nErrCode = CToolUnits::toInt16(&pData[26 * 2]);
            int nAlarmCode = CToolUnits::toInt16(&pData[27 * 2]);
            CToolUnits::setDlgItemDouble(this, IDC_EDIT_AXIS_CURR_POS, fCurPos);
            CToolUnits::setDlgItemDouble(this, IDC_EDIT_AXIS_CURR_MANUAL_SPEED, fManualSpeed);
            CToolUnits::setDlgItemDouble(this, IDC_EDIT_AXIS_CURR_AUTO_SPEED, fAutoSpeed);
            CToolUnits::setDlgItemDouble(this, IDC_EDIT_AXIS_CURR_ROTA_SPEED, fPrm);
            SetDlgItemInt(IDC_EDIT_AXIS_CURR_LOAD, nLoad);
            SetDlgItemInt(IDC_EDIT_AXIS_CURR_ERROR_NUMBER, nErrCode);
            SetDlgItemInt(IDC_EDIT_AXIS_CURR_ALARM_NUMBER, nAlarmCode);

            // OPR 信号
            BOOL bFLS = CToolUnits::getBit(pData[10 * 2], 1);
            if (bFLS) {
               SetLabelColor(m_staticFLS, RGB(0, 255, 0));
            }
            else {
               SetLabelColor(m_staticFLS, RGB(0, 180, 0));
            }

            BOOL bDOG = CToolUnits::getBit(pData[10 * 2], 6);
            if (bDOG) {
               SetLabelColor(m_staticDOG, RGB(0, 255, 0));
            }
            else {
               SetLabelColor(m_staticDOG, RGB(0, 180, 0));
            }

            BOOL bRLS = CToolUnits::getBit(pData[10 * 2], 0);
            if (bRLS) {
               SetLabelColor(m_staticRLS, RGB(0, 255, 0));
            }
            else {
               SetLabelColor(m_staticRLS, RGB(0, 180, 0));
            }

            BOOL bReady = CToolUnits::getBit(pData[10 * 2 + 1], 0xA - 8);
            if (bReady) {
               SetLabelColor(m_staticReady, RGB(0, 255, 0));
            }
            else {
               SetLabelColor(m_staticReady, RGB(0, 180, 0));
            }

            BOOL bBusy = CToolUnits::getBit(pData[10 * 2 + 1], 0xB - 8);
            if (bBusy) {
               SetLabelColor(m_staticBusy, RGB(0, 255, 0));
            }
            else {
               SetLabelColor(m_staticBusy, RGB(0, 180, 0));
            }

            BOOL bErr = CToolUnits::getBit(pData[10 * 2 + 1], 0xF - 8);
            if (bErr) {
               SetLabelColor(m_staticErr, RGB(255, 0, 0));
            }
            else {
               SetLabelColor(m_staticErr, RGB(0, 180, 0));
            }

            m_bJogAddState = CToolUnits::getBit(pData[1 + 1], 0xC - 8);   // 1.D
            m_bJogSubState = CToolUnits::getBit(pData[1+1], 0xD - 8);   // 1.D
         }
      };
      m_pPLC->readData(component, startAddress, readSize, funOnReadData);
   }
}

BEGIN_MESSAGE_MAP(CAxisSettingsDlg, CDialogEx)
   ON_BN_CLICKED(IDC_BUTTON_AXIS_LAST, &CAxisSettingsDlg::OnBnClickedButtonAxisLast)
@@ -612,7 +758,7 @@
   // 设置测试状态
   CBLLabel* pLabels[] = { &m_staticFLS, &m_staticDOG, &m_staticRLS, &m_staticReady, &m_staticBusy, &m_staticErr };
   for (auto pLabel : pLabels) {
      SetStatusColor(*pLabel, FALSE);
      pLabel->SetBkColor(RGB(255, 255, 255));
      pLabel->ModifyStyle(0, SS_NOTIFY);
      pLabel->SetTextColor(RGB(255, 255, 255));
      pLabel->SetAlignment(AlignCenter);
@@ -682,42 +828,50 @@
   {
      if (pMsg->hwnd == GetDlgItem(IDC_BUTTON_AXIS_TEST_JOG_ADD)->m_hWnd)
      {
         TRACE("JOG+ 按钮按下\n");
         m_bJogAddPressed = TRUE;

         // 启动定时器连续发送信号
         SetTimer(TIMER_JOG_ADD, 200, nullptr);
         handleAxisOperation(AxisOperationType::JOG_ADD, true);
         int nSleep = 100 - int(GetTickCount64() - m_ullJogPressedTick);
         if (!m_bJogAddState) {
            m_bJogAddState = !m_bJogAddState;
            Sleep(nSleep < 0 ? 0 : nSleep);
            handleAxisOperation(AxisOperationType::JOG_ADD, true);
            m_ullJogPressedTick = GetTickCount64();
            TRACE("JOG+ 按钮按下 %d\n", nSleep);
         }
      }
      else if (pMsg->hwnd == GetDlgItem(IDC_BUTTON_AXIS_TEST_JOG_SUB)->m_hWnd)
      {
         TRACE("JOG- 按钮按下\n");
         m_bJogSubPressed = TRUE;

         // 启动定时器连续发送信号
         SetTimer(TIMER_JOG_SUB, 200, nullptr);
         handleAxisOperation(AxisOperationType::JOG_SUB, true);
         int nSleep = 100 - int(GetTickCount64() - m_ullJogPressedTick);
         if (!m_bJogSubState) {
            m_bJogSubState = !m_bJogSubState;
            Sleep(nSleep < 0 ? 0 : nSleep);
            handleAxisOperation(AxisOperationType::JOG_SUB, true);
            m_ullJogPressedTick = GetTickCount64();
            TRACE("JOG- 按钮按下%d\n", nSleep);
         }
      }
   }
   else if (pMsg->message == WM_LBUTTONUP)
   {
      if (pMsg->hwnd == GetDlgItem(IDC_BUTTON_AXIS_TEST_JOG_ADD)->m_hWnd)
      {
         TRACE("JOG+ 按钮松开\n");
         m_bJogAddPressed = FALSE;

         // 停止定时器
         KillTimer(TIMER_JOG_ADD);
         handleAxisOperation(AxisOperationType::JOG_ADD, false);
         int nSleep = 100 - int(GetTickCount64() - m_ullJogPressedTick);
         if (m_bJogAddState) {
            m_bJogAddState = !m_bJogAddState;
            Sleep(nSleep < 0 ? 0 : nSleep);
            handleAxisOperation(AxisOperationType::JOG_ADD, false);
            m_ullJogPressedTick = GetTickCount64();
            TRACE("JOG+ 按钮松开 %d\n", nSleep);
         }
      }
      else if (pMsg->hwnd == GetDlgItem(IDC_BUTTON_AXIS_TEST_JOG_SUB)->m_hWnd)
      {
         TRACE("JOG- 按钮松开\n");
         m_bJogSubPressed = FALSE;

         // 停止定时器
         KillTimer(TIMER_JOG_SUB);
         handleAxisOperation(AxisOperationType::JOG_SUB, false);
         int nSleep = 100 - int(GetTickCount64() - m_ullJogPressedTick);
         if (m_bJogSubState) {
            m_bJogSubState = !m_bJogSubState;
            Sleep(nSleep < 0 ? 0 : nSleep);
            handleAxisOperation(AxisOperationType::JOG_SUB, false);
            m_ullJogPressedTick = GetTickCount64();
            TRACE("JOG- 按钮松开%d\n", nSleep);
         }
      }
   }

@@ -740,7 +894,7 @@
   AdjustControls(dScaleX, dScaleY);

   // 动态调整各个 CBLLabel 的字体大小
   CBLLabel* pLabels[] = { &m_staticFLS, &m_staticDOG, &m_staticRLS, &m_staticReady, &m_staticBusy, &m_staticErr };
   CBLLabel* pLabels[] = { &m_staticFLS, &m_staticDOG, &m_staticRLS, &m_staticReady, &m_staticBusy, &m_staticBusy };
   for (auto pLabel : pLabels) {
      AdjustLabelFont(*pLabel);
   }
@@ -795,89 +949,90 @@
void CAxisSettingsDlg::OnBnClickedButtonAxisLast()
{
   // TODO: 在此添加控件通知处理程序代码
   updateAxisSelection(-1);
   //updateAxisSelection(-1);
}

void CAxisSettingsDlg::OnBnClickedButtonAxisNext()
{
   // TODO: 在此添加控件通知处理程序代码
   updateAxisSelection(1);
   //updateAxisSelection(1);
}

void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPointGroup1()
{
   // TODO: 在此添加控件通知处理程序代码
   switchToPage(1);
   //switchToPage(1);
}

void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPointGroup2()
{
   // TODO: 在此添加控件通知处理程序代码
   switchToPage(2);
   //switchToPage(2);
}

void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPointGroup3()
{
   // TODO: 在此添加控件通知处理程序代码
   switchToPage(3);
   //switchToPage(3);
}

void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPointGroup4()
{
   // TODO: 在此添加控件通知处理程序代码
   switchToPage(4);
   //switchToPage(4);
}

void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPointGroup5()
{
   // TODO: 在此添加控件通知处理程序代码
   switchToPage(5);
   //switchToPage(5);
}

void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPoint1()
{
   // TODO: 在此添加控件通知处理程序代码
   handleAxisOperation(AxisOperationType::POSITION_1, true);
   //handleAxisOperation(AxisOperationType::POSITION_1, true);
}

void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPoint2()
{
   // TODO: 在此添加控件通知处理程序代码
   handleAxisOperation(AxisOperationType::POSITION_2, true);
   //handleAxisOperation(AxisOperationType::POSITION_2, true);
}

void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPoint3()
{
   // TODO: 在此添加控件通知处理程序代码
   handleAxisOperation(AxisOperationType::POSITION_3, true);
   //handleAxisOperation(AxisOperationType::POSITION_3, true);
}

void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPoint4()
{
   // TODO: 在此添加控件通知处理程序代码
   handleAxisOperation(AxisOperationType::POSITION_4, true);
   //handleAxisOperation(AxisOperationType::POSITION_4, true);
}

void CAxisSettingsDlg::OnBnClickedButtonAxisAnchorPoint5()
{
   // TODO: 在此添加控件通知处理程序代码
   handleAxisOperation(AxisOperationType::POSITION_5, true);
   //handleAxisOperation(AxisOperationType::POSITION_5, true);
}

void CAxisSettingsDlg::OnBnClickedButtonAxisTestOpr()
{
   // TODO: 在此添加控件通知处理程序代码
   handleAxisOperation(AxisOperationType::OPR, true);
   //handleAxisOperation(AxisOperationType::OPR, true);
}

void CAxisSettingsDlg::OnBnClickedButtonAxisTestStop()
{
   // TODO: 在此添加控件通知处理程序代码
   handleAxisOperation(AxisOperationType::STOP, true);
   //handleAxisOperation(AxisOperationType::STOP, true);
}

void CAxisSettingsDlg::OnSelchangeComboAxisName()
{

   // TODO: 在此添加控件通知处理程序代码
   int axisId = getCurrentSelectedAxisID();
   if (axisId == -1) {
@@ -892,6 +1047,7 @@

void CAxisSettingsDlg::OnBnClickedButtonAxisSave()
{

   // TODO: 在此添加控件通知处理程序代码
   int axisId = getCurrentSelectedAxisID();
   if (axisId == -1) {
@@ -925,38 +1081,12 @@
   if (TIMER_READ_PLC_DATA == nIDEvent) {
      ASSERT(m_pPLC);

      int addr1, addr2, readSize;
      addr1 = 5120;
      addr2 = 5425;
      readSize = (addr2 - addr1 + 1) * 2;
      auto funOnReadData = [&, addr1, readSize](IMcChannel* pChannel, int addr, char* pData, unsigned int nDataSize, int flag) -> void {
         if (nDataSize == readSize && flag == 0) {
            double fCurPos = CToolUnits::toInt32(pData) * 0.001;
            double fManualSpeed = CToolUnits::toInt32(&pData[(5422- addr1)*2]) * 0.001;
            double fAutoSpeed = CToolUnits::toInt32(&pData[(5424 - addr1) * 2]) * 0.001;
            double fPrm = CToolUnits::toInt32(&pData[(5150 - addr1) * 2]) * 0.1;
            int nLoad = CToolUnits::toInt16(&pData[(5154 - addr1) * 2]);
            int nErrCode = CToolUnits::toInt16(&pData[(5126 - addr1) * 2]);
            int nAlarmCode = CToolUnits::toInt16(&pData[(5127 - addr1) * 2]);
            CToolUnits::setDlgItemDouble(this, IDC_EDIT_AXIS_CURR_POS, fCurPos);
            CToolUnits::setDlgItemDouble(this, IDC_EDIT_AXIS_CURR_MANUAL_SPEED, fManualSpeed);
            CToolUnits::setDlgItemDouble(this, IDC_EDIT_AXIS_CURR_AUTO_SPEED, fAutoSpeed);
            CToolUnits::setDlgItemDouble(this, IDC_EDIT_AXIS_CURR_ROTA_SPEED, fPrm);
            SetDlgItemInt(IDC_EDIT_AXIS_CURR_LOAD, nLoad);
            SetDlgItemInt(IDC_EDIT_AXIS_CURR_ERROR_NUMBER, nErrCode);
            SetDlgItemInt(IDC_EDIT_AXIS_CURR_ALARM_NUMBER, nAlarmCode);
         }
      };
      m_pPLC->readData(MC::SOFT_COMPONENT::D, addr1, readSize, funOnReadData);
      int nAxisId = getCurrentSelectedAxisID();
      if (nAxisId != -1) {
         readPLCDataToUI(nAxisId);
      }
   }   
   else if (nIDEvent == TIMER_JOG_ADD && m_bJogAddPressed) {
      TRACE("持续发送 JOG+\n");
      handleAxisOperation(AxisOperationType::JOG_ADD, true); // 持续发送 JOG+
   }
   else if (nIDEvent == TIMER_JOG_SUB && m_bJogSubPressed) {
      TRACE("持续发送 JOG-\n");
      handleAxisOperation(AxisOperationType::JOG_SUB, true); // 持续发送 JOG-
   }


   CDialogEx::OnTimer(nIDEvent);
}