FIX: introduced a bug in luascripts when adding the "safe ascii chars" to ConvertHex...

[proxmark3-svn] / client / cmdlfvisa2000.c

diff --git a/client/cmdlfvisa2000.c b/client/cmdlfvisa2000.c
index 26b447a4323156160fddff44da383b1bb71549c8..e828f3749ac5d68dbddc69e5479d6a28c8d788f0 100644 (file)
--- a/client/cmdlfvisa2000.c
+++ b/client/cmdlfvisa2000.c
@@ -54,6 +54,10 @@ static uint8_t visa_parity( uint32_t id) {
                ,0,1,1,0
        };      
        uint8_t par = 0;
+       par |= par_lut[ NIBBLE_HIGH( (id >> 24) & 0xFF) ] << 7;
+       par |= par_lut[ NIBBLE_LOW( (id >> 24) & 0xFF) ] << 6;
+       par |= par_lut[ NIBBLE_HIGH( (id >> 16) & 0xFF) ] << 5;
+       par |= par_lut[ NIBBLE_LOW( (id >> 16) & 0xFF) ] << 4;
        par |= par_lut[ NIBBLE_HIGH( (id >> 8) & 0xFF) ] << 3;
        par |= par_lut[ NIBBLE_LOW( (id >> 8) & 0xFF) ] << 2;
        par |= par_lut[ NIBBLE_HIGH( id & 0xFF ) ] << 1;
@@ -124,7 +128,7 @@ int CmdVisa2kDemod(const char *Cmd) {
        }
        // parity
        uint8_t calc_par = visa_parity(raw2);
-       uint8_t chk_par = (raw3 & 0xF0) >> 4;
+       uint8_t chk_par = (raw3 & 0xFF0) >> 4;
        if ( calc_par != chk_par) {
                printf("DEBUG: error: Visa2000 parity failed %x - %x\n", chk_par, calc_par);
                save_restoreGB(0);
@@ -135,9 +139,10 @@ int CmdVisa2kDemod(const char *Cmd) {
        return 1;
 }
 
+// 64*96*2=12288 samples just in case we just missed the first preamble we can still catch 2 of them
 int CmdVisa2kRead(const char *Cmd) {
        CmdLFRead("s");
-       getSamples("12000",TRUE);
+       getSamples("12500",TRUE);
        return CmdVisa2kDemod(Cmd);
 }
 
@@ -203,7 +208,7 @@ int CmdVisa2kSim(const char *Cmd) {
 
        uint32_t blocks[3] = { BL0CK1, id, (visa_parity(id) << 4) | visa_chksum(id) };
 
-       for(int i=0; i<3; ++i)
+       for(int i = 0; i < 3; ++i)
                num_to_bytebits(blocks[i], 32, c.d.asBytes + i*32);
 
        clearCommandBuffer();
@@ -213,6 +218,7 @@ int CmdVisa2kSim(const char *Cmd) {
 
 static command_t CommandTable[] = {
     {"help",   CmdHelp,                1, "This help"},
+       {"demod",       CmdVisa2kDemod, 1, "Attempt to demod from GraphBuffer"},        
        {"read",        CmdVisa2kRead,  0, "Attempt to read and extract tag data"},
        {"clone",       CmdVisa2kClone, 0, "clone Visa2000 tag"},
        {"sim",         CmdVisa2kSim,   0, "simulate Visa2000 tag"},