From c7d672129049e1dd274a8c24174c6035bcdb5964 Mon Sep 17 00:00:00 2001 From: marshmellow42 Date: Sun, 14 Jun 2015 10:54:55 -0400 Subject: [PATCH 1/2] bug fix. askdemod edits invert pointer, cannot be 0 --- client/cmddata.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/client/cmddata.c b/client/cmddata.c index 976dc084..77959cf3 100644 --- a/client/cmddata.c +++ b/client/cmddata.c @@ -498,13 +498,12 @@ int CmdBiphaseDecodeRaw(const char *Cmd) int ASKbiphaseDemod(const char *Cmd, bool verbose) { //ask raw demod GraphBuffer first - int offset=0, clk=0, invert=0, maxErr=0, ans=0; - ans = sscanf(Cmd, "%i %i %i %i", &offset, &clk, &invert, &maxErr); + int offset=0, clk=0, invert=0, maxErr=0; + sscanf(Cmd, "%i %i %i %i", &offset, &clk, &invert, &maxErr); uint8_t BitStream[MAX_DEMOD_BUF_LEN]; size_t size = getFromGraphBuf(BitStream); - - int errCnt = askdemod(BitStream, &size, &clk, 0, maxErr, 0, 0); + int errCnt = askdemod(BitStream, &size, &clk, &invert, maxErr, 0, 0); if ( errCnt < 0 || errCnt > maxErr ) { if (g_debugMode) PrintAndLog("DEBUG: no data or error found %d, clock: %d", errCnt, clk); return 0; From fd227f4e7d7967ce06a2ef90828aa13159a80d98 Mon Sep 17 00:00:00 2001 From: marshmellow42 Date: Sun, 14 Jun 2015 11:11:00 -0400 Subject: [PATCH 2/2] add comment --- client/cmddata.c | 1 + 1 file changed, 1 insertion(+) diff --git a/client/cmddata.c b/client/cmddata.c index 77959cf3..309044e1 100644 --- a/client/cmddata.c +++ b/client/cmddata.c @@ -503,6 +503,7 @@ int ASKbiphaseDemod(const char *Cmd, bool verbose) uint8_t BitStream[MAX_DEMOD_BUF_LEN]; size_t size = getFromGraphBuf(BitStream); + //invert here inverts the ask raw demoded bits which has no effect on the demod, but we need the pointer int errCnt = askdemod(BitStream, &size, &clk, &invert, maxErr, 0, 0); if ( errCnt < 0 || errCnt > maxErr ) { if (g_debugMode) PrintAndLog("DEBUG: no data or error found %d, clock: %d", errCnt, clk);