hlp/VX5-DiaphragmPump
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hlp:修改版本号规则

Browse Source
This commit is contained in:
kite_lucs
2026-08-27 09:10:41 +08:00
parent cbeb5f0e0a
commit ee7792077d
12 changed files with 664 additions and 633 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DevOp.cpp
+25 -16
View File
@@ -2700,23 +2700,30 @@ int DevOp::writeFpgaPrintPara(bool ignoreWarn){
QMessageBox::critical(NULL,tr("错误"),tr("在同步计米的情况下无打印串或显示区域为零"));
}
else {
if(currPrintCol && type == 2){
int synNumPerCol = displayAreaTotalSynNum*(1<<8)/(currPrintCol*(1 + sysPara->para.charBold));
//加宽的时候，相当于列数翻倍
if(displayAreaTotalSynNum >= (1<<24)){
if(!ignoreWarn)
QMessageBox::critical(NULL,tr("错误"),tr("在同步计米的情况下喷印同步脉冲数过多，请检查你的配置"));
}
if(synNumPerCol >= (1<< 16)){
if(!ignoreWarn)
QMessageBox::critical(NULL,tr("警告"),tr("喷印字符串太短，请增加字符串长度或在打印设置中减少喷印长度"));
}
if(synNumPerCol < 5){
if(!ignoreWarn)
QMessageBox::critical(NULL,tr("警告"),tr("喷印长度太短，请减少字符串长度或在打印设置中增加喷印长度"));
}
sysPara->para.synNumPerCol = synNumPerCol;
// if(currPrintCol && type == 2){
// int synNumPerCol = displayAreaTotalSynNum*(1<<8)/(currPrintCol*(1 + sysPara->para.charBold));
// //加宽的时候，相当于列数翻倍
// if(displayAreaTotalSynNum >= (1<<24)){
// if(!ignoreWarn)
// QMessageBox::critical(NULL,tr("错误"),tr("在同步计米的情况下喷印同步脉冲数过多，请检查你的配置"));
// }
// if(synNumPerCol >= (1<< 16)){
// if(!ignoreWarn)
// QMessageBox::critical(NULL,tr("警告"),tr("喷印字符串太短，请增加字符串长度或在打印设置中减少喷印长度"));
// }
// if(synNumPerCol < 5){
// if(!ignoreWarn)
// QMessageBox::critical(NULL,tr("警告"),tr("喷印长度太短，请减少字符串长度或在打印设置中增加喷印长度"));
// }
// sysPara->para.synNumPerCol = synNumPerCol;
// sysPara->para.synNumPerCol = sysPara->para.printColDelay << 8;
// }/
if(currPrintCol){
sysPara->para.synNumPerCol = sysPara->para.printColDelay << 8;
}
if(sysPara->para.synPulseNumPerMm<1 || sysPara->para.synPulseNumPerMm>50) {
}
sysPara->para.synPulsePerMmX8 = (unsigned short)((unsigned int)sysPara->para.synPulseNumPerMm <<8);
@@ -3377,6 +3384,8 @@ void DevOp::printCtrl2(int cmd){
}
unsigned int DevOp::readFpgaVersionNum(){
if (sysPara == NULL) return 0;
fpgaRd(0x00EC,&sysPara->status.FPGAChipType,1);
fpgaRd(0x00FE,(unsigned char *)&sysPara->status.fpgaVersionNum,2);
fpgaRd(READ_BUILD_DAT, (unsigned char *)&sysPara->status.build_dat.builTime, sizeof(sysPara->status.build_dat.builTime));