Merge pull request #2526 from douniwan5788/lfsearch_hangs

fix: `lf search` hangs
RfidResearchGroup · Sep 22, 2024 · 0476596 · 0476596
2 parents a3871cd + 0ef374e
commit 0476596
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/armsrc/hitag2.c b/armsrc/hitag2.c
@@ -1953,9 +1953,10 @@ void ReaderHitag(const lf_hitag_data_t *payload, bool ledcontrol) {
         memset(rx, 0x00, sizeof(rx));
         rxlen = 0;
 
-        // If there is no response, just repeat the loop
+        // If there is no response
         if (detected_tag_modulation == false) {
-            continue;
+            checked = -1;
+            goto out;
         }
 
         // Make sure we always have an even number of samples. This fixes the problem

diff --git a/client/src/cmdlf.c b/client/src/cmdlf.c
@@ -1569,7 +1569,7 @@ static bool check_chiptype(bool getDeviceData) {
 
     //check for em4x05/em4x69 chips first
     uint32_t word = 0;
-    if (em4x05_isblock0(&word)) {
+    if (IfPm3EM4x50() && em4x05_isblock0(&word)) {
         PrintAndLogEx(SUCCESS, "Chipset detection: " _GREEN_("EM4x05 / EM4x69"));
         PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`lf em 4x05`") " commands");
         retval = true;