陆工修复回收泵模式切换后压力失控问题、添加逻辑在隔膜泵版本下禁用编辑回收泵勾选框

InkJetPrinter.cpp

@@ -1417,7 +1417,7 @@ void InkJetPrinter::timerHandler(void){
             test_flag = 0;
         }
         if(pulse_1s) {
-            if(sysPara->status.selfCheckDone && sysPara->para.gearPumpEnable && sysPara->para.flagOfReclaimPumEnable)
+            if(sysPara->status.selfCheckDone && sysPara->para.gearPumpEnable)
                 checkPressureControl();
             if((QTime::currentTime()>=QTime(00,00,00))&&(QTime::currentTime()<=QTime(00,00,02))&&sysPara->para.Reciclar){
                 if(ui->tabMainWindow->getCurrPrintStatus() != 1){
@@ -1680,6 +1680,13 @@ void InkJetPrinter::timerHandler(void){
                     gearPumpRunNormalFlag  = false;   // 泄漏保护重新学习
                     gearPumpRunNormalValue = 0.0f;
                     // 重置隔膜泵状态机，适应新模式
+                    u = 0.0f;
+                    pid.integral = 0.0f;
+                    pid.err_last = 0.0f;
+                    sysPara->para.gearPumpValue = 0;
+                    sysPara->devOp->WriteMoterPump();
+                    if(!sysPara->para.flagOfReclaimPumEnable)
+                        sysPara->devOp->controlReclaimPump(false, false);
                     m_pumpState = DPUMP_STOPPED;
                     m_stateChangeCount = 0;
                     m_adjSkip = 0;

PrintSetting.cpp

@@ -2233,7 +2233,7 @@ void PrintSetting::ModuleDecimalHideDisplay(const bool bEnabled)
 }
 
 void PrintSetting::specailMachineSetting(bool enable){
-    ui->checkBox_ReclaimPumpEnable->setEnabled(enable);
+    ui->checkBox_ReclaimPumpEnable->setEnabled(enable && PUMP_VER == QString("G"));
     ui->spinBox_gearPumpSpeedAlarm->setEnabled(enable);
 }
 

SysPara.cpp

@@ -23,6 +23,7 @@
 #include <unistd.h>
 #include<iostream>
 #include<string>
+#include "VerBVersion.h"
 
 #define VNLG
 SysPara::SysPara(void):
@@ -60,6 +61,10 @@ SysPara::SysPara(void):
 
     //para.HVFaultCloseEn= 1; //开机默认为1，允许高压故障自动关闭回收功能
 
+    // 隔膜泵版本强制开启回收泵模式
+     if(PUMP_VER == QString("D"))
+        para.flagOfReclaimPumEnable = true;
+
     devOp->writeFpgaPrintPara(true);	//系统起来的时候，将上次记录的配置写入fpga,比如晶振分频等信息
     devOp->writeFpgaVariCtrl();
     devOp->resumeFault();