feat: 重构视觉取料流程及生产故障恢复

- 删除订单启动、暂停、复位相关 PLC 握手及无效反馈配置
- 清除报警改为仅写 clearAlarmCommand,不等待反馈
- 将拍照位移动、视觉处理和 RackPick 拆分为三个独立动作
- 增加 M850/M851 拍照位动作及 R60/M852 视觉结果流程
- 暂停改为等待当前机器人动作完成,视觉结果不确定时转人工确认
- 删除复位按钮,合并为恢复/重试按钮
- 普通 PAUSED 订单通过启动按钮继续
- 恢复前检查 PLC、安全状态、订单及动作命令反馈
- 支持在途动作接管、已完成动作收尾、安全重试和人工确认
- 故障状态保持订单 RUNNING,并持久化实际恢复阶段
- 恢复成功后仅清除本次软件故障对应的报警
- 更新小轴 PLC 地址、Modbus 配置和视觉集成文档
This commit is contained in:
lidg
2026-10-29 17:20:14 +08:00
parent 31454722a0
commit 407af2892d
17 changed files with 839 additions and 929 deletions
-7
View File
@@ -16,14 +16,7 @@ bool isValidAddress(int address)
bool ModbusAddressMap::isValid(QString *error) const
{
const QList<QPair<QString, int> > coilAddresses = QList<QPair<QString, int> >()
<< qMakePair(QString("startCommand"), startCommand)
<< qMakePair(QString("pauseCommand"), pauseCommand)
<< qMakePair(QString("resetCommand"), resetCommand)
<< qMakePair(QString("clearAlarmCommand"), clearAlarmCommand)
<< qMakePair(QString("startFeedback"), startFeedback)
<< qMakePair(QString("pauseFeedback"), pauseFeedback)
<< qMakePair(QString("resetFeedback"), resetFeedback)
<< qMakePair(QString("clearAlarmFeedback"), clearAlarmFeedback)
<< qMakePair(QString("plcReady"), plcReady)
<< qMakePair(QString("robotReady"), robotReady)
<< qMakePair(QString("safetyDoorClosed"), safetyDoorClosed)
+17 -25
View File
@@ -5,16 +5,8 @@
struct ModbusAddressMap
{
int startCommand = 0;
int pauseCommand = 1;
int resetCommand = 2;
int clearAlarmCommand = 3;
int startFeedback = 10;
int pauseFeedback = 11;
int resetFeedback = 12;
int clearAlarmFeedback = 13;
int plcReady = 100;
int robotReady = 101;
int safetyDoorClosed = 102;
@@ -35,27 +27,27 @@ struct ModbusAddressMap
int checkResult = 201;
int errorCode = 202;
int rackPickCommand = 300;
int frontLoadCommand = 301;
int rackPickCommand = 800;
int frontLoadCommand = 803;
int inspectionCommand = 302;
int frontUnloadCommand = 303;
int flipCommand = 304;
int backLoadCommand = 305;
int backUnloadCommand = 306;
int rackPlaceCommand = 307;
int frontUnloadCommand = 802;
int flipCommand = 804;
int backLoadCommand = 806;
int backUnloadCommand = 805;
int rackPlaceCommand = 801;
int rackPickFeedback = 310;
int frontLoadFeedback = 311;
int rackPickFeedback = 807;
int frontLoadFeedback = 810;
int inspectionFeedback = 312;
int frontUnloadFeedback = 313;
int flipFeedback = 314;
int backLoadFeedback = 315;
int backUnloadFeedback = 316;
int rackPlaceFeedback = 317;
int frontUnloadFeedback = 809;
int flipFeedback = 811;
int backLoadFeedback = 813;
int backUnloadFeedback = 812;
int rackPlaceFeedback = 808;
int inspectionMode = 320;
int trayNumber = 400;
int slotNumber = 401;
int inspectionMode = 814;
int trayNumber = 802;
int slotNumber = 800;
bool isValid(QString *error = nullptr) const;
};