1042版本发行

InkJetPrinter.cpp

@@ -801,7 +801,7 @@ void InkJetPrinter::timerHandler(void){
             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("测试时间结束，准备关机"));
+                    LogInfo::setRunStatusText(tr("定时开机循环完成，准备关机"));
                 }
             }
             if(sysPara->status.selfCheckDone && sysPara->para.Reciclar  && test_flag){
@@ -871,6 +871,23 @@ void InkJetPrinter::timerHandler(void){
             if(sysPara->status.delay10s == 10){
                 pulse_100s = 1;
                 sysPara->status.delay10s = 0;
+                
+//                if(sysPara->status.flagOfPowerOnMode && (ui->tabMainWindow->getCurrPrintStatus() != 1))
+                if(sysPara->status.flagOfPowerOnMode)
+                {
+                    qDebug()<<"waitPowerOffTime: "<<sysPara->status.waitPowerOffTime;
+                    LogInfo::setRunStatusText(tr("waitPowerOffTime: %1").arg(sysPara->status.waitPowerOffTime));
+                    if(sysPara->status.waitPowerOffTime)
+                    {
+                        sysPara->status.waitPowerOffTime--;
+                        if(!sysPara->status.waitPowerOffTime)
+                        {
+                            m_MainWidget->_on_pushButtonPowerOff_pressed(false);
+                            LogInfo::setRunStatusText(tr("定时开机循环完成，准备关机"));
+                            m_MainWidget->setRunStatus(tr("准备关机"));
+                        }
+                    }
+                }
             }
         }
 
@@ -956,9 +973,7 @@ void InkJetPrinter::timerHandler(void){
             // byons: 变量类图元现在优化为局部更新，避免每次都要把整个打印内容发送给FPGA，现在只发送被更新的列区间 2026年7月16日
             auto updateAreas = m_MainWidget->variableItemsUpdate();
             if(sysPara->status.isPrinting && !updateAreas.isEmpty()){
-                for(const auto& area : updateAreas) {
-                    m_MainWidget->SendPrintDataToFpga(0, area.left(), area.width());
-                }
+                m_MainWidget->SendPrintDataToFpga(0, true);
             }
 
             if (!updateAreas.isEmpty() && m_StackedWidget->currentWidget() == m_MainWidget) {
@@ -1804,6 +1819,7 @@ void InkJetPrinter::saveFPGAStatus(unsigned char *data){
     if(sysPara->status.dummy != sysPara->status.isPrinting && sysPara->status.selfCheckDone){
         sysPara->status.isPrinting = sysPara->status.dummy;
         m_MainWidget->updatePrintDisplayLabel();
+        emit printStatusChanged(sysPara->status.isPrinting);
     }
 }
 
@@ -1915,19 +1931,23 @@ void InkJetPrinter::savePulseCntVal(unsigned char *data){
     }
 }
 
-void InkJetPrinter::saveSTM32Version(unsigned char *data){
+void InkJetPrinter::saveSTM32Version(unsigned char *data)
+{
     qDebug()<<"saveSTM32Version";
     static unsigned char STM32Verion[3] = {0}; //时间间隔内的脉冲累计数
     unsigned char *target= ((unsigned char *)&sysPara->status.stm32Verion);
     for(int i=0;i<data[3];i++){
         target[i]=data[4+i];
     }
-
-    QString STM32Ver = QString("%1.%2.%3").arg((sysPara->status.stm32Verion>>16)&0xFF)
+    sysPara->status.flagOfPowerOnMode = (sysPara->status.stm32Verion>>23) & 0x01;
+    if(sysPara->status.flagOfPowerOnMode)
+        sysPara->status.waitPowerOffTime = 18;//半个小时
+    else
+        sysPara->status.waitPowerOffTime = 0;
+    LogInfo::setRunStatusText(tr("flagOfPowerOnMode: %1").arg(sysPara->status.flagOfPowerOnMode));
+    QString STM32Ver = QString("%1.%2.%3").arg((sysPara->status.stm32Verion>>16)&0x7F)
             .arg((sysPara->status.stm32Verion>>8) & 0xFF).arg(sysPara->status.stm32Verion&0xFF);
     qDebug()<<"STM32Ver:"<<STM32Ver;
-
-    LogInfo::setRunStatusText(QString("STM32Ver: %1").arg(STM32Ver));
 }
 
 void InkJetPrinter::saveSTM32Time(unsigned char *data){
@@ -2659,6 +2679,15 @@ bool InkJetPrinter::loadLastWorkAndPreparePrint()
     return loadWorkFileAndPreparePrint(lastFilename);
 }
 
+void InkJetPrinter::restartPrintWhenSwitchedWorkFile(bool isPrinting)
+{
+    if(!isPrinting) {
+        m_MainWidget->on_m_StartBtn_clicked();
+        auto ret = disconnect(this, &InkJetPrinter::printStatusChanged, this, &InkJetPrinter::restartPrintWhenSwitchedWorkFile);
+        LogInfo::setRunStatusText(QString("Printing has restarted: %1").arg(ret));
+    }
+}
+
 bool InkJetPrinter::loadWorkFileAndPreparePrint(const QString &filename)
 {
     auto u8Filename = filename.toUtf8();
@@ -2678,7 +2707,10 @@ bool InkJetPrinter::loadWorkFileAndPreparePrint(const QString &filename)
 
     bool rePrint = false;
     if(sysPara->status.isPrinting && sysPara->status.selfCheckDone) {
+        // connect(this, &InkJetPrinter::printStatusChanged, 
+        //         this, &InkJetPrinter::restartPrintWhenSwitchedWorkFile, Qt::ConnectionType(Qt::DirectConnection | Qt::UniqueConnection));
         m_MainWidget->on_m_StopBtn_clicked();
+        LogInfo::setRunStatusText("Pause printing first, then write to the new file");
         rePrint = true;
     }
 
@@ -2713,7 +2745,6 @@ bool InkJetPrinter::loadWorkFileAndPreparePrint(const QString &filename)
     return true;
 }
 
-
 static int highPressureCnt = 0;
 static unsigned int logCnt = 0;
 
@@ -3226,4 +3257,4 @@ void InkJetPrinter::onDlgFileOpen(const QString& filename)
     }
 
     loadWorkFileAndPreparePrint(filename);
-}
+}