修复部分提示词、暂时规避开机就开高压的问题
This commit is contained in:
+13
-1
@@ -792,15 +792,18 @@ void InkJetPrinter::timerHandler(void){
|
||||
m_MainWidget->on_m_LeftBtn_clicked();
|
||||
test_flag = 0;
|
||||
}
|
||||
|
||||
if(pulse_1s) {
|
||||
if(sysPara->status.selfCheckDone && sysPara->para.gearPumpEnable && sysPara->para.flagOfReclaimPumEnable)
|
||||
checkPressureControl();
|
||||
|
||||
if((QTime::currentTime()>=QTime(00,00,00))&&(QTime::currentTime()<=QTime(00,00,02))&&sysPara->para.Reciclar){
|
||||
if(m_MainWidget->getCurrPrintStatus() != 1){
|
||||
m_MainWidget->_on_pushButtonPowerOff_pressed(false);
|
||||
LogInfo::setRunStatusText(tr("定时开机循环完成,准备关机"));
|
||||
}
|
||||
}
|
||||
|
||||
if(sysPara->status.selfCheckDone && sysPara->para.Reciclar && test_flag){
|
||||
reciclar_30s++;
|
||||
if(reciclar_30s > 30){
|
||||
@@ -811,6 +814,7 @@ void InkJetPrinter::timerHandler(void){
|
||||
else if(reciclar_30s){
|
||||
reciclar_30s = 0;
|
||||
}
|
||||
|
||||
QDate d = QDate::currentDate();
|
||||
|
||||
if(save_weeknum == 0)
|
||||
@@ -2118,6 +2122,14 @@ void InkJetPrinter::initSerialPorts()
|
||||
else{
|
||||
LogInfo::setRunStatusText("STM32 serial port connection failed: " + errorMsg);
|
||||
}
|
||||
|
||||
// 连接STM32成功一秒后关闭高压。鬼知道它为什么开机就高压
|
||||
QTimer::singleShot(1000, this, [this](){
|
||||
if(serialSTM32 && sysPara && sysPara->devOp){
|
||||
sysPara->devOp->highVoltageCtrl(0);
|
||||
LogInfo::setRunStatusText("Close high voltage ctrl");
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
flagOfSerialThreadStratEn = true;
|
||||
@@ -2541,7 +2553,7 @@ void InkJetPrinter::detectAndcontrolReclaimTank(){
|
||||
m_MainWidget->setRunStatus(tr("回收槽到头"));
|
||||
m_MainWidget->setReclaimStatus(true, 100);
|
||||
m_MainWidget->enablePrintButton(true); //仅仅在此时能使能打印按钮
|
||||
// sysPara->devOp->highVoltageCtrl(1);
|
||||
sysPara->devOp->highVoltageCtrl(0);
|
||||
|
||||
m_MainWidget->stopFlashReclaimOpenBtn();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user