hlp/VX5_KRO_GearPump
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

重构RFID前

Browse Source
This commit is contained in:
byons
2026-05-08 14:51:35 +08:00
parent d7cdabb0f0
commit e40a72cd7c
13 changed files with 900 additions and 610 deletions
Download Patch File Download Diff File Expand all files Collapse all files
InkJetPrinter.cpp
+11 -7
View File
@@ -29,7 +29,7 @@ InkJetPrinter::InkJetPrinter(QWidget* parent)
init();
QThread::sleep(3);
qApp->installEventFilter(this);
// qApp->installEventFilter(this);
QString ARM_Version;
ARM_Version.sprintf("%d.%d.%02d%s%s", UP_PRINTER_MAJOR_VER, UP_PRINTER_MINOR_VER,UP_PRINTER_RIVISION_VER,SUB_VERSION,SUB_RFID);
@@ -980,10 +980,14 @@ void InkJetPrinter::timerHandler(void){
qDebug()<<"初始化刷卡模块";
flag6 = false;
sysPara->devOp->setICReaderModeFlag = true;
sysPara->devOp->setRFIDReaderWorkMode();
// 使用RFID读写器软件设置，而不是这里
// sysPara->devOp->setRFIDReaderWorkMode();
qDebug()<<"jd.addr: "<<m_MainInstruction->dlgInputAddr->jd.addr;
LogInfo::setRunStatusText(QString("jd.addr:%1").arg(m_MainInstruction->dlgInputAddr->jd.addr));
sysPara->devOp->setRFIDReaderKey(m_MainInstruction->dlgInputAddr->jd.addr,1);
// 使用RFID读写器软件设置，而不是这里
// sysPara->devOp->setRFIDReaderKey(m_MainInstruction->dlgInputAddr->jd.addr,1);
sysPara->devOp->setICReaderModeFlag = false;
}
if(pulse_300ms){
@@ -991,7 +995,7 @@ void InkJetPrinter::timerHandler(void){
{
sysPara->devOp->strRevdata ="";
sysPara->devOp->receiveReadRFID_data();
if(sysPara->devOp->strRevdata.length() > 1)
if(sysPara->devOp->strRevdata.length() > 3)
{
if((sysPara->devOp->strRevdata.left(3) == QString::number(m_MainInstruction->dlgInputAddr->jd.addr).left(3))\
|| sysPara->devOp->strRevdata.left(3) == "100")
@@ -1019,7 +1023,7 @@ void InkJetPrinter::timerHandler(void){
{
if(sysPara->para.rfidCountDown>0)
delayWithEventLoop(); //xx秒的倒计时
if(sysPara->devOp->comWriteRFID_data() == 1){//把卡数据清零
if(sysPara->devOp->RFIDmarkCardUsedAsync() == 1){//把卡数据清零
sysPara->RFIDPara.needInkCard = false;
sysPara->RFIDPara.inkCardTimeOut = false;
sysPara->saveRFIDPara();
@@ -1060,7 +1064,7 @@ void InkJetPrinter::timerHandler(void){
if(sysPara->para.rfidCountDown>0)
delayWithEventLoop();
//弹出一个xx秒的倒计时，再执行以下代码
if(sysPara->devOp->comWriteRFID_data() == 1){//把卡数据清零
if(sysPara->devOp->RFIDmarkCardUsedAsync() == 1){//把卡数据清零
sysPara->RFIDPara.needSolventCard = false;
sysPara->RFIDPara.solventCardTimeOut = false;
sysPara->saveRFIDPara();
@@ -1087,7 +1091,7 @@ void InkJetPrinter::timerHandler(void){
if(sysPara->para.rfidCountDown>0)
delayWithEventLoop(); //xx秒的倒计时
emit maintenanceShow();
if(sysPara->devOp->comWriteRFID_data() == 1)//把卡数据清零
if(sysPara->devOp->RFIDmarkCardUsedAsync() == 1)//把卡数据清零
{
sysPara->RFIDPara.needMaintenance = false;
sysPara->status.needMaintenanceRemind = false;