临时关闭状态机、添加部分调试代码
This commit is contained in:
+11
-8
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user