From b6892aa01ec73482fe922dc36e5ff220b1b284d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Thing=20Andersen?= Date: Sun, 20 Oct 2013 19:31:19 +0200 Subject: [PATCH] keywords file updated --- changes.txt | 5 ++ keywords.txt | 173 ++++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 156 insertions(+), 22 deletions(-) diff --git a/changes.txt b/changes.txt index 9078998..cefa4a7 100644 --- a/changes.txt +++ b/changes.txt @@ -1,4 +1,9 @@ Renamed library from RFID to MFRC522 (RFID seemed to generic). Register names changed to comply with datasheet. Global defines moved into class. +All constants, functions and parameters are now commented in English. +Code refactored, most function names have changed. +Now supports ISO-14443-3 anti collission and 4/7/10 byte UIDs (cascade levels). +Added functions for MIFARE Classic Decrement/Increment/Restore/Transfer and MIFARE Ultralight Write. +New examples written. diff --git a/keywords.txt b/keywords.txt index a45bbe7..db9a80c 100644 --- a/keywords.txt +++ b/keywords.txt @@ -1,32 +1,161 @@ ####################################### -# Syntax Coloring Map RFID +# Syntax Coloring Map for library MFRC522 ####################################### ####################################### -# Datatypes (KEYWORD1) +# KEYWORD1 Classes, datatypes, and C++ keywords ####################################### - -rfid KEYWORD1 +MFRC522 KEYWORD1 +PCD_Register KEYWORD1 +PCD_Command KEYWORD1 +PICC_Command KEYWORD1 +MIFARE_Misc KEYWORD1 +PICC_Type KEYWORD1 +StatusCode KEYWORD +Uid KEYWORD +MIFARE_Key KEYWORD + +####################################### +# KEYWORD2 Methods and functions +####################################### +setSPIConfig KEYWORD2 +PCD_WriteRegister KEYWORD2 +PCD_WriteRegister KEYWORD2 +PCD_ReadRegister KEYWORD2 +PCD_ReadRegister KEYWORD2 +setBitMask KEYWORD2 +PCD_SetRegisterBitMask KEYWORD2 +PCD_ClearRegisterBitMask KEYWORD2 +PCD_CalculateCRC KEYWORD2 +PCD_Init KEYWORD2 +PCD_Reset KEYWORD2 +PCD_AntennaOn KEYWORD2 +PCD_TransceiveData KEYWORD2 +PCD_CommunicateWithPICC KEYWORD2 +PICC_RequestA KEYWORD2 +PICC_WakeupA KEYWORD2 +PICC_REQA_or_WUPA KEYWORD2 +PICC_Select KEYWORD2 +PICC_HaltA KEYWORD2 +PCD_Authenticate KEYWORD2 +PCD_StopCrypto1 KEYWORD2 +MIFARE_Read KEYWORD2 +MIFARE_Write KEYWORD2 +MIFARE_Increment KEYWORD2 +MIFARE_Ultralight_Write KEYWORD2 +PCD_MIFARE_Transceive KEYWORD2 +PICC_GetType KEYWORD2 +PICC_DumpToSerial KEYWORD2 +PICC_DumpMifareClassicToSerial KEYWORD2 +PICC_DumpMifareClassicSectorToSerial KEYWORD2 +PICC_DumpMifareUltralightToSerial KEYWORD2 +MIFARE_SetAccessBits KEYWORD2 +PICC_IsNewCardPresent KEYWORD2 +PICC_ReadCardSerial KEYWORD2 ####################################### -# Methods and Functions (KEYWORD2) +# KEYWORD3 setup and loop functions, as well as the Serial keywords ####################################### -init KEYWORD2 -reset KEYWORD2 -writeMFRC522 KEYWORD2 -antennaOn KEYWORD2 -readMFRC522 KEYWORD2 -setBitMask KEYWORD2 -clearBitMask KEYWORD2 -calculateCRC KEYWORD2 -MFRC522ToCard KEYWORD2 -MFRC522Anticoll KEYWORD2 -MFRC522Auth KEYWORD2 -MFRC522Read KEYWORD2 -MFRC522Write KEYWORD2 -MFRC522Halt KEYWORD2 - ####################################### -# Constants (LITERAL1) -####################################### \ No newline at end of file +LITERAL1 Constants +####################################### +CommandReg LITERAL1 +ComIEnReg LITERAL1 +DivIEnReg LITERAL1 +ComIrqReg LITERAL1 +DivIrqReg LITERAL1 +ErrorReg LITERAL1 +Status1Reg LITERAL1 +Status2Reg LITERAL1 +FIFODataReg LITERAL1 +FIFOLevelReg LITERAL1 +WaterLevelReg LITERAL1 +ControlReg LITERAL1 +BitFramingReg LITERAL1 +CollReg LITERAL1 +ModeReg LITERAL1 +TxModeReg LITERAL1 +RxModeReg LITERAL1 +TxControlReg LITERAL1 +TxASKReg LITERAL1 +TxSelReg LITERAL1 +RxSelReg LITERAL1 +RxThresholdReg LITERAL1 +DemodReg LITERAL1 +MfTxReg LITERAL1 +MfRxReg LITERAL1 +SerialSpeedReg LITERAL1 +CRCResultRegH LITERAL1 +CRCResultRegL LITERAL1 +ModWidthReg LITERAL1 +RFCfgReg LITERAL1 +GsNReg LITERAL1 +CWGsPReg LITERAL1 +ModGsPReg LITERAL1 +TModeReg LITERAL1 +TPrescalerReg LITERAL1 +TReloadRegH LITERAL1 +TReloadRegL LITERAL1 +TCounterValueRegH LITERAL1 +TCounterValueRegL LITERAL1 +TestSel1Reg LITERAL1 +TestSel2Reg LITERAL1 +TestPinEnReg LITERAL1 +TestPinValueReg LITERAL1 +TestBusReg LITERAL1 +AutoTestReg LITERAL1 +VersionReg LITERAL1 +AnalogTestReg LITERAL1 +TestDAC1Reg LITERAL1 +TestDAC2Reg LITERAL1 +TestADCReg LITERAL1 +PCD_Idle LITERAL1 +PCD_Mem LITERAL1 +PCD_GenerateRandomID LITERAL1 +PCD_CalcCRC LITERAL1 +PCD_Transmit LITERAL1 +PCD_NoCmdChange LITERAL1 +PCD_Receive LITERAL1 +PCD_Transceive LITERAL1 +PCD_MFAuthent LITERAL1 +PCD_SoftReset LITERAL1 +PICC_CMD_REQA LITERAL1 +PICC_CMD_WUPA LITERAL1 +PICC_CMD_CT LITERAL1 +PICC_CMD_SEL_CL1 LITERAL1 +PICC_CMD_SEL_CL2 LITERAL1 +PICC_CMD_SEL_CL3 LITERAL1 +PICC_CMD_HLTA LITERAL1 +PICC_CMD_MF_AUTH_KEY_A LITERAL1 +PICC_CMD_MF_AUTH_KEY_B LITERAL1 +PICC_CMD_MF_READ LITERAL1 +PICC_CMD_MF_WRITE LITERAL1 +PICC_CMD_MF_DECREMENT LITERAL1 +PICC_CMD_MF_INCREMENT LITERAL1 +PICC_CMD_MF_RESTORE LITERAL1 +PICC_CMD_MF_TRANSFER LITERAL1 +PICC_CMD_UL_WRITE LITERAL1 +MF_ACK LITERAL1 +MF_KEY_SIZE LITERAL1 +PICC_TYPE_UNKNOWN LITERAL1 +PICC_TYPE_ISO_14443_4 LITERAL1 +PICC_TYPE_ISO_18092 LITERAL1 +PICC_TYPE_MIFARE_MINI LITERAL1 +PICC_TYPE_MIFARE_1K LITERAL1 +PICC_TYPE_MIFARE_4K LITERAL1 +PICC_TYPE_MIFARE_UL LITERAL1 +PICC_TYPE_MIFARE_PLUS LITERAL1 +PICC_TYPE_TNP3XXX LITERAL1 +PICC_TYPE_NOT_COMPLETE LITERAL1 +STATUS_OK LITERAL1 +STATUS_ERROR LITERAL1 +STATUS_COLLISION LITERAL1 +STATUS_TIMEOUT LITERAL1 +STATUS_NO_ROOM LITERAL1 +STATUS_INTERNAL_ERROR LITERAL1 +STATUS_INVALID LITERAL1 +STATUS_CRC_WRONG LITERAL1 +STATUS_MIFARE_NACK LITERAL1 +FIFO_SIZE LITERAL1 +