]> git.zerfleddert.de Git - proxmark3-svn/commitdiff
Adjust global variable name 219/head
authormarshmellow42 <marshmellowrf@gmail.com>
Tue, 28 Feb 2017 04:03:55 +0000 (23:03 -0500)
committermarshmellow42 <marshmellowrf@gmail.com>
Tue, 28 Feb 2017 04:03:55 +0000 (23:03 -0500)
client/cmdlf.c
common/lfdemod.c

index dc7185cc3b29dd0035f6afcdfe46e2180851d7b5..2e786943e6db6e474cdc263d38ab56032567fafe 100644 (file)
@@ -35,7 +35,7 @@
 #include "cmdlfviking.h" // for viking menu
 #include "cmdlfcotag.h"  // for COTAG menu
 
 #include "cmdlfviking.h" // for viking menu
 #include "cmdlfcotag.h"  // for COTAG menu
 
-bool threshold_set = false;
+bool g_lf_threshold_set = false;
 static int CmdHelp(const char *Cmd);
 
 
 static int CmdHelp(const char *Cmd);
 
 
@@ -512,7 +512,7 @@ int CmdLFSetConfig(const char *Cmd)
                        cmdp+=2;
                        if(!errors) {
                                trigger_threshold = unsigned_trigg;
                        cmdp+=2;
                        if(!errors) {
                                trigger_threshold = unsigned_trigg;
-                               if (trigger_threshold > 0) threshold_set = true;
+                               if (trigger_threshold > 0) g_lf_threshold_set = true;
                        }
                        break;
                case 'b':
                        }
                        break;
                case 'b':
@@ -572,7 +572,7 @@ int CmdLFRead(const char *Cmd)
        UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_125K, {arg1,0,0}};
        clearCommandBuffer();
        SendCommand(&c);
        UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_125K, {arg1,0,0}};
        clearCommandBuffer();
        SendCommand(&c);
-       if (threshold_set) {
+       if (g_lf_threshold_set) {
                WaitForResponse(CMD_ACK,NULL);
        } else {
                if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {
                WaitForResponse(CMD_ACK,NULL);
        } else {
                if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {
index e1fcbf736ed4ffd5d6ed73e916d04271eba06415..f5fee22a853328230020db91257c465575ec4d97 100644 (file)
@@ -288,6 +288,7 @@ int cleanAskRawDemod(uint8_t *BinStream, size_t *size, int clk, int invert, int
 }
 
 //by marshmellow
 }
 
 //by marshmellow
+//amplify based on ask edge detection
 void askAmp(uint8_t *BitStream, size_t size)
 {
        uint8_t Last = 128;
 void askAmp(uint8_t *BitStream, size_t size)
 {
        uint8_t Last = 128;
Impressum, Datenschutz