feat(vision): 新增拍照到位前置流程并支持视觉失败降级取料
- 在普通 RackPick 前写托盘号、格位并置 M850,收到 M851 后清除两位 - 使用 vision/enabled 控制识别,关闭时仍执行拍照到位流程 - 识别成功且 R60 写入确认后写 M852=1,视觉关闭或失败时写 M852=0 - 确认 M852 写入后启动 RackPick,动作结束保留 M852 - 移除旧 850–854 五信号握手,更新配置和协议文档 - 允许未就绪的视觉服务接收测量,扩展超时以覆盖初始化重试 - 保留 PLC 写入失败阻断、暂停发送门控及迟到结果拒绝 - 持久化未完成事务,支持 PLC 暂停后的视觉维护与人工恢复 验证:MinGW 32/64 位编译通过;生产流程47、IPC14、PLC11项测试通过
This commit is contained in:
@@ -9,12 +9,11 @@
|
||||
bool VisionConfig::isValid(QString *error) const
|
||||
{
|
||||
QStringList errors;
|
||||
if (!enabled || !contractConfirmed || !photoPoseReadyConfirmed) {
|
||||
errors.append("Vision PLC contract is disabled or not confirmed");
|
||||
if (!contractConfirmed || !photoPoseReadyConfirmed) {
|
||||
errors.append("Photo-position PLC contract is not confirmed");
|
||||
}
|
||||
if (ipcName.trimmed().isEmpty() || startupTimeoutMs <= 0
|
||||
|| initializeTimeoutMs <= 0 || requestTimeoutMs <= 5000
|
||||
|| robotAckTimeoutMs <= 0) {
|
||||
|| initializeTimeoutMs <= 0 || requestTimeoutMs <= 5000) {
|
||||
errors.append("Vision IPC name or timeouts are invalid");
|
||||
}
|
||||
if (photoPoseR < 0 || photoPoseR > 32756 || photoPoseR % 2
|
||||
@@ -22,8 +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[] = {robotReceivedCoil, photoRequestCoil, comparingCoil,
|
||||
comparisonErrorCoil, comparisonPassedCoil};
|
||||
const int coils[] = {photoMoveCoil, photoArrivedCoil, comparisonPickCoil};
|
||||
QSet<int> unique;
|
||||
for (int coil : coils) {
|
||||
if (coil < 0 || coil > 65535 || unique.contains(coil)) {
|
||||
@@ -32,24 +30,6 @@ bool VisionConfig::isValid(QString *error) const
|
||||
}
|
||||
unique.insert(coil);
|
||||
}
|
||||
const QSet<QString> outputs = {"comparing", "comparisonError", "comparisonPassed"};
|
||||
const QSet<QString> configured(writableSignals.begin(), writableSignals.end());
|
||||
if (handshakeProtocol != "request_compare_result_ack_v1" || configured != outputs
|
||||
|| writableSignals.size() != outputs.size()) {
|
||||
errors.append("Vision handshake ownership and protocol are not confirmed");
|
||||
}
|
||||
const QStringList knownActions = {"RackPick", "FrontUnload", "BackUnload"};
|
||||
if (actionNames.isEmpty()) {
|
||||
errors.append("Vision production actions are not configured");
|
||||
}
|
||||
for (const QString &action : actionNames) {
|
||||
if (!knownActions.contains(action)) {
|
||||
errors.append("Vision action must be a confirmed pickup action: " + action);
|
||||
}
|
||||
}
|
||||
if (trayMap.isEmpty()) {
|
||||
errors.append("Vision tray mapping is not configured");
|
||||
}
|
||||
for (auto it = trayMap.constBegin(); it != trayMap.constEnd(); ++it) {
|
||||
if (it.key() < 1 || it.value() < 1 || it.value() > 99) {
|
||||
errors.append("Vision tray mapping is invalid");
|
||||
@@ -220,20 +200,12 @@ 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.robotAckTimeoutMs = settings.value("vision/robotAckTimeoutMs", m_visionConfig.robotAckTimeoutMs).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.robotReceivedCoil = settings.value("vision/robotReceivedCoil", -1).toInt();
|
||||
m_visionConfig.photoRequestCoil = settings.value("vision/photoRequestCoil", -1).toInt();
|
||||
m_visionConfig.comparingCoil = settings.value("vision/comparingCoil", -1).toInt();
|
||||
m_visionConfig.comparisonErrorCoil = settings.value("vision/comparisonErrorCoil", -1).toInt();
|
||||
m_visionConfig.comparisonPassedCoil = settings.value("vision/comparisonPassedCoil", -1).toInt();
|
||||
m_visionConfig.handshakeProtocol = settings.value("vision/handshakeProtocol").toString();
|
||||
m_visionConfig.writableSignals = settings.value("vision/writableSignals").toStringList();
|
||||
m_visionConfig.actionNames = settings.value("vision/actionNames").toStringList();
|
||||
m_visionConfig.writableSignals.removeAll(QString());
|
||||
m_visionConfig.actionNames.removeAll(QString());
|
||||
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();
|
||||
settings.beginGroup("visionTrayMap");
|
||||
for (const QString &key : settings.childKeys()) {
|
||||
bool validKey = false;
|
||||
|
||||
Reference in New Issue
Block a user