Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → /PIC Stuff/PIC_27J13/nfc_PN532.c @ 153

  → /PIC Stuff/PIC_27J13/nfc_PN532.c @ 154

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 153 → Rev 154

/PIC Stuff/PIC_27J13/nfc_PN532.c
31,7 → 31,7
nfc_data_p->packetbuffer[2] = 0x14; // Timeout 50ms * 20 = 1s
nfc_data_p->packetbuffer[3] = 0x01; // Use IRQ pin
if (!NFC_sendCommandCheckAck(nfc_data_p->packetbuffer, 4))
if (!NFC_Send_Command_Check_Ack(nfc_data_p->packetbuffer, 4))
return 0;
NFC_I2C_Read_Data(nfc_data_p->packetbuffer, 8);
40,13 → 40,13
}
// Checks the firmware version of the PN5xx chip
NFC_FIRMWARE_VERSION NFC_getFirmwareVersion(void) {
NFC_FIRMWARE_VERSION NFC_Get_Firmware_Version(void) {
NFC_FIRMWARE_VERSION response = {0, 0, 0, 0};
// Create and send command
nfc_data_p->packetbuffer[0] = PN532_COMMAND_GETFIRMWAREVERSION;
if (!NFC_sendCommandCheckAck(nfc_data_p->packetbuffer, 1))
if (!NFC_Send_Command_Check_Ack(nfc_data_p->packetbuffer, 1))
return response;
// Read back data from the PN532
66,7 → 66,7
}
// Sends a command and waits a specified period for the ACK
unsigned char NFC_sendCommandCheckAck(unsigned char *cmd, unsigned char cmdlen) {
unsigned char NFC_Send_Command_Check_Ack(unsigned char *cmd, unsigned char cmdlen) {
unsigned int timer = 0;
// Write the command
91,13 → 91,13
}
// Passive polling, waits for an ISO14443A target to enter the field
unsigned char NFC_readPassiveTargetID(NFC_TargetDataMiFare *cardData) {
unsigned char NFC_Read_Passive_Target_ID(NFC_TargetDataMiFare *cardData) {
nfc_data_p->packetbuffer[0] = PN532_COMMAND_INLISTPASSIVETARGET;
nfc_data_p->packetbuffer[1] = 2; // Max 2 cards at once
nfc_data_p->packetbuffer[2] = PN532_MIFARE_ISO14443A; // Mifare only
if (!NFC_sendCommandCheckAck(nfc_data_p->packetbuffer, 3))
if (!NFC_Send_Command_Check_Ack(nfc_data_p->packetbuffer, 3))
return 0;
// Wait for IRQ line
149,7 → 149,7
}
// Active polling, returns number of cards in the field
unsigned char NFC_pollTargets(unsigned char number, unsigned char period, NFC_TargetDataMiFare *cardData) {
unsigned char NFC_Poll_Targets(unsigned char number, unsigned char period, NFC_TargetDataMiFare *cardData) {
nfc_data_p->packetbuffer[0] = PN532_COMMAND_INAUTOPOLL;
nfc_data_p->packetbuffer[1] = number; // Number of polling
156,7 → 156,7
nfc_data_p->packetbuffer[2] = period; // Polling period in units of 150ms
nfc_data_p->packetbuffer[3] = 0x10; // Check for Mifare cards only
if (!NFC_sendCommandCheckAck(nfc_data_p->packetbuffer, 4))
if (!NFC_Send_Command_Check_Ack(nfc_data_p->packetbuffer, 4))
return 0;
// Wait for IRQ line
250,7 → 250,7
}
// Send frame and check for ACK
if (!NFC_sendCommandCheckAck(nfc_data_p->packetbuffer, 10 + uidLen))
if (!NFC_Send_Command_Check_Ack(nfc_data_p->packetbuffer, 10 + uidLen))
return 0;
// Read response from PN532
270,7 → 270,7
nfc_data_p->packetbuffer[3] = blockNumber; /* Block Number (0..63 for 1K, 0..255 for 4K) */
// Send frame and check for ACK
if (!NFC_sendCommandCheckAck(nfc_data_p->packetbuffer, 4))
if (!NFC_Send_Command_Check_Ack(nfc_data_p->packetbuffer, 4))
return 0;
// Read reponse
304,7 → 304,7
}
// Send frame and check for ACK
if (!NFC_sendCommandCheckAck(nfc_data_p->packetbuffer, 20))
if (!NFC_Send_Command_Check_Ack(nfc_data_p->packetbuffer, 20))
return 0;
// Read response