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

Merge branch 'main' of https://git.vernonbach.com/rd/VX5-DiaphragmPump-GeneralVersion

Browse Source
This commit is contained in:
byons
2026-08-28 17:39:07 +08:00
parent 7abac963e4 f7b7faab2e
commit a636ba3400
11 changed files with 112 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mainwindow.cpp
+8 -4
View File
@@ -840,7 +840,10 @@ void MainWindow::updateSysStatusToUI(){ //100ms
sysPara->devOp->readbuilDat();
}
firstGetFpgaVersionNumFlag=1;
ui->labelFpgaVersionNum->setText(QString("%1/F%2.%3.%4").arg(SOFTWARE_VER_NUM).arg(0).arg(0).arg(0) );
QString ARM_Version;
ARM_Version.sprintf("%s.%s.", MACHINAE_VER, PUMP_VER);
ARM_Version = ARM_Version + (QString) Public::DateToString(__DATE__)+"."+SUB_VER+SUB_RFID;
ui->labelFpgaVersionNum->setText(QString("%1/F%2.%3.%4").arg(ARM_Version).arg(0).arg(0).arg(0) );
}
else{
static bool logflag5 = true;
@@ -852,9 +855,10 @@ void MainWindow::updateSysStatusToUI(){ //100ms
emit readFPGAVersionReady();
logflag5 = false;
sysPara->devOp->writeFpgaPrintPara(true);
QString ARM_Version = SUB_RFID;
// ARM_Version.sprintf("%d.%d.%02d%s%s", UP_PRINTER_MAJOR_VER, UP_PRINTER_MINOR_VER,UP_PRINTER_RIVISION_VER,SUB_VERSION,SUB_RFID);
ui->labelFpgaVersionNum->setText(QString("A%1/F%2.%3.%4").arg(ARM_Version).arg(sysPara->status.fpgaVersionNum >> 12)
QString ARM_Version;
ARM_Version.sprintf("%s.%s.", MACHINAE_VER, PUMP_VER);
ARM_Version = ARM_Version + (QString) Public::DateToString(__DATE__)+"."+SUB_VER+SUB_RFID;
ui->labelFpgaVersionNum->setText(QString("%1/F%2.%3.%4").arg(ARM_Version).arg(sysPara->status.fpgaVersionNum >> 12)
.arg((sysPara->status.fpgaVersionNum>>8) & 0x0f).arg(sysPara->status.fpgaVersionNum&0xff) );
}
}