修复隐藏功能缺陷、管控高压开启条件

DevOp.cpp

@@ -3324,9 +3324,7 @@ void DevOp::writeFpgaCalandar(bool Enable){
     fpgaWr(WRITE_COUNTER3_ADDR,(unsigned char *)&sysPara->para.Counter3,sizeof(sysPara->para.Counter3));
     sysPara->para.Counter4.cnt4CurrValue= QString::number(sysPara->para.cnt4CurrValue).toUInt(0,16); //计数器4当前值用于隐藏功能
 
-    #ifndef COUNTER2_BY_GROUP
+    fpgaWr(WRITE_COUNTER4_ADDR,(unsigned char *)&sysPara->para.Counter4, 4);
-    fpgaWr(WRITE_COUNTER4_ADDR,(unsigned char *)&sysPara->para.Counter4,sizeof(sysPara->para.Counter4));
-    #endif
 
     sysPara->status.cnt3CurrentValueInitDoneFlag = true;
     sysPara->status.cnt2CurrentValueInitDoneFlag = true;

InkJetPrinter.cpp

@@ -94,6 +94,18 @@ InkJetPrinter::InkJetPrinter(QWidget *parent) :
     connect(ui->tabSystemManage,SIGNAL(enableClick(bool)),this,SLOT(enableInkJetTabClick(bool)));
     connect(serialSTM32,SIGNAL(progress(int,int)),ui->tabSystemManage,SLOT(progressBarControl(int,int)));
 
+    connect(serialSTM32, &Serial::STM32Connected, this, [this](bool ok, QString errStr){
+        if(!ok || !sysPara || !sysPara->devOp) {
+            return;
+        }
+
+        QTimer::singleShot(1000, this, [this](){
+            sysPara->devOp->highVoltageCtrl(0);
+            LogInfo::setRunStatusText("High voltage forced off at app boot");
+        });
+        
+    }, Qt::QueuedConnection);
+
     connect(ui->tabSystemManage,SIGNAL(sigToCloseSerialFPGA()),this,SLOT(closeSerialFPGA()));
     connect(ui->tabSystemManage,SIGNAL(sigToCloseSerialSTM32()),this,SLOT(closeSerialSTM32()));
     connect(ui->tabSystemManage,SIGNAL(restartSerial()),this,SLOT(restartSerialPort()));
@@ -3401,6 +3413,17 @@ void InkJetPrinter::restartSerialPort(){
     connect(serialSTM32,SIGNAL(powerOffReady()),ui->tabMainWindow,SLOT(powerOffConfirmed()));
     connect(m_serialThreadSTM32,&QThread::started,serialSTM32,&Serial::startInitSlot);
     connect(serialSTM32,SIGNAL(queueSizeSTM32(int)),ui->tabMainWindow,SLOT(showSTM32queuesize(int)));
+    connect(serialSTM32, &Serial::STM32Connected, this, [this](bool ok, QString errStr){
+        if(!ok || !sysPara || !sysPara->devOp) {
+            return;
+        }
+
+        QTimer::singleShot(1000, this, [this](){
+            sysPara->devOp->highVoltageCtrl(0);
+            LogInfo::setRunStatusText("High voltage forced off at app boot");
+        });
+        
+    }, Qt::QueuedConnection);
 
     flagOfSerialThreadStratEn = true;
 }

TextEditOption.cpp

@@ -732,10 +732,6 @@ void TextEditOption::on_buttonInsertVari_pressed()
         unsigned char splitMode=sysPara->para.ExpirySplitMode;
         dialogInsertVari->getValue(&varType,&digitalNum,&splitMode);
 
-        if(sysPara->para.flagOfModuleDecimal || sysPara->para.flagOfModuleHide){
-            digitalNum += 1;
-        }
-
         // 对于24、16、12点WenQuanYi字体，需要调整高度。我也不知道为什么，但是不调整会导致字模与普通文字不对齐 byons@2026年5月16日
         // 日后如果替换了这些高度的字体，需要根据实际情况调整高度
         if((height == 25 || height == 17 || height == 13) && !ui->checkBoxBold->isChecked()) {
@@ -755,9 +751,6 @@ void TextEditOption::on_buttonInsertVari_pressed()
 
         unsigned char splitMode = sysPara->para.ExpirySplitMode;
         dialogInsertVari->getValue(&varType,&digitalNum,&splitMode);
-        if(sysPara->para.flagOfModuleDecimal || sysPara->para.flagOfModuleHide){
-            digitalNum += 1;
-        }
 
         fmt = textEdit->currentCharFormat();
 

mainwindow.cpp

@@ -436,14 +436,16 @@ void MainWindow::RefreshStatusLight(){//100ms
         static int reclainTankReachEnd = 0;
         if((!(sysPara->status.statWarn & WARN_STATUS_HDINT)) && (hdint == 0)) { //喷头盖由开变关
             if (sysPara->status.reclainTankReachEnd) {
-                sysPara->devOp->highVoltageCtrl(sysPara->para.HighVoltageAmplitude);
+                // sysPara->devOp->highVoltageCtrl(sysPara->para.HighVoltageAmplitude);
+                sysPara->devOp->highVoltageCtrl(0);
             }
         }
         hdint = !(sysPara->status.statWarn & WARN_STATUS_HDINT);
 
         if(sysPara->status.reclainTankReachEnd && reclainTankReachEnd == 0) { //开回收槽到底
             if (!(sysPara->status.statWarn & WARN_STATUS_HDINT)) { //喷头盖是关闭的状态
-                sysPara->devOp->highVoltageCtrl(sysPara->para.HighVoltageAmplitude);
+                // sysPara->devOp->highVoltageCtrl(sysPara->para.HighVoltageAmplitude);
+                sysPara->devOp->highVoltageCtrl(0);
             }
         }
         reclainTankReachEnd = sysPara->status.reclainTankReachEnd;