hlp/VX5_KRO_GearPump
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复因场景模式修改为绝对坐标引起的打印补全、蜂鸣器报警改为常响、添加相位故障关闭回收槽功能、取消翻转上下颠倒，与莱宾格行为同步、修改场景模式默认字体为7点、取消变量占位图设计

Browse Source
This commit is contained in:
byons
2026-08-28 16:42:19 +08:00
parent 9564bd107e
commit 665c0fd81a
25 changed files with 2396 additions and 2538 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DevOp.cpp
+16 -20
View File
@@ -2650,12 +2650,8 @@ int DevOp::writeFpgaPrintPara(bool ignoreWarn){
sysPara->para.maxHighVoltageDAC = expected_voltage_DAC + sysPara->para.highVoltageLevel;
}
if(sysPara->status.isPrinting==false){
sysPara->para.printTotalColNum = currPrintCol;
sysPara->status.printTotalColNum = currPrintCol;
}
else
sysPara->para.printTotalColNum = sysPara->status.printTotalColNum;
sysPara->para.printTotalColNum = currPrintCol;
sysPara->status.printTotalColNum = currPrintCol;
set_totalSynPulseNum(0);
@@ -3308,18 +3304,18 @@ void DevOp::writeFpgaVariCtrlv2()
}
memset((char *)&reg_var_print_ctrl,0,sizeof(reg_var_print_ctrl));
reg_var_print_ctrl.charColNum = std::max_element(std::begin(p_var->widthTable), std::end(p_var->widthTable));
reg_var_print_ctrl.charRamBaseAddr = p_var->bassAddr;
reg_var_print_ctrl.charRowNum = p_var->height;
reg_var_print_ctrl.horizonWidth = p_var->width; //字模的宽度
reg_var_print_ctrl.colOffset = p_var->startColPos+BLANK_COL_NUM;
reg_var_print_ctrl.verticalOffset = p_var->startRowPos;
reg_var_print_ctrl.varDigitalNum = p_var->digitalNum;
reg_var_print_ctrl.varTypeSel = Public::getType(p_var->type) %20;
reg_var_print_ctrl.enbVarWidthFont = 1;
reg_var_print_ctrl.alignLeft = 0;
reg_var_print_ctrl.charSpacing = p_var->letterSpace;
memcpy(dataOfreg_var_print_ctrl[i],(unsigned char *)&reg_var_print_ctrl,8);
reg_var_print_ctrl.charColNum = *std::max_element(std::begin(p_var->widthTable), std::end(p_var->widthTable)); // 5
reg_var_print_ctrl.charRamBaseAddr = p_var->bassAddr; // 0 Examples
reg_var_print_ctrl.charRowNum = p_var->height; // 7
reg_var_print_ctrl.horizonWidth = p_var->width; //字模的宽度 // 68
reg_var_print_ctrl.colOffset = p_var->startColPos+BLANK_COL_NUM; // 3
reg_var_print_ctrl.verticalOffset = p_var->startRowPos; // 0
reg_var_print_ctrl.varDigitalNum = p_var->digitalNum; // 8
reg_var_print_ctrl.varTypeSel = Public::getType(p_var->type) %20; // 7
reg_var_print_ctrl.enbVarWidthFont = 1;
reg_var_print_ctrl.alignLeft = 1;
reg_var_print_ctrl.charSpacing = p_var->letterSpace; // 4
memcpy(dataOfreg_var_print_ctrl[i],(unsigned char *)&reg_var_print_ctrl,9);
fpgaWr(VAR_CTRL_REG_ADDR,dataOfreg_var_print_ctrl[i], 9);
}
@@ -3449,7 +3445,7 @@ unsigned char dataOfmainInkCtrl[1];
void DevOp::mainInkCtrl()
{
dataOfmainInkCtrl[0]=(isReleaseValveOpen()?(1<<3):0)+(isMainInkPumpOpen()?(1<<2):0) + (sysPara->status.selfCheckDone?(1<<1):0) + (sysPara->status.isPumpValveControledByHand?1:0);
fpgaWr(MAININKCTRL_ADDR,dataOfmainInkCtrl,1);
// fpgaWr(MAININKCTRL_ADDR,dataOfmainInkCtrl,1);
}
void DevOp::pumpValveCtrl(int viscosityAdjustByTemp)//20140423 OK
@@ -3529,7 +3525,7 @@ void DevOp::pumpValveCtrl(int viscosityAdjustByTemp)//20140423 OK
| (sysPara->devOp->isInkValveOpen()?(1<<4):0)
| (sysPara->devOp->isMixValveOpen()?(1<<5):0);
fpgaWr(MAININKCTRL_ADDR,(unsigned char *)buf,i);// //20140423 5A,5B
// fpgaWr(MAININKCTRL_ADDR,(unsigned char *)buf,i);// //20140423 5A,5B
}
void DevOp::showData( QByteArray dat)