LF HID & IO prox fixes/options

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 8f676c8e4acd65fe8af59a20b7cad44793f98292..0f22ba90fc5fc8aca488240c8943c22d52e00b42 100644 (file)
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -643,7 +643,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        cmd_send(CMD_ACK,0,0,0,0,0);
                        break;
                case CMD_HID_DEMOD_FSK:
-                       CmdHIDdemodFSK(0, 0, 0, 1);                                     // Demodulate HID tag
+                       CmdHIDdemodFSK(c->arg[0], 0, 0, 1);                                     // Demodulate HID tag
                        break;
                case CMD_HID_SIM_TAG:
                        CmdHIDsimTAG(c->arg[0], c->arg[1], 1);                                  // Simulate HID tag by ID
@@ -652,7 +652,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        CopyHIDtoT55x7(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes[0]);
                        break;
                case CMD_IO_DEMOD_FSK:
-                       CmdIOdemodFSK(1, 0, 0, 1);                                      // Demodulate IO tag
+                       CmdIOdemodFSK(c->arg[0], 0, 0, 1);                                      // Demodulate IO tag
                        break;
                case CMD_IO_CLONE_TAG: // Clone IO tag by ID to T55x7
                        CopyIOtoT55x7(c->arg[0], c->arg[1], c->d.asBytes[0]);

diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index a3cef485c228e26fcb6b7067ac0312a86c1827c6..95a9fcf60a6c52d2d005fefda0ed5b2bb5bee17e 100644 (file)
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -634,11 +634,10 @@ size_t fsk_demod(uint8_t * dest, size_t size)
 {
        uint32_t last_transition = 0;
        uint32_t idx = 1;
-
        // we don't care about actual value, only if it's more or less than a
        // threshold essentially we capture zero crossings for later analysis
        uint8_t threshold_value = 127;
-
+       
        // sync to first lo-hi transition, and threshold
 
        //Need to threshold first sample
@@ -670,7 +669,7 @@ size_t fsk_demod(uint8_t * dest, size_t size)
 }
 
 
-size_t aggregate_bits(uint8_t *dest,size_t size, uint8_t h2l_crossing_value,uint8_t l2h_crossing_value, uint8_t maxConsequtiveBits )
+size_t aggregate_bits(uint8_t *dest,size_t size, uint8_t h2l_crossing_value,uint8_t l2h_crossing_value, uint8_t maxConsequtiveBits, uint8_t invert )
 {
        uint8_t lastval=dest[0];
        uint32_t idx=0;
@@ -684,24 +683,27 @@ size_t aggregate_bits(uint8_t *dest,size_t size, uint8_t h2l_crossing_value,uint
                        continue;
                }
                //if lastval was 1, we have a 1->0 crossing
-               if ( dest[idx-1] ) {
+               if ( dest[idx-1]==1 ) {
                        n=(n+1) / h2l_crossing_value;
                } else {// 0->1 crossing
                        n=(n+1) / l2h_crossing_value;
                }
                if (n == 0) n = 1;
 
-               if(n < maxConsequtiveBits)
+               if(n < maxConsequtiveBits) //Consecutive 
                {
-                       memset(dest+numBits, dest[idx-1] , n);
+                       if(invert==0){ //invert bits 
+                               memset(dest+numBits, dest[idx-1] , n);
+                       }else{
+                               memset(dest+numBits, dest[idx-1]^1 , n);        
+                       }
+                       
                        numBits += n;
                }
                n=0;
                lastval=dest[idx];
        }//end for
-
        return numBits;
-
 }
 // loop to capture raw HID waveform then FSK demodulate the TAG ID from it
 void CmdHIDdemodFSK(int findone, int *high, int *low, int ledcontrol)
@@ -726,9 +728,10 @@ void CmdHIDdemodFSK(int findone, int *high, int *low, int ledcontrol)
                size = fsk_demod(dest, size);
 
                // we now have a set of cycle counts, loop over previous results and aggregate data into bit patterns
-               // 1->0 : fc/8 in sets of 6
-               // 0->1 : fc/10 in sets of 5
-               size = aggregate_bits(dest,size, 6,5,5);
+               // 1->0 : fc/8 in sets of 6  (RF/50 / 8 = 6.25)
+               // 0->1 : fc/10 in sets of 5 (RF/50 / 10= 5)
+               // do not invert
+               size = aggregate_bits(dest,size, 6,5,5,0); 
 
                WDT_HIT();
 
@@ -742,7 +745,6 @@ void CmdHIDdemodFSK(int findone, int *high, int *low, int ledcontrol)
                        if ( memcmp(dest+idx, frame_marker_mask, sizeof(frame_marker_mask)) == 0)
                        { // frame marker found
                                idx+=sizeof(frame_marker_mask);
-
                                while(dest[idx] != dest[idx+1] && idx < size-2)
                                {       
                                        // Keep going until next frame marker (or error)
@@ -758,24 +760,21 @@ void CmdHIDdemodFSK(int findone, int *high, int *low, int ledcontrol)
                                        numshifts++;
                                        idx += 2;
                                }
-
                                //Dbprintf("Num shifts: %d ", numshifts);
                                // Hopefully, we read a tag and  hit upon the next frame marker
                                if(idx + sizeof(frame_marker_mask) < size)
                                {
                                        if ( memcmp(dest+idx, frame_marker_mask, sizeof(frame_marker_mask)) == 0)
                                        {
-                                               if (hi2 != 0){ //should be large enough for the largest HID tags
+                                               if (hi2 != 0){ //extra large HID tags
                                                        Dbprintf("TAG ID: %x%08x%08x (%d)",
                                                                 (unsigned int) hi2, (unsigned int) hi, (unsigned int) lo, (unsigned int) (lo>>1) & 0xFFFF);
                                                }
-                                               else {  //standard bits
-                                                       //Dbprintf("TAG ID: %x%08x (%d)",
-                                                       // (unsigned int) hi, (unsigned int) lo, (unsigned int) (lo>>1) & 0xFFFF);
+                                               else {  //standard HID tags <38 bits
+                                                       //Dbprintf("TAG ID: %x%08x (%d)",(unsigned int) hi, (unsigned int) lo, (unsigned int) (lo>>1) & 0xFFFF); //old print cmd
                                                        uint8_t bitlen = 0;
                                                        uint32_t fc = 0;
                                                        uint32_t cardnum = 0;
-
                                                        if (((hi>>5)&1)==1){//if bit 38 is set then < 37 bit format is used
                                                                uint32_t lo2=0;
                                                                lo2=(((hi & 31) << 12) | (lo>>20)); //get bits 21-37 to check for format len bit
@@ -784,7 +783,7 @@ void CmdHIDdemodFSK(int findone, int *high, int *low, int ledcontrol)
                                                                        lo2=lo2>>1;
                                                                        idx3++;
                                                                }
-                                                               bitlen =idx3+19;
+                                                               bitlen =idx3+19;  
                                                                fc =0;
                                                                cardnum=0;
                                                                if(bitlen==26){
@@ -803,7 +802,6 @@ void CmdHIDdemodFSK(int findone, int *high, int *low, int ledcontrol)
                                                                        cardnum = (lo>>1)&0xFFFFF;
                                                                        fc = ((hi&1)<<11)|(lo>>21);
                                                                }
-                                                               //Dbprintf("Format Len: %d bit - FC: %d - Card: %d",(unsigned int) bitlen, (unsigned int) fc, (unsigned int) cardnum);
                                                        }
                                                        else { //if bit 38 is not set then 37 bit format is used
                                                                bitlen= 37;
@@ -815,16 +813,17 @@ void CmdHIDdemodFSK(int findone, int *high, int *low, int ledcontrol)
                                                                }
                                                        }
                                                                        //Dbprintf("TAG ID: %x%08x (%d)",
-                                                       // (unsigned int) hi, (unsigned int) lo, (unsigned int) (lo>>1) & 0xFFFF);
-                               
+                                                       // (unsigned int) hi, (unsigned int) lo, (unsigned int) (lo>>1) & 0xFFFF);                              
                                                        Dbprintf("TAG ID: %x%08x (%d) - Format Len: %dbit - FC: %d - Card: %d",
                                                                (unsigned int) hi, (unsigned int) lo, (unsigned int) (lo>>1) & 0xFFFF,
                                                                (unsigned int) bitlen, (unsigned int) fc, (unsigned int) cardnum);
                                                }
+                                               if (findone){
+                                                       if (ledcontrol) LED_A_OFF();
+                                                       return;
+                                               }
                                        }
-
                                }
-
                                // reset
                                hi2 = hi = lo = 0;
                                numshifts = 0;
@@ -851,65 +850,63 @@ uint32_t bytebits_to_byte(uint8_t* src, int numbits)
        return num;
 }
 
-
 void CmdIOdemodFSK(int findone, int *high, int *low, int ledcontrol)
 {
        uint8_t *dest = (uint8_t *)BigBuf;
-
        size_t size=0, idx=0;
        uint32_t code=0, code2=0;
 
        // Configure to go in 125Khz listen mode
        LFSetupFPGAForADC(95, true);
-
+       
        while(!BUTTON_PRESS()) {
-
-
                WDT_HIT();
                if (ledcontrol) LED_A_ON();
-
                DoAcquisition125k_internal(-1,true);
                size  = sizeof(BigBuf);
 
                // FSK demodulator
                size = fsk_demod(dest, size);
-
                // we now have a set of cycle counts, loop over previous results and aggregate data into bit patterns
-               // 1->0 : fc/8 in sets of 7
-               // 0->1 : fc/10 in sets of 6
-               size = aggregate_bits(dest, size, 7,6,13);
-
+               // 1->0 : fc/8 in sets of 7  (RF/64 / 8 = 8)
+               // 0->1 : fc/10 in sets of 6 (RF/64 / 10 = 6.4)
+               size = aggregate_bits(dest, size, 7,6,13,1);  //13 max Consecutive should be ok as most 0s in row should be 10 for init seq - invert bits
                WDT_HIT();
-               
+               //Index map
+               //0           10          20          30          40          50          60
+               //|           |           |           |           |           |           |
+               //01234567 8 90123456 7 89012345 6 78901234 5 67890123 4 56789012 3 45678901 23
+               //-----------------------------------------------------------------------------
+               //00000000 0 11110000 1 facility 1 version* 1 code*one 1 code*two 1 ???????? 11
+               //
+               //XSF(version)facility:codeone+codetwo
                //Handle the data
            uint8_t mask[] = {0,0,0,0,0,0,0,0,0,1};
-               for( idx=0; idx < size - 64; idx++) {
-
-               if ( memcmp(dest + idx, mask, sizeof(mask)) ) continue;
-               Dbprintf("%b",bytebits_to_byte(dest+idx,32));
-                   Dbprintf("%d%d%d%d%d%d%d%d",dest[idx],   dest[idx+1],   dest[idx+2],dest[idx+3],dest[idx+4],dest[idx+5],dest[idx+6],dest[idx+7]);
-                   Dbprintf("%d%d%d%d%d%d%d%d",dest[idx+8], dest[idx+9], dest[idx+10],dest[idx+11],dest[idx+12],dest[idx+13],dest[idx+14],dest[idx+15]);                         
-                   Dbprintf("%d%d%d%d%d%d%d%d",dest[idx+16],dest[idx+17],dest[idx+18],dest[idx+19],dest[idx+20],dest[idx+21],dest[idx+22],dest[idx+23]);
-                   Dbprintf("%d%d%d%d%d%d%d%d",dest[idx+24],dest[idx+25],dest[idx+26],dest[idx+27],dest[idx+28],dest[idx+29],dest[idx+30],dest[idx+31]);
-                   Dbprintf("%d%d%d%d%d%d%d%d",dest[idx+32],dest[idx+33],dest[idx+34],dest[idx+35],dest[idx+36],dest[idx+37],dest[idx+38],dest[idx+39]);
-                   Dbprintf("%d%d%d%d%d%d%d%d",dest[idx+40],dest[idx+41],dest[idx+42],dest[idx+43],dest[idx+44],dest[idx+45],dest[idx+46],dest[idx+47]);
-                   Dbprintf("%d%d%d%d%d%d%d%d",dest[idx+48],dest[idx+49],dest[idx+50],dest[idx+51],dest[idx+52],dest[idx+53],dest[idx+54],dest[idx+55]);
-                   Dbprintf("%d%d%d%d%d%d%d%d",dest[idx+56],dest[idx+57],dest[idx+58],dest[idx+59],dest[idx+60],dest[idx+61],dest[idx+62],dest[idx+63]);
-                       
-                   code = bytebits_to_byte(dest+idx,32);
-                   code2 = bytebits_to_byte(dest+idx+32,32); 
-
-                   short version = bytebits_to_byte(dest+idx+28,8); //14,4
-                   char facilitycode = bytebits_to_byte(dest+idx+19,8) ;
-                   uint16_t number = (bytebits_to_byte(dest+idx+37,8)<<8)|(bytebits_to_byte(dest+idx+46,8)); //36,9
-                   
-                   Dbprintf("XSF(%02d)%02x:%d (%08x%08x)",version,facilitycode,number,code,code2);
-                   if (ledcontrol)     LED_D_OFF();
-               
-                       // if we're only looking for one tag 
-                       if (findone){
-                               LED_A_OFF();
-                               return;
+               for( idx=0; idx < (size - 64); idx++) {
+               if ( memcmp(dest + idx, mask, sizeof(mask))==0) {
+                       //frame marker found
+                if(findone){ //only print binary if we are doing one
+                               Dbprintf("%d%d%d%d%d%d%d%d %d",dest[idx],   dest[idx+1],   dest[idx+2],dest[idx+3],dest[idx+4],dest[idx+5],dest[idx+6],dest[idx+7],dest[idx+8]);
+                                   Dbprintf("%d%d%d%d%d%d%d%d %d",dest[idx+9], dest[idx+10],dest[idx+11],dest[idx+12],dest[idx+13],dest[idx+14],dest[idx+15],dest[idx+16],dest[idx+17]);                         
+                                   Dbprintf("%d%d%d%d%d%d%d%d %d",dest[idx+18],dest[idx+19],dest[idx+20],dest[idx+21],dest[idx+22],dest[idx+23],dest[idx+24],dest[idx+25],dest[idx+26]);
+                                   Dbprintf("%d%d%d%d%d%d%d%d %d",dest[idx+27],dest[idx+28],dest[idx+29],dest[idx+30],dest[idx+31],dest[idx+32],dest[idx+33],dest[idx+34],dest[idx+35]);
+                                   Dbprintf("%d%d%d%d%d%d%d%d %d",dest[idx+36],dest[idx+37],dest[idx+38],dest[idx+39],dest[idx+40],dest[idx+41],dest[idx+42],dest[idx+43],dest[idx+44]);
+                                   Dbprintf("%d%d%d%d%d%d%d%d %d",dest[idx+45],dest[idx+46],dest[idx+47],dest[idx+48],dest[idx+49],dest[idx+50],dest[idx+51],dest[idx+52],dest[idx+53]);
+                                   Dbprintf("%d%d%d%d%d%d%d%d %d%d",dest[idx+54],dest[idx+55],dest[idx+56],dest[idx+57],dest[idx+58],dest[idx+59],dest[idx+60],dest[idx+61],dest[idx+62],dest[idx+63]);
+                               }
+                               code = bytebits_to_byte(dest+idx,32);
+                           code2 = bytebits_to_byte(dest+idx+32,32); 
+                           short version = bytebits_to_byte(dest+idx+28,8); //14,4
+                           char facilitycode = bytebits_to_byte(dest+idx+19,8) ;
+                           uint16_t number = (bytebits_to_byte(dest+idx+37,8)<<8)|(bytebits_to_byte(dest+idx+46,8)); //36,9
+                           
+                           Dbprintf("XSF(%02d)%02x:%d (%08x%08x)",version,facilitycode,number,code,code2);                     
+                               // if we're only looking for one tag 
+                               if (findone){
+                                       if (ledcontrol) LED_A_OFF();
+                                       //LED_A_OFF();
+                                       return;
+                               }
                        }               
                }
                WDT_HIT();

diff --git a/client/cmdlf.c b/client/cmdlf.c
index cf920b1efaf515eeb8974f54449f018a2d9fcd92..404708b6cd01339fcba0e02d3111e574b5b08092 100644 (file)
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -555,9 +555,9 @@ static command_t CommandTable[] =
   {"em4x",        CmdLFEM4X,          1, "{ EM4X RFIDs... }"},
   {"flexdemod",   CmdFlexdemod,       1, "Demodulate samples for FlexPass"},
   {"hid",         CmdLFHID,           1, "{ HID RFIDs... }"},
-  {"io",         CmdLFIO,            1, "{ ioProx tags... }"},
+  {"io",                 CmdLFIO,                1, "{ ioProx tags... }"},
   {"indalademod", CmdIndalaDemod,     1, "['224'] -- Demodulate samples for Indala 64 bit UID (option '224' for 224 bit)"},
-  {"indalaclone", CmdIndalaClone,     1, "<UID> ['l']-- Clone Indala to T55x7 (tag must be in antenna)(UID in HEX)(option 'l' for 224 UID"},
+  {"indalaclone", CmdIndalaClone,     0, "<UID> ['l']-- Clone Indala to T55x7 (tag must be in antenna)(UID in HEX)(option 'l' for 224 UID"},
   {"read",        CmdLFRead,          0, "['h' or <divisor>] -- Read 125/134 kHz LF ID-only tag (option 'h' for 134, alternatively: f=12MHz/(divisor+1))"},
   {"sim",         CmdLFSim,           0, "[GAP] -- Simulate LF tag from buffer with optional GAP (in microseconds)"},
   {"simbidir",    CmdLFSimBidir,      0, "Simulate LF tag (with bidirectional data transmission between reader and tag)"},

diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index dd413d2e2899cd97eaed460e15073b8d17eb764f..5d841ae12ace3fd60ff02c5611f73fb2a27a2a89 100644 (file)
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -40,7 +40,10 @@ int CmdHIDDemod(const char *Cmd)
 
 int CmdHIDDemodFSK(const char *Cmd)
 {
+  int findone=0;
   UsbCommand c={CMD_HID_DEMOD_FSK};
+  if(Cmd[0]=='1') findone=1;
+  c.arg[0]=findone;
   SendCommand(&c);
   return 0;
 }
@@ -104,9 +107,9 @@ static command_t CommandTable[] =
 {
   {"help",      CmdHelp,        1, "This help"},
   {"demod",     CmdHIDDemod,    1, "Demodulate HID Prox Card II (not optimal)"},
-  {"fskdemod",  CmdHIDDemodFSK, 1, "Realtime HID FSK demodulator"},
-  {"sim",       CmdHIDSim,      1, "<ID> -- HID tag simulator"},
-  {"clone",     CmdHIDClone,    1, "<ID> ['l'] -- Clone HID to T55x7 (tag must be in antenna)(option 'l' for 84bit ID)"},
+  {"fskdemod",  CmdHIDDemodFSK, 0, "['1'] Realtime HID FSK demodulator (option '1' for one tag only)"},
+  {"sim",       CmdHIDSim,      0, "<ID> -- HID tag simulator"},
+  {"clone",     CmdHIDClone,    0, "<ID> ['l'] -- Clone HID to T55x7 (tag must be in antenna)(option 'l' for 84bit ID)"},
   {NULL, NULL, 0, NULL}
 };
 

diff --git a/client/cmdlfio.c b/client/cmdlfio.c
index a3d79b2ba5a3c8a9af5a8a12575fc5abca0c36c3..7482ad97687c3ac9561943617ce2bcaee292c60a 100644 (file)
--- a/client/cmdlfio.c
+++ b/client/cmdlfio.c
@@ -17,7 +17,10 @@ static int CmdHelp(const char *Cmd);
 
 int CmdIODemodFSK(const char *Cmd)
 {
+  int findone=0;
+  if(Cmd[0]=='1') findone=1;
   UsbCommand c={CMD_IO_DEMOD_FSK};
+  c.arg[0]=findone;
   SendCommand(&c);
   return 0;
 }
@@ -71,8 +74,8 @@ static command_t CommandTable[] =
 {
   {"help",        CmdHelp,            1, "This help"},
   {"demod",      CmdIOProxDemod,     1, "Demodulate Stream"},
-  {"fskdemod",    CmdIODemodFSK,      1, "Demodulate ioProx Tag"},
-  {"clone",      CmdIOClone,         1, "Clone ioProx Tag"},
+  {"fskdemod",    CmdIODemodFSK,      0, "['1'] Realtime IO FSK demodulator (option '1' for one tag only)"},
+  {"clone",      CmdIOClone,         0, "Clone ioProx Tag"},
   {NULL, NULL, 0, NULL}
 };