From 2d8047ec3451b7b411812970ee7b149bf1a9b2d6 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 06 十二月 2024 09:21:46 +0800
Subject: [PATCH] 1.轴参数设定，调试，合并；
---
SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp | 364 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 246 insertions(+), 118 deletions(-)
diff --git a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp b/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp
index dcdc219..7ac933d 100644
--- a/SourceCode/Bond/BondEq/View/AxisSettingsDlg.cpp
+++ b/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;
+ // 鎻愬彇鏁板瓧閮ㄥ垎锛堝幓闄R鍓嶇紑锛�
+ 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,40 +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+
- Sleep(20);
- }
- else if (nIDEvent == TIMER_JOG_SUB && m_bJogSubPressed) {
- TRACE("鎸佺画鍙戦�� JOG-\n");
- handleAxisOperation(AxisOperationType::JOG_SUB, true); // 鎸佺画鍙戦�� JOG-
- Sleep(20);
- }
+
CDialogEx::OnTimer(nIDEvent);
}
--
Gitblit v1.9.3