From 9c1d59ce6978e43b9626b008692d6eac1cf67423 Mon Sep 17 00:00:00 2001 From: "Malte F. Hillmann" Date: Wed, 27 Mar 2019 14:04:01 +0100 Subject: [PATCH 1/4] fixed bug in CmdBiphaseDecodeRaw() --- client/cmddata.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/client/cmddata.c b/client/cmddata.c index c4f0e8a3..fd31fac4 100644 --- a/client/cmddata.c +++ b/client/cmddata.c @@ -367,18 +367,20 @@ int Cmdmandecoderaw(const char *Cmd) return 1; } -//by marshmellow -//biphase decode -//take 01 or 10 = 0 and 11 or 00 = 1 -//takes 2 arguments "offset" default = 0 if 1 it will shift the decode by one bit -// and "invert" default = 0 if 1 it will invert output -// the argument offset allows us to manually shift if the output is incorrect - [EDIT: now auto detects] +/** + * @author marshmellow + * biphase decode + * decdoes 01 or 10 to 0 and 11 or 00 to 1 + * param offset adjust start position + * param invert invert output + * param maxErr maximum tolerated errors + */ int CmdBiphaseDecodeRaw(const char *Cmd) { size_t size=0; int offset=0, invert=0, maxErr=20, errCnt=0; char cmdp = param_getchar(Cmd, 0); - if (strlen(Cmd) > 3 || cmdp == 'h' || cmdp == 'H') { + if (strlen(Cmd) > 5 || cmdp == 'h' || cmdp == 'H') { PrintAndLog("Usage: data biphaserawdecode [offset] [invert] [maxErr]"); PrintAndLog(" Converts 10 or 01 to 1 and 11 or 00 to 0"); PrintAndLog(" --must have binary sequence in demodbuffer (run data askrawdemod first)"); From 7361a18f7a24a7b0dd6e76919ef389202543cdc5 Mon Sep 17 00:00:00 2001 From: "Malte F. Hillmann" Date: Wed, 27 Mar 2019 14:34:42 +0100 Subject: [PATCH 2/4] fixed bug in ASKbiphaseDemod() --- client/cmddata.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/cmddata.c b/client/cmddata.c index fd31fac4..30148163 100644 --- a/client/cmddata.c +++ b/client/cmddata.c @@ -429,7 +429,7 @@ 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; + int offset=0, clk=0, invert=0, maxErr=100; sscanf(Cmd, "%i %i %i %i", &offset, &clk, &invert, &maxErr); uint8_t BitStream[MAX_GRAPH_TRACE_LEN]; From 4306de82770fb4e7e033e03996710d3c50f699f7 Mon Sep 17 00:00:00 2001 From: "Malte F. Hillmann" Date: Wed, 27 Mar 2019 14:36:39 +0100 Subject: [PATCH 3/4] fixed bug in CmdFdxDemod --- client/cmdlffdx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c index 20f834ce..5677c79d 100644 --- a/client/cmdlffdx.c +++ b/client/cmdlffdx.c @@ -137,7 +137,7 @@ int CmdFdxDemod(const char *Cmd){ //Differential Biphase / di-phase (inverted biphase) //get binary from ask wave - if (!ASKbiphaseDemod("0 32 1 0", false)) { + if (!ASKbiphaseDemod("0 32 1 100", false)) { if (g_debugMode) PrintAndLog("DEBUG: Error - FDX-B ASKbiphaseDemod failed"); return 0; } From 3f306c6ded0e995a7150de7d4168ca689e09868f Mon Sep 17 00:00:00 2001 From: "Malte F. Hillmann" Date: Thu, 28 Mar 2019 22:40:29 +0100 Subject: [PATCH 4/4] Bugfixes for LF FDX Changed CmdBiphaseDecodeRaw to allow 7 digits Changed CmdFdxRead to read 39999 samples instead of 10000 to improve reading from small tags --- client/cmddata.c | 2 +- client/cmdlffdx.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/cmddata.c b/client/cmddata.c index 30148163..8f93ba17 100644 --- a/client/cmddata.c +++ b/client/cmddata.c @@ -380,7 +380,7 @@ int CmdBiphaseDecodeRaw(const char *Cmd) size_t size=0; int offset=0, invert=0, maxErr=20, errCnt=0; char cmdp = param_getchar(Cmd, 0); - if (strlen(Cmd) > 5 || cmdp == 'h' || cmdp == 'H') { + if (strlen(Cmd) > 7 || cmdp == 'h' || cmdp == 'H') { PrintAndLog("Usage: data biphaserawdecode [offset] [invert] [maxErr]"); PrintAndLog(" Converts 10 or 01 to 1 and 11 or 00 to 0"); PrintAndLog(" --must have binary sequence in demodbuffer (run data askrawdemod first)"); diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c index 5677c79d..d0ac52c0 100644 --- a/client/cmdlffdx.c +++ b/client/cmdlffdx.c @@ -206,7 +206,7 @@ int CmdFdxDemod(const char *Cmd){ } int CmdFdxRead(const char *Cmd) { - lf_read(true, 10000); + lf_read(true, 39999); return CmdFdxDemod(Cmd); }