临时关闭状态机、添加部分调试代码

This commit is contained in:
2026-09-09 15:11:36 +08:00
parent 831fc0d639
commit dc2004506b
2 changed files with 19 additions and 8 deletions
+8
View File
@@ -2749,6 +2749,14 @@ void InkJetPrinter::detectAndcontrolReclaimTank(){
// 不知道为什么会有rate为0,且 sysPara->status.reclaimTankstatus == 2 ,也就是 关的状态。 回收槽位置在0处,而状态却是 关 ,很奇怪
if(sysPara->status.reclaimTankstatus != 2 && rate != 0) {
m_MainWidget->setReclaimStatus(sysPara->status.reclaimTankstatus == 1, rate);
#ifdef QT_DEBUG
if(rate == 100) {
m_MainWidget->enablePrintButton(true);
m_MainWidget->stopFlashReclaimOpenBtn();
sysPara->status.reclaimTankstatus = 5;
}
#endif
}
m_MainWidget->setReclaimOpenBtnStatus(sysPara->status.reclaimTankstatus == 2);
+11 -8
View File
@@ -954,9 +954,9 @@ void MainWidget::on_m_StartBtn_clicked()
// sysPara->status.isPrinting=false;
auto mgr = PrinterStateManager::instance();
#if !defined(FPGA_TEST) && !defined(QT_DEBUG)
if (mgr && mgr->canStopPrint()) {
mgr->requestTransition(PrinterEvent::StopPrint);
} else {return;}
// if (mgr && mgr->canStopPrint()) {
// mgr->requestTransition(PrinterEvent::StopPrint);
// } else {return;}
#endif
// SendPrintDataToFpga(0); // 0--正常打印,1--打印交替部分信息1; 2--打印交替部分信息2,
@@ -997,11 +997,11 @@ void MainWidget::on_m_StopBtn_clicked()
// sysPara->status.isPrinting=false;// 打印状态交给状态机修改
auto mgr = PrinterStateManager::instance();
#if !defined(FPGA_TEST) && !defined(QT_DEBUG)
if (mgr && mgr->canStopPrint()) {
mgr->requestTransition(PrinterEvent::StopPrint);
} else {
return;
}
// if (mgr && mgr->canStopPrint()) {
// mgr->requestTransition(PrinterEvent::StopPrint);
// } else {
// return;
// }
#endif
sysPara->devOp->printCtrl2(1);
@@ -1127,6 +1127,9 @@ void MainWidget::flashReclaimOpenBtn()
void MainWidget::stopFlashReclaimOpenBtn()
{
if(!m_reclaimOpenBtnFlashTimer->isActive())
return;
// 如果电机运行时间为0 就不暂停
if (sysPara == nullptr
||sysPara->status.curr_reclaimTankTime == 0