添加自检粘度计测试、弃用状态机、修改电眼设置默认最小值
This commit is contained in:
+13
-7
@@ -951,8 +951,8 @@ void MainWidget::on_m_StartBtn_clicked()
|
||||
if (!checkTriggerMode()) return;
|
||||
|
||||
// 打印状态交给状态机修改
|
||||
// sysPara->status.isPrinting=false;
|
||||
auto mgr = PrinterStateManager::instance();
|
||||
sysPara->status.isPrinting=false;
|
||||
// auto mgr = PrinterStateManager::instance();
|
||||
#if !defined(FPGA_TEST) && !defined(QT_DEBUG)
|
||||
// if (mgr && mgr->canStopPrint()) {
|
||||
// mgr->requestTransition(PrinterEvent::StopPrint);
|
||||
@@ -970,6 +970,10 @@ void MainWidget::on_m_StartBtn_clicked()
|
||||
setReclaimOpenBtnStatus(false);
|
||||
|
||||
updatePrintDisplayLabel();
|
||||
|
||||
sysPara->devOp->highVoltageCtrl(1);
|
||||
sysPara->devOp->setHighVoltageAmplitudetoSTM32();
|
||||
|
||||
// 20170717 移动此,以观察条形码打印异常问题。
|
||||
if(!startPrintingFlag)
|
||||
{
|
||||
@@ -979,9 +983,11 @@ void MainWidget::on_m_StartBtn_clicked()
|
||||
|
||||
startPrintingFlag = true;
|
||||
// sysPara->status.isPrinting=true;
|
||||
if (mgr->canStartPrint() || mgr->isState(PrinterState::PRINTING)) {
|
||||
mgr->requestTransition(PrinterEvent::StartPrint);
|
||||
}
|
||||
// if (mgr->canStartPrint() || mgr->isState(PrinterState::PRINTING)) {
|
||||
// mgr->requestTransition(PrinterEvent::StartPrint);
|
||||
// }
|
||||
sysPara->status.isPrinting = true;
|
||||
sysPara->status.waitHightVolOff = 0;
|
||||
|
||||
// 高亮切换
|
||||
changeHighLight(true);
|
||||
@@ -994,8 +1000,8 @@ void MainWidget::on_m_StopBtn_clicked()
|
||||
if (!sysPara->status.reclainTankReachEnd && !SIMULATE_PRINTING_MODE) {
|
||||
return;
|
||||
}
|
||||
// sysPara->status.isPrinting=false;// 打印状态交给状态机修改
|
||||
auto mgr = PrinterStateManager::instance();
|
||||
sysPara->status.isPrinting=false;// 打印状态交给状态机修改
|
||||
// auto mgr = PrinterStateManager::instance();
|
||||
#if !defined(FPGA_TEST) && !defined(QT_DEBUG)
|
||||
// if (mgr && mgr->canStopPrint()) {
|
||||
// mgr->requestTransition(PrinterEvent::StopPrint);
|
||||
|
||||
Reference in New Issue
Block a user