陆工修复回收泵模式切换后压力失控问题、添加逻辑在隔膜泵版本下禁用编辑回收泵勾选框
This commit is contained in:
+14
-7
@@ -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){
|
||||
@@ -1679,12 +1679,19 @@ void InkJetPrinter::timerHandler(void){
|
||||
m_lastReclaimMode = sysPara->para.flagOfReclaimPumEnable;
|
||||
gearPumpRunNormalFlag = false; // 泄漏保护重新学习
|
||||
gearPumpRunNormalValue = 0.0f;
|
||||
// 重置隔膜泵状态机,适应新模式
|
||||
m_pumpState = DPUMP_STOPPED;
|
||||
m_stateChangeCount = 0;
|
||||
m_adjSkip = 0;
|
||||
m_lastActualPressure = 0;
|
||||
m_bufValidCount = 0;
|
||||
// 重置隔膜泵状态机,适应新模式
|
||||
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;
|
||||
m_lastActualPressure = 0;
|
||||
m_bufValidCount = 0;
|
||||
for(int i = 0; i < 10; i++) m_pressureBuf[i] = 0;
|
||||
m_bufIdx = 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user