From 34148b0383c3ac1328356409d478c165f636236d Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 23 Oct 2020 10:00:47 +0200
Subject: [PATCH] fix
 https://github.com/RfidResearchGroup/proxmark3/issues/1029

---
 armsrc/iso15693.c    | 5 +++++
 client/src/cmdhf15.c | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/armsrc/iso15693.c b/armsrc/iso15693.c
index bacceb165..5861b3d17 100644
--- a/armsrc/iso15693.c
+++ b/armsrc/iso15693.c
@@ -1708,6 +1708,11 @@ void SimTagIso15693(uint8_t *uid) {
 
     bool exit_loop = false;
     while (exit_loop == false) {
+
+        button_pressed = BUTTON_PRESS();
+        if (button_pressed || data_available())
+            break;
+
         WDT_HIT();
 
         // find reader field
diff --git a/client/src/cmdhf15.c b/client/src/cmdhf15.c
index 6d276617c..0129dbaf5 100644
--- a/client/src/cmdhf15.c
+++ b/client/src/cmdhf15.c
@@ -1116,13 +1116,13 @@ static int CmdHF15Sim(const char *Cmd) {
     CLIGetHexWithReturn(ctx, 1, payload.uid, &uidlen);
     CLIParserFree(ctx);
 
-    if (uidlen != 9) {
+    if (uidlen != 8) {
         PrintAndLogEx(WARNING, "UID must include 16 HEX symbols");
         return PM3_EINVARG;
     }
 
     PrintAndLogEx(SUCCESS, "Starting simulating UID " _YELLOW_("%s"), iso15693_sprintUID(NULL, payload.uid));
-    PrintAndLogEx(INFO, "press " _YELLOW_("`enter`") " to cancel");
+    PrintAndLogEx(INFO, "press " _YELLOW_("`Pm3 button`") " to cancel");
 
     PacketResponseNG resp;
     clearCommandBuffer();