feat: 重构视觉取料流程及生产故障恢复
- 删除订单启动、暂停、复位相关 PLC 握手及无效反馈配置 - 清除报警改为仅写 clearAlarmCommand,不等待反馈 - 将拍照位移动、视觉处理和 RackPick 拆分为三个独立动作 - 增加 M850/M851 拍照位动作及 R60/M852 视觉结果流程 - 暂停改为等待当前机器人动作完成,视觉结果不确定时转人工确认 - 删除复位按钮,合并为恢复/重试按钮 - 普通 PAUSED 订单通过启动按钮继续 - 恢复前检查 PLC、安全状态、订单及动作命令反馈 - 支持在途动作接管、已完成动作收尾、安全重试和人工确认 - 故障状态保持订单 RUNNING,并持久化实际恢复阶段 - 恢复成功后仅清除本次软件故障对应的报警 - 更新小轴 PLC 地址、Modbus 配置和视觉集成文档
This commit is contained in:
+12
-14
@@ -21,7 +21,7 @@ bool VisionConfig::isValid(QString *error) const
|
||||
|| qAbs(photoPoseR - graspPoseR) < 12) {
|
||||
errors.append("Vision REAL blocks must be distinct, even, 12-word R ranges");
|
||||
}
|
||||
const int coils[] = {photoMoveCoil, photoArrivedCoil, comparisonPickCoil};
|
||||
const int coils[] = {photoMoveCoil, photoMoveCoilFeedback, comparisonPickCoil};
|
||||
QSet<int> unique;
|
||||
for (int coil : coils) {
|
||||
if (coil < 0 || coil > 65535 || unique.contains(coil)) {
|
||||
@@ -84,14 +84,7 @@ bool ConfigManager::load(const QString &filePath)
|
||||
m_modbusConfig.reconnectAttempts = settings.value("modbus/reconnectAttempts", m_modbusConfig.reconnectAttempts).toInt();
|
||||
|
||||
ModbusAddressMap &addresses = m_modbusConfig.addressMap;
|
||||
addresses.startCommand = settings.value("modbus/startCommand", addresses.startCommand).toInt();
|
||||
addresses.pauseCommand = settings.value("modbus/pauseCommand", addresses.pauseCommand).toInt();
|
||||
addresses.resetCommand = settings.value("modbus/resetCommand", addresses.resetCommand).toInt();
|
||||
addresses.clearAlarmCommand = settings.value("modbus/clearAlarmCommand", addresses.clearAlarmCommand).toInt();
|
||||
addresses.startFeedback = settings.value("modbus/startFeedback", addresses.startFeedback).toInt();
|
||||
addresses.pauseFeedback = settings.value("modbus/pauseFeedback", addresses.pauseFeedback).toInt();
|
||||
addresses.resetFeedback = settings.value("modbus/resetFeedback", addresses.resetFeedback).toInt();
|
||||
addresses.clearAlarmFeedback = settings.value("modbus/clearAlarmFeedback", addresses.clearAlarmFeedback).toInt();
|
||||
addresses.plcReady = settings.value("modbus/plcReady", addresses.plcReady).toInt();
|
||||
addresses.robotReady = settings.value("modbus/robotReady", addresses.robotReady).toInt();
|
||||
addresses.safetyDoorClosed = settings.value("modbus/safetyDoorClosed", addresses.safetyDoorClosed).toInt();
|
||||
@@ -200,12 +193,17 @@ bool ConfigManager::load(const QString &filePath)
|
||||
m_visionConfig.startupTimeoutMs = settings.value("vision/startupTimeoutMs", m_visionConfig.startupTimeoutMs).toInt();
|
||||
m_visionConfig.initializeTimeoutMs = settings.value("vision/initializeTimeoutMs", m_visionConfig.initializeTimeoutMs).toInt();
|
||||
m_visionConfig.requestTimeoutMs = settings.value("vision/requestTimeoutMs", m_visionConfig.requestTimeoutMs).toInt();
|
||||
m_visionConfig.photoPoseR = settings.value("vision/photoPoseR", 40).toInt();
|
||||
m_visionConfig.graspPoseR = settings.value("vision/graspPoseR", 60).toInt();
|
||||
m_visionConfig.lowWordFirst = settings.value("vision/lowWordFirst", true).toBool();
|
||||
m_visionConfig.photoMoveCoil = settings.value("vision/photoMoveCoil", 850).toInt();
|
||||
m_visionConfig.photoArrivedCoil = settings.value("vision/photoArrivedCoil", 851).toInt();
|
||||
m_visionConfig.comparisonPickCoil = settings.value("vision/comparisonPickCoil", 852).toInt();
|
||||
// PLC settings belong to modbus; retain vision keys for existing installations.
|
||||
m_visionConfig.photoPoseR = settings.value("modbus/photoPoseR", settings.value("vision/photoPoseR", 40)).toInt();
|
||||
m_visionConfig.graspPoseR = settings.value("modbus/graspPoseR", settings.value("vision/graspPoseR", 60)).toInt();
|
||||
m_visionConfig.lowWordFirst = settings.value("modbus/lowWordFirst", settings.value("vision/lowWordFirst", true)).toBool();
|
||||
m_visionConfig.photoMoveCoil = settings.value("modbus/photoMoveCoil", settings.value("vision/photoMoveCoil", 850)).toInt();
|
||||
m_visionConfig.photoMoveCoilFeedback = settings.value(
|
||||
"modbus/photoMoveCoilFeedback",
|
||||
settings.value("modbus/photoArrivedCoil",
|
||||
settings.value("vision/photoMoveCoilFeedback",
|
||||
settings.value("vision/photoArrivedCoil", 851)))).toInt();
|
||||
m_visionConfig.comparisonPickCoil = settings.value("modbus/comparisonPickCoil", settings.value("vision/comparisonPickCoil", 852)).toInt();
|
||||
settings.beginGroup("visionTrayMap");
|
||||
for (const QString &key : settings.childKeys()) {
|
||||
bool validKey = false;
|
||||
|
||||
Reference in New Issue
Block a user