2026年6月4日 commit

DevOp.h

@@ -218,29 +218,6 @@ public :
     bool stopSendDataFPGA;
     bool stopSendDataSTM32;
 
-#ifdef __RFID_CARD
-    QSerialPort *comForRFID;
-    void comForRFID_init();
-    int comReadRFID_data();
-//    int comWriteRFID_data(int type);
-
-    /**
-     * @brief 向卡片写入当前日期时间，标识该卡片已被使用
-     */
-    int RFIDmarkCardUsedAsync(int type = 0);
-    int setRFIDCarKey(void);
-    int setRFIDReaderKey(int,int);
-    int setRFIDReaderOriginalKey(void);
-    int setRFIDReaderWorkMode(void);
-    int receiveReadRFID_data(void);
-    int queryReadRFID_address(void);
-    QString strRevdata;
-    QByteArray RFIDReadData;
-    bool noticeICReaderError;
-    bool setICReaderModeFlag;
-    uint checkCardIntervalTime;
-    QReadWriteLock CardDataRwLock;
-#endif
     void Read_RanddomFromFpga();  // 读FPGARANDFIFO
     void RandTxtBakup(char ok);
     void showData(QByteArray dat);
@@ -249,28 +226,20 @@ public :
 
 public slots:
 
-    // unused
     void resendFPGADate(int,int,unsigned char *,int,int);
 
-    // unused
     void resendSTM32Date(int,int,unsigned char *,int,int);
-#ifdef __RFID_CARD
-    void readRFIDData();
-#endif
 
 signals:
 
-    // unused
     void dataReceived(char,const QByteArray &dataReceived,int);
     /***cmd:1--读 2--写*********************************************/
     /***addr:地址***************************************************/
     /***dat:数据指针*************************************************/
     /***len:数据长度*************************************************/
     /***dat:1--FPGA  2--STM32***************************************/
-    // unused
     void sendSerialDataToSTM32(int cmd,int addr,unsigned char *dat,int len,int type);
 
-    // unused
     void sendSerialDataToFPGA(int cmd,int addr,unsigned char *dat,int len,int type);