CHG: some magic generation1 tags is not following protocol and answers to the "halt...

diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 0b75ebc3fb9543229463102b28bef0f4a81ad00f..e51ae18b9cc728d318fac9d147195c097930ba05 100644 (file)
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -1078,7 +1078,7 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
                        };\r
 \r
                        if(mifare_classic_halt(NULL, cuid)) {\r
                        };\r
 \r
                        if(mifare_classic_halt(NULL, cuid)) {\r

-                               if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
+                               if (MF_DBGLEVEL >= 4)   Dbprintf("INFO - Tag answered the 'Halt' command");\r

                                break;\r
                        };\r
                };      \r
                                break;\r
                        };\r
                };      \r


@@ -1114,7 +1114,7 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
        \r
                if (workFlags & 0x04) {\r
                        if (mifare_classic_halt(NULL, cuid)) {\r
        \r
                if (workFlags & 0x04) {\r
                        if (mifare_classic_halt(NULL, cuid)) {\r

-                               if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
+                               if (MF_DBGLEVEL >= 4)   Dbprintf("INFO - Tag answered the 'Halt' command");\r

                                break;\r
                        };\r
                }\r
                                break;\r
                        };\r
                }\r


@@ -1192,7 +1192,7 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
                \r
                if (workFlags & 0x04) {\r
                        if (mifare_classic_halt(NULL, cuid)) {\r
                \r
                if (workFlags & 0x04) {\r
                        if (mifare_classic_halt(NULL, cuid)) {\r

-                               if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
+                               if (MF_DBGLEVEL >= 4)   Dbprintf("INFO - Tag answered the 'Halt' command");\r

                                break;\r
                        };\r
                }\r
                                break;\r
                        };\r
                }\r


@@ -1239,9 +1239,8 @@ void MifareCIdent(){
                isOK = 0;\r
        };\r
 \r
                isOK = 0;\r
        };\r
 \r

-       if (mifare_classic_halt(NULL, 0)) {\r
-               isOK = 0;\r
-       };\r
+       // removed the if,  since some magic tags misbehavies and send an answer to it.\r
+       mifare_classic_halt(NULL, 0);\r

 \r
        cmd_send(CMD_ACK,isOK,0,0,0,0);\r
 }\r
 \r
        cmd_send(CMD_ACK,isOK,0,0,0,0);\r
 }\r