Update 77-mm-usb-device-blacklist.rules

[proxmark3-svn] / client / cmdlfpresco.c

diff --git a/client/cmdlfpresco.c b/client/cmdlfpresco.c
index abae165d20dc58036a61c0792c0556db6d8cf2d4..29fc81f278cc6522a1c0e4f86186fc16030370b5 100644 (file)
--- a/client/cmdlfpresco.c
+++ b/client/cmdlfpresco.c
@@ -5,9 +5,11 @@
 // the license.
 //-----------------------------------------------------------------------------
 // Low frequency Presco tag commands
 // the license.
 //-----------------------------------------------------------------------------
 // Low frequency Presco tag commands

+// ASK/Manchester, rf/32, 128 bits (complete)

 //-----------------------------------------------------------------------------
 #include <string.h>
 #include <inttypes.h>
 //-----------------------------------------------------------------------------
 #include <string.h>
 #include <inttypes.h>

+#include <stdio.h>

 #include "cmdlfpresco.h"
 #include "proxmark3.h"
 #include "ui.h"
 #include "cmdlfpresco.h"
 #include "proxmark3.h"
 #include "ui.h"


@@ -66,8 +68,8 @@ int GetWiegandFromPresco(const char *Cmd, uint32_t *sitecode, uint32_t *usercode
                                *fullcode = param_get32ex(Cmd, cmdp+1, 0, 10);
                                cmdp+=2;
                                break;
                                *fullcode = param_get32ex(Cmd, cmdp+1, 0, 10);
                                cmdp+=2;
                                break;

-                       case 'P':
-                       case 'p':
+                       case 'D':
+                       case 'd':

                                //param get string int param_getstr(const char *line, int paramnum, char * str)
                                stringlen = param_getstr(Cmd, cmdp+1, id);
                                if (stringlen < 2) return -1;
                                //param get string int param_getstr(const char *line, int paramnum, char * str)
                                stringlen = param_getstr(Cmd, cmdp+1, id);
                                if (stringlen < 2) return -1;


@@ -89,7 +91,7 @@ int GetWiegandFromPresco(const char *Cmd, uint32_t *sitecode, uint32_t *usercode
        if(cmdp == 0) errors = 1;
 
        //Validations
        if(cmdp == 0) errors = 1;
 
        //Validations

-       if(errors) return -1;
+       if(errors || (stringlen == 0 && !hex) ) return -1;

 
        if (!hex) {
                for (int index =0; index < strlen(id); ++index) {
 
        if (!hex) {
                for (int index =0; index < strlen(id); ++index) {


@@ -128,7 +130,7 @@ int CmdPrescoDemod(const char *Cmd) {
                return 0;
        }
        size_t size = DemodBufferLen;
                return 0;
        }
        size_t size = DemodBufferLen;

-       //call lfdemod.c demod for Viking
+       //call lfdemod.c demod for presco

        int ans = PrescoDemod(DemodBuffer, &size);
        if (ans < 0) {
                if (g_debugMode) PrintAndLog("Error Presco_Demod %d", ans);
        int ans = PrescoDemod(DemodBuffer, &size);
        if (ans < 0) {
                if (g_debugMode) PrintAndLog("Error Presco_Demod %d", ans);


@@ -142,8 +144,9 @@ int CmdPrescoDemod(const char *Cmd) {
        uint32_t cardid = raw4;
        PrintAndLog("Presco Tag Found: Card ID %08X", cardid);
        PrintAndLog("Raw: %08X%08X%08X%08X", raw1,raw2,raw3,raw4);
        uint32_t cardid = raw4;
        PrintAndLog("Presco Tag Found: Card ID %08X", cardid);
        PrintAndLog("Raw: %08X%08X%08X%08X", raw1,raw2,raw3,raw4);

-       setDemodBuf(DemodBuffer+ans, 128, 0);
-       
+       setDemodBuf(DemodBuffer, 128, ans);
+       setClockGrid(g_DemodClock, g_DemodStartIdx + (ans*g_DemodClock));
+

        uint32_t sitecode = 0, usercode = 0, fullcode = 0;
        bool Q5=false;
        char cmd[12] = {0};
        uint32_t sitecode = 0, usercode = 0, fullcode = 0;
        bool Q5=false;
        char cmd[12] = {0};


@@ -159,9 +162,7 @@ int CmdPrescoRead(const char *Cmd) {
        // Presco Number: 123456789 --> Sitecode 30 | usercode 8665
 
        // read lf silently
        // Presco Number: 123456789 --> Sitecode 30 | usercode 8665
 
        // read lf silently

-       CmdLFRead("s");
-       // get samples silently
-       getSamples("30000",false);
+       lf_read(true, 10000);

        // demod and output Presco ID   
        return CmdPrescoDemod(Cmd);
 }
        // demod and output Presco ID   
        return CmdPrescoDemod(Cmd);
 }


@@ -178,7 +179,7 @@ int CmdPrescoClone(const char *Cmd) {
        if (GetWiegandFromPresco(Cmd, &sitecode, &usercode, &fullcode, &Q5) == -1) return usage_lf_presco_clone();
 
        if (Q5)
        if (GetWiegandFromPresco(Cmd, &sitecode, &usercode, &fullcode, &Q5) == -1) return usage_lf_presco_clone();
 
        if (Q5)

-               blocks[0] = T5555_MODULATION_MANCHESTER | 32<<T5555_BITRATE_SHIFT | 4<<T5555_MAXBLOCK_SHIFT | T5555_ST_TERMINATOR;
+               blocks[0] = T5555_MODULATION_MANCHESTER | ((32-2)>>1)<<T5555_BITRATE_SHIFT | 4<<T5555_MAXBLOCK_SHIFT | T5555_ST_TERMINATOR;

 
        if ((sitecode & 0xFF) != sitecode) {
                sitecode &= 0xFF;
 
        if ((sitecode & 0xFF) != sitecode) {
                sitecode &= 0xFF;