修改排气步骤,现在直接打开循环阀4秒就算排气了
This commit is contained in:
+23
-63
@@ -1139,7 +1139,6 @@ void MainWidget::airPushingProcess()
|
||||
{
|
||||
if(sysPara){
|
||||
if (sysPara->status.airPushing) {
|
||||
// 执行排气 7 秒
|
||||
|
||||
QString labelTxt = tr("正在排气...");
|
||||
setRunStatus(labelTxt);
|
||||
@@ -1147,73 +1146,34 @@ void MainWidget::airPushingProcess()
|
||||
setReclaimOpenBtnStatus(false);
|
||||
setReclaimCloseBtnStatus(false);
|
||||
|
||||
++sysPara->status.airPushingOnTime;
|
||||
if(sysPara->status.airPushingOnTime >= 50) {
|
||||
static int delayCount = 0;
|
||||
++delayCount;
|
||||
m_2sFlag = true;
|
||||
//sysPara->devOp->controlInkValve(false); //关供墨阀
|
||||
if(delayCount >= 40)
|
||||
{
|
||||
m_2sFlag = false;
|
||||
}
|
||||
//qDebug()<< "start airPushingProcess "<<sysPara->status.airPushingOnTime;
|
||||
// 执行排气 4 秒
|
||||
sysPara->status.airPushingOnTime += 100;
|
||||
|
||||
if(sysPara->para.airPushDurationSec <= 0 || sysPara->para.airPushDurationSec > 30) {
|
||||
sysPara->para.airPushDurationSec = 4;
|
||||
sysPara->saveParaToFile();
|
||||
}
|
||||
|
||||
if(delayCount >= 60)
|
||||
{
|
||||
delayCount = 0;
|
||||
airPushTimer->stop();
|
||||
sysPara->devOp->controlViscosityPump(false);
|
||||
reclaimTanOpen();
|
||||
//qDebug()<< "start stop";
|
||||
sysPara->status.airPushingDone = 1;
|
||||
sysPara->status.airPushing = 0;
|
||||
sysPara->status.airPushingOnTime = 0;
|
||||
}
|
||||
// 延迟 半秒后才开回收槽,正式结束排气阶段
|
||||
if(sysPara->status.airPushingOnTime >= sysPara->para.airPushDurationSec * 1000 + 500){
|
||||
//qDebug()<< "start stop";
|
||||
reclaimTanOpen();
|
||||
sysPara->status.airPushingDone = 1;
|
||||
sysPara->status.airPushing = 0;
|
||||
sysPara->status.airPushingOnTime = 0;
|
||||
airPushTimer->stop();
|
||||
return;
|
||||
}
|
||||
|
||||
if (sysPara->status.airPushingOnTime%10 >= 5) {
|
||||
sysPara->devOp->controlCycleValve(true);
|
||||
}
|
||||
else {
|
||||
if(sysPara->status.airPushingOnTime >= sysPara->para.airPushDurationSec * 1000){
|
||||
sysPara->devOp->controlViscosityPump(false);
|
||||
sysPara->devOp->controlCycleValve(false);
|
||||
}
|
||||
if (mainInkPumpCtrlStatus == 0) {
|
||||
if(++mainInkPumpCtrlCnt > 15) { //100ms 为单位, 时间到关闭
|
||||
sysPara->devOp->controlMainInkPump(false);
|
||||
sysPara->devOp->mainInkCtrl();
|
||||
mainInkPumpCtrlStatus = 1;
|
||||
mainInkPumpCtrlCnt = 0;
|
||||
}
|
||||
}
|
||||
else if (mainInkPumpCtrlStatus == 1) { //100ms 为单位, 时间到开启
|
||||
sysPara->devOp->controlMainInkPump(true);
|
||||
sysPara->devOp->mainInkCtrl();
|
||||
mainInkPumpCtrlStatus = 2;
|
||||
}
|
||||
else if (mainInkPumpCtrlStatus == 2) {
|
||||
if(++mainInkPumpCtrlCnt>7) {
|
||||
sysPara->devOp->controlMainInkPump(false);
|
||||
sysPara->devOp->mainInkCtrl();
|
||||
mainInkPumpCtrlStatus = 3;
|
||||
mainInkPumpCtrlCnt = 0;
|
||||
}
|
||||
}
|
||||
else if (mainInkPumpCtrlStatus == 3) {
|
||||
if(++mainInkPumpCtrlCnt>8) {
|
||||
sysPara->devOp->controlMainInkPump(true);
|
||||
sysPara->devOp->mainInkCtrl();
|
||||
mainInkPumpCtrlStatus = 4;
|
||||
mainInkPumpCtrlCnt = 0;
|
||||
}
|
||||
}
|
||||
else if (mainInkPumpCtrlStatus == 4) {
|
||||
if(++mainInkPumpCtrlCnt>8) {
|
||||
sysPara->devOp->controlMainInkPump(false);
|
||||
sysPara->devOp->mainInkCtrl();
|
||||
mainInkPumpCtrlStatus = 3;
|
||||
mainInkPumpCtrlCnt = 0;
|
||||
}
|
||||
|
||||
if(!sysPara->devOp->isReclaimPumpOpen())
|
||||
sysPara->devOp->controlReclaimPump(true, false);
|
||||
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user