]> git.zerfleddert.de Git - proxmark3-svn/commitdiff
Separate WITH_LF and WITH_LF_StandAlone
authormarshmellow42 <marshmellowrf@gmail.com>
Mon, 6 Aug 2018 11:27:37 +0000 (07:27 -0400)
committermarshmellow42 <marshmellowrf@gmail.com>
Mon, 6 Aug 2018 11:27:37 +0000 (07:27 -0400)
armsrc/appmain.c
common/Makefile_Enabled_Options.common

index eabe9fbe627c15c97d8065bdb99b4b0c4939369a..27f43b3fae505453b51ff5f5de721c2e3de51af2 100644 (file)
@@ -367,7 +367,7 @@ void SendStatus(void)
        cmd_send(CMD_ACK,1,0,0,0,0);
 }
 
        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
 
 
 #define OPTS 2
 
@@ -635,7 +635,7 @@ void StandAloneMode14a()
                }
        }
 }
                }
        }
 }
-#elif WITH_LF
+#elif WITH_LF_StandAlone
 // samy's sniff and repeat routine
 void SamyRun()
 {
 // samy's sniff and repeat routine
 void SamyRun()
 {
@@ -1428,7 +1428,7 @@ void  __attribute__((noreturn)) AppMain(void)
     }
                WDT_HIT();
 
     }
                WDT_HIT();
 
-#ifdef WITH_LF
+#ifdef WITH_LF_StandAlone
 #ifndef WITH_ISO14443a_StandAlone
                if (BUTTON_HELD(1000) > 0)
                        SamyRun();
 #ifndef WITH_ISO14443a_StandAlone
                if (BUTTON_HELD(1000) > 0)
                        SamyRun();
index acb413bf1ca4e27ae54d717c71e9205fb3484fb4..462ae56a3c4769e9f1428b9e2db732251749b029 100644 (file)
@@ -4,6 +4,7 @@
 #  
 #BEGIN
 APP_CFLAGS += -DWITH_ISO14443a_StandAlone \
 #  
 #BEGIN
 APP_CFLAGS += -DWITH_ISO14443a_StandAlone \
+        -DWITH_LF\
         -DWITH_ISO15693 \
         -DWITH_ISO14443a \
         -DWITH_ISO14443b \
         -DWITH_ISO15693 \
         -DWITH_ISO14443a \
         -DWITH_ISO14443b \
@@ -18,7 +19,7 @@ APP_CFLAGS += -DWITH_ISO14443a_StandAlone \
         
 ### Standalone modes:
 #-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 
 #
 # if both WITH_LF and WITH_ISO4443a_StandAlone are defined
 #   ISO14443a_StandAlone will be the only one that runs 
Impressum, Datenschutz