From: marshmellow42 <marshmellowrf@gmail.com>
Date: Mon, 6 Aug 2018 11:27:37 +0000 (-0400)
Subject: Separate WITH_LF and WITH_LF_StandAlone
X-Git-Tag: v3.1.0~34
X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/a2937cea8db9a2ef51becff18d3b0227b837b576

Separate WITH_LF and WITH_LF_StandAlone
---

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index eabe9fbe..27f43b3f 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -367,7 +367,7 @@ void SendStatus(void)
 	cmd_send(CMD_ACK,1,0,0,0,0);
 }
 
-#if defined(WITH_ISO14443a_StandAlone) || defined(WITH_LF)
+#if defined(WITH_ISO14443a_StandAlone) || defined(WITH_LF_StandAlone)
 
 #define OPTS 2
 
@@ -635,7 +635,7 @@ void StandAloneMode14a()
 		}
 	}
 }
-#elif WITH_LF
+#elif WITH_LF_StandAlone
 // samy's sniff and repeat routine
 void SamyRun()
 {
@@ -1428,7 +1428,7 @@ void  __attribute__((noreturn)) AppMain(void)
     }
 		WDT_HIT();
 
-#ifdef WITH_LF
+#ifdef WITH_LF_StandAlone
 #ifndef WITH_ISO14443a_StandAlone
 		if (BUTTON_HELD(1000) > 0)
 			SamyRun();
diff --git a/common/Makefile_Enabled_Options.common b/common/Makefile_Enabled_Options.common
index acb413bf..462ae56a 100644
--- a/common/Makefile_Enabled_Options.common
+++ b/common/Makefile_Enabled_Options.common
@@ -4,6 +4,7 @@
 #  
 #BEGIN
 APP_CFLAGS += -DWITH_ISO14443a_StandAlone \
+        -DWITH_LF\
         -DWITH_ISO15693 \
         -DWITH_ISO14443a \
         -DWITH_ISO14443b \
@@ -18,7 +19,7 @@ APP_CFLAGS += -DWITH_ISO14443a_StandAlone \
         
 ### Standalone modes:
 #-DWITH_ISO14443a_StandAlone
-#-DWITH_LF
+#-DWITH_LF_StandAlone
 #
 # if both WITH_LF and WITH_ISO4443a_StandAlone are defined
 #   ISO14443a_StandAlone will be the only one that runs