reader application fixes: changed identify typo, fixed identify bugs,…

… select function resets Selected variable if necessary
maxben14 · Apr 4, 2017 · 65e5383 · 65e5383
1 parent b1e457c
commit 65e5383
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/Firmware/Chameleon-Mini/Application/Reader14443A.c b/Firmware/Chameleon-Mini/Application/Reader14443A.c
@@ -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,14 +545,15 @@ 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)
 			{
 				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;

diff --git a/Firmware/Chameleon-Mini/Application/Reader14443A.h b/Firmware/Chameleon-Mini/Application/Reader14443A.h
@@ -29,7 +29,7 @@ typedef enum {
 	Reader14443_Send_Raw,
 	Reader14443_Get_UID,
 	Reader14443_Read_MF_Ultralight,
-	Reader14443_Indentify
+	Reader14443_Identify
 } Reader14443Command;
 
 

diff --git a/Firmware/Chameleon-Mini/Terminal/Commands.c b/Firmware/Chameleon-Mini/Terminal/Commands.c
@@ -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;