添加状态点位表
This commit is contained in:
+28
-11
@@ -15,7 +15,7 @@ bool isValidAddress(int address)
|
||||
|
||||
bool ModbusAddressMap::isValid(QString *error) const
|
||||
{
|
||||
const QList<QPair<QString, int> > addresses = QList<QPair<QString, int> >()
|
||||
const QList<QPair<QString, int> > coilAddresses = QList<QPair<QString, int> >()
|
||||
<< qMakePair(QString("startCommand"), startCommand)
|
||||
<< qMakePair(QString("pauseCommand"), pauseCommand)
|
||||
<< qMakePair(QString("resetCommand"), resetCommand)
|
||||
@@ -28,9 +28,15 @@ bool ModbusAddressMap::isValid(QString *error) const
|
||||
<< qMakePair(QString("robotReady"), robotReady)
|
||||
<< qMakePair(QString("safetyDoorClosed"), safetyDoorClosed)
|
||||
<< qMakePair(QString("emergencyStop"), emergencyStop)
|
||||
<< qMakePair(QString("currentStep"), currentStep)
|
||||
<< qMakePair(QString("checkResult"), checkResult)
|
||||
<< qMakePair(QString("errorCode"), errorCode)
|
||||
<< qMakePair(QString("inspectionMachineReady"), inspectionMachineReady)
|
||||
<< qMakePair(QString("visionReady"), visionReady)
|
||||
<< qMakePair(QString("robotControlCabinetReady"), robotControlCabinetReady)
|
||||
<< qMakePair(QString("mainControlCabinetReady"), mainControlCabinetReady)
|
||||
<< qMakePair(QString("safetyDoor1Closed"), safetyDoor1Closed)
|
||||
<< qMakePair(QString("safetyDoor2Closed"), safetyDoor2Closed)
|
||||
<< qMakePair(QString("safetyDoor3Closed"), safetyDoor3Closed)
|
||||
<< qMakePair(QString("activeAlarm"), activeAlarm)
|
||||
<< qMakePair(QString("inspectionMode"), inspectionMode)
|
||||
<< qMakePair(QString("rackPickCommand"), rackPickCommand)
|
||||
<< qMakePair(QString("frontLoadCommand"), frontLoadCommand)
|
||||
<< qMakePair(QString("inspectionCommand"), inspectionCommand)
|
||||
@@ -46,27 +52,38 @@ bool ModbusAddressMap::isValid(QString *error) const
|
||||
<< qMakePair(QString("flipFeedback"), flipFeedback)
|
||||
<< qMakePair(QString("backLoadFeedback"), backLoadFeedback)
|
||||
<< qMakePair(QString("backUnloadFeedback"), backUnloadFeedback)
|
||||
<< qMakePair(QString("rackPlaceFeedback"), rackPlaceFeedback)
|
||||
<< qMakePair(QString("inspectionMode"), inspectionMode)
|
||||
<< qMakePair(QString("rackPlaceFeedback"), rackPlaceFeedback);
|
||||
|
||||
const QList<QPair<QString, int> > holdingRegisterAddresses = QList<QPair<QString, int> >()
|
||||
<< qMakePair(QString("currentStep"), currentStep)
|
||||
<< qMakePair(QString("checkResult"), checkResult)
|
||||
<< qMakePair(QString("errorCode"), errorCode)
|
||||
<< qMakePair(QString("trayNumber"), trayNumber)
|
||||
<< qMakePair(QString("slotNumber"), slotNumber);
|
||||
|
||||
QSet<int> usedAddresses;
|
||||
for (const QPair<QString, int> &item : addresses) {
|
||||
const QList<QPair<QString, int> > addressGroups[] = {
|
||||
coilAddresses, holdingRegisterAddresses
|
||||
};
|
||||
const QString addressTypes[] = {"coil", "holding register"};
|
||||
for (int groupIndex = 0; groupIndex < 2; ++groupIndex) {
|
||||
QSet<int> usedAddresses;
|
||||
for (const QPair<QString, int> &item : addressGroups[groupIndex]) {
|
||||
if (!isValidAddress(item.second)) {
|
||||
if (error) {
|
||||
*error = QString("Modbus address is invalid: %1").arg(item.first);
|
||||
*error = QString("Modbus %1 address is invalid: %2")
|
||||
.arg(addressTypes[groupIndex], item.first);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
if (usedAddresses.contains(item.second)) {
|
||||
if (error) {
|
||||
*error = QString("Modbus address is duplicated: %1")
|
||||
.arg(item.first);
|
||||
*error = QString("Modbus %1 address is duplicated: %2")
|
||||
.arg(addressTypes[groupIndex], item.first);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
usedAddresses.insert(item.second);
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
|
||||
Reference in New Issue
Block a user