2026年6月22日 :大量更新

InkJetPrinter.cpp

@@ -19,9 +19,6 @@ static unsigned int PulseCnt = 0; //时间间隔内的脉冲累计数
 InkJetPrinter::InkJetPrinter(QWidget* parent)
     : QWidget(parent)
 {
-    if (sysPara == nullptr) {
-        sysPara = SysPara::ins();
-    }
     // 加载.ui文件生成的UI界面
     ui.setupUi(this);
 
@@ -158,6 +155,22 @@ void InkJetPrinter::init()
         m_LogInfo->checkState();
     });
 
+    SysPara *para = new SysPara();
+    sysPara = para;
+    m_MainWidget->bindSysPara(para);
+    m_FontSetWidget->bindSysPara(para);
+    m_PrintSetting->bindSysPara(para);
+    m_SystemManage->bindSysPara(para);
+    m_SystemSetting->bindSysPara(para);
+    m_OtherInfo->bindSysPara(para);
+    m_TestPrintWidget->bindSysPara(para);
+    m_DateVarSet->bindSysPara(para);
+    m_CounterVarSet->bindSysPara(para);
+    m_MainInstruction->bindSysPara(para);
+    m_BarCodeDlg->bindSysPara(para);
+    m_QRCodeDlg->bindSysPara(para);
+    m_LogInfo->bindSysPara(para);
+
     if(sysPara->para.gearPumpEnable)
         pushButtonStartFlag = true;
 
@@ -283,6 +296,7 @@ void InkJetPrinter::init()
 void InkJetPrinter::slt_editCounter(CounterViewModel vm)
 {
     if (m_CounterVarSet) {
+        m_CounterVarSet->updateSysParaToUI();
         m_CounterVarSet->setCounterConfig(vm);
         m_StackedWidget->setCurrentWidget(m_CounterVarSet);
     }
@@ -699,20 +713,16 @@ void InkJetPrinter::timerHandler(void){
         }
 
         if(pulse_1s && flagOfSerialThreadStratEn){
+            #ifdef ARCH_AARCH64
             if (!m_serialThreadFPGA->isRunning()) {
                 qDebug()<<"start FPGA tread";
-#ifdef ARCH_AARCH64
                 m_serialThreadFPGA->start();
-                LogInfo::setRunStatusText(tr("FPGA tread start"));
-#endif
             }
             if (!m_serialThreadSTM32->isRunning()){
                 qDebug()<<"start STM32 tread";
-#ifdef ARCH_AARCH64
                 m_serialThreadSTM32->start();
-                LogInfo::setRunStatusText(tr("STM32 tread start"));
-#endif
-            }
+            }   
+            #endif
             flagOfSerialThreadStratEn = false;
         }
 
@@ -815,7 +825,7 @@ void InkJetPrinter::timerHandler(void){
                 // }
 
                 if(sysPara->status.isPrinting) {
-                    m_MainWidget->SendPrintDataToFpga(0);
+                    m_MainWidget->SendPrintDataToFpga(0, true);
                 }
 
                 if(m_StackedWidget->currentWidget() == m_MainWidget) {
@@ -873,6 +883,12 @@ void InkJetPrinter::timerHandler(void){
                         sysPara->devOp->mainInkCtrl();
                         sysPara->status.canRunAirPushing = true;
 
+                        // 自检结束发送打印设置
+                        qInfo() << "Self check done and send print para to FPGA";
+                        sysPara->devOp->setHighVoltageAmplitudetoSTM32();
+                        sysPara->devOp->writeFpgaCalandar(0);
+                        sysPara->devOp->writeFpgaPrintPara();
+
                         if(sysPara->para.Reciclar)
                             test_flag = 1;
                     }
@@ -945,7 +961,7 @@ void InkJetPrinter::timerHandler(void){
             LogInfo::setRunStatusText(QString("jd.addr:%1").arg(addr));
             flag6 = false;
             if (manager_rfid)
-                manager_rfid->initRFIDMoudle(addr);
+                manager_rfid->initRFIDMoudle(addr, sysPara);
         }
 
         if(pulse_300ms){
@@ -1360,6 +1376,7 @@ void InkJetPrinter::getTestPrintWidgetButtonClickedSlot(int index)
 
     case 9:
     {
+        m_PrintSetting->updateSysParaToUI();
         m_StackedWidget->setCurrentWidget(m_PrintSetting);
         break;
     }
@@ -1862,7 +1879,11 @@ void InkJetPrinter::closeSerialFPGA(){
 }
 
 void InkJetPrinter::closeSerialSTM32(){
+    
     if(m_serialThreadSTM32->isRunning()){
+
+        LogInfo::setRunStatusText("Closing STM32 serial port and exit thread...");
+
         m_serialThreadSTM32->requestInterruption();
         m_serialThreadSTM32->quit();
         m_serialThreadSTM32->wait();
@@ -2327,7 +2348,7 @@ void InkJetPrinter::detectAndcontrolReclaimTank(){
         if(sysPara->devOp->isReclaimTankOpenEnable())
             sysPara->devOp->controlReclaimTankOpen(false);		//到头，关闭
         sysPara->status.reclainTankReachEnd = true;
-//        m_MainWidget->setRunStatus(tr("回收槽到头"));
+        m_MainWidget->setRunStatus(tr("回收槽到头"));
         m_MainWidget->setReclaimStatus(true, 100);
         m_MainWidget->enablePrintButton(true);			//仅仅在此时能使能打印按钮  
         sysPara->devOp->highVoltageCtrl(1);
@@ -2750,7 +2771,6 @@ void InkJetPrinter::initRFIDManager()
                 this, &InkJetPrinter::slt_showMsg);
         connect(manager_rfid,SIGNAL(sig_maintenanceShow()),
                 m_MainInstruction,SLOT(maintenanceDialogShow()));
-
     }
 }
 #endif