X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/00abc7c1ab50f5f7fcd896bb8fb5d295c97fada1..ef31a8b4535d709bac09055ee5e37b630d161896:/client/cmdlfjablotron.c diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c index 1f279a3b..ee4b3957 100644 --- a/client/cmdlfjablotron.c +++ b/client/cmdlfjablotron.c @@ -75,7 +75,7 @@ int CmdJablotronDemod(const char *Cmd) { //Differential Biphase / di-phase (inverted biphase) //get binary from ask wave if (!ASKbiphaseDemod("0 64 1 0", FALSE)) { - if (g_debugMode) PrintAndLog("Error Jablotron: ASKbiphaseDemod failed"); + if (g_debugMode) PrintAndLog("DEBUG: Error - Jablotron ASKbiphaseDemod failed"); return 0; } size_t size = DemodBufferLen; @@ -83,11 +83,11 @@ int CmdJablotronDemod(const char *Cmd) { if (ans < 0){ if (g_debugMode){ // if (ans == -5) - // PrintAndLog("DEBUG: Error - not enough samples"); + // PrintAndLog("DEBUG: Error - Jablotron not enough samples"); if (ans == -1) PrintAndLog("DEBUG: Error - Jablotron too few bits found"); // else if (ans == -2) - // PrintAndLog("DEBUG: Error - problem during ASK/Biphase demod"); + // PrintAndLog("DEBUG: Error - Jablotron problem during ASK/Biphase demod"); else if (ans == -3) PrintAndLog("DEBUG: Error - Jablotron Size not correct: %d", size); else if (ans == -4) @@ -95,7 +95,7 @@ int CmdJablotronDemod(const char *Cmd) { else if (ans == -5) PrintAndLog("DEBUG: Error - Jablotron checksum failed"); else - PrintAndLog("DEBUG: Error - ans: %d", ans); + PrintAndLog("DEBUG: Error - Jablotron ans: %d", ans); } return 0; } @@ -130,7 +130,7 @@ int CmdJablotronDemod(const char *Cmd) { int CmdJablotronRead(const char *Cmd) { CmdLFRead("s"); - getSamples("30000",false); + getSamples("20000", TRUE); return CmdJablotronDemod(Cmd); } @@ -179,7 +179,7 @@ int CmdJablotronClone(const char *Cmd) { UsbCommand resp; UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}}; - for (int i=4; i>=0; i--) { + for (int i = 2; i >= 0; --i) { c.arg[0] = blocks[i]; c.arg[1] = i; clearCommandBuffer();