diff --git a/InkJetPrinter.cpp b/InkJetPrinter.cpp index 3129a16..147dd72 100644 --- a/InkJetPrinter.cpp +++ b/InkJetPrinter.cpp @@ -275,9 +275,6 @@ void InkJetPrinter::init() connect(m_SystemManage,SIGNAL(upgradeSTM32(QString)),serialSTM32,SLOT(upgradeSTM32File(QString))); connect(serialSTM32,SIGNAL(progress(int,int)),m_SystemManage,SLOT(progressBarControl(int,int))); - /*系统更新*/ - connect(m_MainInstruction,&MainInstruction::sendButtonClickedSignal,this,&InkJetPrinter::getMainInstructWidgetButtonClickedSlot); - /*系统更新的信号和槽*/ connect(m_SystemUpdate,&SystemUpdate::sendProgramSTM32Signal,m_SystemManage,&SystemManage::on_pushButtonProgamSTM32_clicked); connect(m_SystemUpdate,&SystemUpdate::sendProgramFPGASignal,m_SystemManage,&SystemManage::on_pushButtonProgamFPGA_clicked); diff --git a/MainInstruction.cpp b/MainInstruction.cpp index 943f57f..c1abc9a 100644 --- a/MainInstruction.cpp +++ b/MainInstruction.cpp @@ -135,6 +135,14 @@ void MainInstruction::ondialogAuthorizationAccepted(){ sysPara->para.flagOfInkWarning = false; sysPara->para.flagOfSolventWarning = false; sysPara->status.needMaintenanceRemind = false; + sysPara->RFIDPara.inkCardTimeOut = false; + sysPara->RFIDPara.solventCardTimeOut = false; + sysPara->RFIDPara.needMaintenance = false; + QDate curDate = QDate::currentDate(); + int curdate = curDate.toString("yyMMdd").toInt(); + sysPara->RFIDPara.maintenanceDate = curdate; // 维护日期 + QDate mtEndDate = curDate.addMonths(sysPara->RFIDPara.maintenanceInterval); + sysPara->RFIDPara.maintenanceEndDate = mtEndDate.toString("yyMMdd").toInt(); // 维护结束日期 sysPara->para.inkWarnDate = 0; sysPara->para.inkWarnTime = 0; sysPara->para.solventWarnDate = 0; diff --git a/Printsetting.cpp b/Printsetting.cpp index ae914e6..03c2db5 100644 --- a/Printsetting.cpp +++ b/Printsetting.cpp @@ -574,10 +574,10 @@ void PrintSetting::on_eleEyeEdgetTriggerInner_clicked() }else m_model.triggerMode = PRINT_TRIGGER_SYNCHRONIZER; - setTriggerUI(m_model.triggerMode); - m_model.eleEyeTriggerSynPrintEn = false; on_checkEyeTriggerSynPrintEn_clicked(false); + + setTriggerUI(m_model.triggerMode); } void PrintSetting::setEnableEleEyeSetting(bool flag){ diff --git a/Printsetting.ui b/Printsetting.ui index 5de6939..2dd13fc 100644 --- a/Printsetting.ui +++ b/Printsetting.ui @@ -26,7 +26,7 @@ Qt::StrongFocus - 1 + 4 @@ -1381,6 +1381,9 @@ 开启墨点飞行补偿 + + true + @@ -1419,6 +1422,9 @@ 999999999 + + 224000 + @@ -1432,6 +1438,9 @@ 启用加减速预测 + + true + diff --git a/VerBVersion.h b/VerBVersion.h index 3abbb29..756b0ca 100644 --- a/VerBVersion.h +++ b/VerBVersion.h @@ -5,9 +5,9 @@ Major.Minor.Rivison.yyyy-MM-DD_Beta */ #define UP_PRINTER_MAJOR_VER 6 -#define UP_PRINTER_MINOR_VER 6 -#define UP_PRINTER_RIVISION_VER 3 -#define SUB_VERSION "_beta" +#define UP_PRINTER_MINOR_VER 7 +#define UP_PRINTER_RIVISION_VER 1 +#define SUB_VERSION "_KOR" #ifdef __RFID_OLD #define SUB_RFID "_RO" #else diff --git a/rfid/rfidmanager.cpp b/rfid/rfidmanager.cpp index e1f6c23..096a5c3 100644 --- a/rfid/rfidmanager.cpp +++ b/rfid/rfidmanager.cpp @@ -9,7 +9,7 @@ #include "runtimectrl.h" #include "SysPara.h" -//#define HLPDEBUG +#define HLPDEBUG RFIDManager::RFIDManager() @@ -123,8 +123,9 @@ void RFIDManager::comForRFID_init() #ifndef HLPDEBUG comForRFID->setPortName("/dev/ttyAS1"); #else - comForRFID->setPortName("/dev/ttyUSB0"); + // comForRFID->setPortName("/dev/ttyUSB0"); #endif + comForRFID->setPortName("/dev/ttyAS1"); comForRFID->setBaudRate(9600); comForRFID->setDataBits(QSerialPort::Data8); diff --git a/testprintwidget.cpp b/testprintwidget.cpp index 361c16d..1a4f179 100644 --- a/testprintwidget.cpp +++ b/testprintwidget.cpp @@ -99,7 +99,7 @@ TestPrintWidget::TestPrintWidget(QWidget* parent) connect(ui.btnSave, &QPushButton::clicked, [this]() { emit sendButtonClickedSignal(8); }); - connect(ui.btnListConfig, &QPushButton::clicked, [this]() { + connect(ui.btnListConfig, &QPushButton::clicked, [this]() { emit sendButtonClickedSignal(9); });