From: marshmellow42 Date: Tue, 28 Feb 2017 04:03:55 +0000 (-0500) Subject: Adjust global variable name X-Git-Tag: v3.0.0~63^2 X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/fac69c3d76b04088c337365ee124f8db4c13a2f0 Adjust global variable name --- diff --git a/client/cmdlf.c b/client/cmdlf.c index dc7185cc..2e786943 100644 --- a/client/cmdlf.c +++ b/client/cmdlf.c @@ -35,7 +35,7 @@ #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); @@ -512,7 +512,7 @@ int CmdLFSetConfig(const char *Cmd) 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': @@ -572,7 +572,7 @@ int CmdLFRead(const char *Cmd) 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) ) { diff --git a/common/lfdemod.c b/common/lfdemod.c index e1fcbf73..f5fee22a 100644 --- a/common/lfdemod.c +++ b/common/lfdemod.c @@ -288,6 +288,7 @@ int cleanAskRawDemod(uint8_t *BinStream, size_t *size, int clk, int invert, int } //by marshmellow +//amplify based on ask edge detection void askAmp(uint8_t *BitStream, size_t size) { uint8_t Last = 128;