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:
@@ -151,6 +151,10 @@ QJsonObject VisionService::standardConvention()
|
||||
|
||||
bool VisionService::isReady() const { return m_ready && !m_session.isEmpty(); }
|
||||
bool VisionService::isBusy() const { return m_busy || !m_request.isEmpty() || !m_initializeId.isEmpty(); }
|
||||
bool VisionService::canInitialize() const
|
||||
{
|
||||
return !m_session.isEmpty() && !isBusy() && (!m_productionActive || m_maintenanceAllowed);
|
||||
}
|
||||
QString VisionService::sessionId() const { return m_session; }
|
||||
|
||||
void VisionService::connectService()
|
||||
@@ -166,7 +170,7 @@ void VisionService::connectService()
|
||||
|
||||
void VisionService::disconnectService()
|
||||
{
|
||||
if (m_productionActive) {
|
||||
if (m_productionActive && !m_maintenanceAllowed) {
|
||||
emit logMessage("请先停止生产,再断开视觉控制连接");
|
||||
return;
|
||||
}
|
||||
@@ -350,7 +354,7 @@ void VisionService::handleMessage(const QJsonObject &message)
|
||||
|
||||
void VisionService::initialize()
|
||||
{
|
||||
if (m_session.isEmpty() || isBusy() || m_productionActive) {
|
||||
if (!canInitialize()) {
|
||||
emit logMessage("初始化需要已连接、资源空闲且生产已停止");
|
||||
return;
|
||||
}
|
||||
@@ -375,7 +379,9 @@ void VisionService::requestMeasurement(QJsonObject request, bool diagnostic)
|
||||
const QJsonObject context = request.value("context").toObject();
|
||||
const double tray = context.value("tray_no").toDouble();
|
||||
if (id.isEmpty() || m_cancelledRequests.contains(id)) error = "请求编号为空或已取消";
|
||||
else if (!isReady() || isBusy()) error = "视觉未就绪或仍在处理上一任务";
|
||||
else if (m_session.isEmpty() || !m_request.isEmpty() || !m_initializeId.isEmpty()
|
||||
|| (m_busy && !m_backendInitializing)) error = "视觉未连接或仍在处理上一任务";
|
||||
else if (m_maintenanceAllowed) error = "视觉维护期间只允许初始化,请完成人工核对后再测量";
|
||||
else if (diagnostic == m_productionActive) error = "诊断与自动生产不可同时执行";
|
||||
else if (!diagnostic && request.value("server_session_id").toString() != m_session) error = "生产请求会话已失效";
|
||||
else if (!validPose(request.value("robot_pose"))) error = "拍照位姿须为6个有限数值";
|
||||
@@ -412,7 +418,7 @@ void VisionService::requestMeasurement(QJsonObject request, bool diagnostic)
|
||||
failConnection("发送视觉测量请求失败");
|
||||
return;
|
||||
}
|
||||
m_requestTimer->start(m_config.requestTimeoutMs);
|
||||
m_requestTimer->start(int(qMin<qint64>(2147483647, qint64(m_config.requestTimeoutMs) + 2LL * m_config.initializeTimeoutMs)));
|
||||
}
|
||||
|
||||
bool VisionService::validateResult(const QJsonObject &result, QString *error) const
|
||||
@@ -447,10 +453,11 @@ void VisionService::cancel(const QString &requestId)
|
||||
failMeasurement("CANCELLED", "本次视觉结果已取消,等待底层资源释放");
|
||||
}
|
||||
|
||||
void VisionService::setProductionActive(bool active)
|
||||
void VisionService::setProductionActive(bool active, bool maintenanceAllowed)
|
||||
{
|
||||
m_productionActive = active;
|
||||
if (!m_request.isEmpty() && ((active && m_diagnostic) || (!active && !m_diagnostic)))
|
||||
m_maintenanceAllowed = active && maintenanceAllowed;
|
||||
if (!m_request.isEmpty() && (m_maintenanceAllowed || (active && m_diagnostic) || (!active && !m_diagnostic)))
|
||||
cancel(m_request.value("request_id").toString());
|
||||
publishAvailability();
|
||||
}
|
||||
@@ -527,6 +534,7 @@ void VisionService::failConnection(const QString &message)
|
||||
|
||||
void VisionService::updateAvailability(const QJsonObject &message)
|
||||
{
|
||||
m_backendInitializing = message.value("initialization_in_progress").toBool();
|
||||
m_ready = message.value("ready").toBool();
|
||||
m_busy = message.value("resource_busy").toBool();
|
||||
emit statusChanged(message);
|
||||
|
||||
Reference in New Issue
Block a user