hlp:修复隐藏功能m显示不全的问题,需要搭配等宽的小数点,空格,数字和字母m使用,修改版本号为GuiLin版本
This commit is contained in:
+4
-8
@@ -2046,20 +2046,15 @@ void MainWindow::enablePrintButton(bool enable){
|
||||
ui->pushButtonStopPrint->setEnabled(enable);
|
||||
}
|
||||
|
||||
static int mainInkPumpCtrlStatus = 0;
|
||||
static int mainInkPumpCtrlCnt = 0;
|
||||
//100ms 为单位
|
||||
void MainWindow::airPushingProcess()
|
||||
{
|
||||
if(sysPara){
|
||||
if (sysPara->status.airPushing) {
|
||||
|
||||
setRunStatus(tr("正在排气 ..............."));
|
||||
|
||||
//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();
|
||||
@@ -4590,8 +4585,9 @@ void MainWindow::UpdateUIVersion(){
|
||||
QString STM32Ver = QString("S:%1.%2.%3_B%4").arg((sysPara->status.stm32Verion>>16)&0x7F)
|
||||
.arg((sysPara->status.stm32Verion>>8) & 0xFF).arg(sysPara->status.stm32Verion&0xFF).arg(baudRateValue);
|
||||
|
||||
QString VernonBach = SUB_RFID;
|
||||
// VernonBach.sprintf("A%d.%d.%02d%s%s", UP_PRINTER_MAJOR_VER, UP_PRINTER_MINOR_VER,UP_PRINTER_RIVISION_VER,SUB_VERSION,SUB_RFID);
|
||||
QString VernonBach;
|
||||
VernonBach.sprintf("%s.%s.", MACHINAE_VER, PUMP_VER);
|
||||
VernonBach = VernonBach + (QString) Public::DateToString(__DATE__)+"_"+SUB_VER;
|
||||
|
||||
QString Mac = QString::number(sysPara->status.machineMac);
|
||||
LogInfo::showVerionInformation(Mac,VernonBach,fpgaVersion,STM32Ver,sysPara->status.flagOfPowerOnMode);
|
||||
|
||||
Reference in New Issue
Block a user