rfidrig/ChameleonMini
0
0
Fork 0
mirror of https://github.com/RfidResearchGroup/ChameleonMini.git synced 2026-05-12 11:20:37 -07:00
Code Issues Packages Projects Releases Wiki Activity

reader application fixes: changed identify typo, fixed identify bugs, select function resets Selected variable if necessary

Browse Source
This commit is contained in:
Georg
2017-04-04 16:40:33 +02:00
parent b1e457ca01
commit 65e5383ce4
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Firmware/Chameleon-Mini/Application/Reader14443A.c
+9 -3
View File
@@ -225,7 +225,12 @@ INLINE uint16_t Reader14443A_Deselect(uint8_t* Buffer) // deselects the card bec
INLINE uint16_t Reader14443A_Select(uint8_t * Buffer, uint16_t BitCount)
{
if (Selected)
return 0;
{
if (ReaderState > STATE_HALT)
return 0;
else
Selected = false;
}
switch (ReaderState)
{
case STATE_IDLE:
@@ -540,7 +545,7 @@ uint16_t Reader14443AAppProcess(uint8_t* Buffer, uint16_t BitCount)
/************************************
* This function identifies a PICC. *
************************************/
case Reader14443_Indentify:
case Reader14443_Identify:
{
uint16_t rVal = Reader14443A_Select(Buffer, BitCount);
if (Selected)
@@ -548,6 +553,7 @@ uint16_t Reader14443AAppProcess(uint8_t* Buffer, uint16_t BitCount)
if (ReaderState >= STATE_SAK_CL1 && ReaderState <= STATE_SAK_CL3)
{
bool ISO14443_4A_compliant = IS_ISO14443A_4_COMPLIANT(Buffer);
CardCandidatesIdx = 0;
uint8_t i;
for (i = 0; i < ARRAY_COUNT(CardIdentificationList); i++)
@@ -652,7 +658,7 @@ uint16_t Reader14443AAppProcess(uint8_t* Buffer, uint16_t BitCount)
CardCandidatesIdx = 0;
return Reader14443A_Deselect(Buffer);
}
switch (Buffer[3])
switch (Buffer[5])
{
case 0x00:
CardCandidatesIdx = 1;
Firmware/Chameleon-Mini/Application/Reader14443A.h
+1 -1
View File
@@ -29,7 +29,7 @@ typedef enum {
Reader14443_Send_Raw,
Reader14443_Get_UID,
Reader14443_Read_MF_Ultralight,
Reader14443_Indentify
Reader14443_Identify
} Reader14443Command;
Firmware/Chameleon-Mini/Terminal/Commands.c
+1 -1
View File
@@ -548,7 +548,7 @@ CommandStatusIdType CommandExecIdentifyCard(char* OutMessage)
return COMMAND_ERR_INVALID_USAGE_ID;
ApplicationReset();
Reader14443CurrentCommand = Reader14443_Indentify;
Reader14443CurrentCommand = Reader14443_Identify;
Reader14443AAppInit();
Reader14443ACodecStart();
CommandLinePendingTaskTimeout = &Reader14443AAppTimeout;