Merge branch 'clh' into liuyang

mrDarker

2025-09-12 d89cc31a84312a4fde459dc82f29306e24750d4b

Merge branch 'clh' into liuyang

 SourceCode/Bond/Servo/CMeasurement.cpp

@@ -455,14 +455,14 @@
        params.push_back(CParam("检测速度", "", this->getName().c_str(), v * 0.001));
        i += 4;

        // 3.检测速度
        // 3.检测1数据
        v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8 | (pszData[i + 2] & 0xff) << 16 | (pszData[i + 3] & 0xff) << 24;
        params.push_back(CParam("检测速度", "", this->getName().c_str(), v * 0.001));
        params.push_back(CParam("检测1数据", "", this->getName().c_str(), v * 0.001));
        i += 4;

		
        // 4.检测2数据
        v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8 | (pszData[i + 2] & 0xff) << 16 | (pszData[i + 3] & 0xff) << 24;
        params.push_back(CParam("检测速度", "", this->getName().c_str(), v * 0.001));
        params.push_back(CParam("检测2数据", "", this->getName().c_str(), v * 0.001));
        i += 4;

        return (int)params.size();

 SourceCode/Bond/Servo/PageAlarm.cpp

@@ -196,7 +196,7 @@
        pListCtrl->DeleteItem(nRowCount - 1);
    }

    int nNewItem = pListCtrl->InsertItem(0, _T(""));
    int nNewItem = pListCtrl->InsertItem(pListCtrl->GetItemCount(), _T(""));

    // 设置每一列的数据
    CString str;