hlp:分段计米部分bug修复,按需求不需要超级密码就可以使用分段计米
This commit is contained in:
+8
-4
@@ -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) );
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user