CHG: Changed cardnumber printing from %d (signed) to %u (unsigned) for AWID50,...

diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index 69b76d1215ab624ad0baf27575841d4ad6fb11a5..74dd5ab8388388223faff6c9c31265349f00fdb8 100644 (file)
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -898,25 +898,25 @@ void CmdAWIDdemodFSK(int findone, int *high, int *low, int ledcontrol)
                                        fc = bytebits_to_byte(dest + 9, 8);
                                        cardnum = bytebits_to_byte(dest + 17, 16);
                                        code1 = bytebits_to_byte(dest + 8,fmtLen);
                                        fc = bytebits_to_byte(dest + 9, 8);
                                        cardnum = bytebits_to_byte(dest + 17, 16);
                                        code1 = bytebits_to_byte(dest + 8,fmtLen);

-                                       Dbprintf("AWID Found - BitLength: %d, FC: %d, Card: %d - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, rawHi2, rawHi, rawLo);
+                                       Dbprintf("AWID Found - BitLength: %d, FC: %d, Card: %u - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, rawHi2, rawHi, rawLo);

                                        break;
                                case 50:
                                        fc = bytebits_to_byte(dest + 9, 16);
                                        cardnum = bytebits_to_byte(dest + 25, 32);
                                        code1 = bytebits_to_byte(dest + 8, (fmtLen-32) );
                                        code2 = bytebits_to_byte(dest + 8 + (fmtLen-32), 32);
                                        break;
                                case 50:
                                        fc = bytebits_to_byte(dest + 9, 16);
                                        cardnum = bytebits_to_byte(dest + 25, 32);
                                        code1 = bytebits_to_byte(dest + 8, (fmtLen-32) );
                                        code2 = bytebits_to_byte(dest + 8 + (fmtLen-32), 32);

-                                       Dbprintf("AWID Found - BitLength: %d, FC: %d, Card: %d - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, code2, rawHi2, rawHi, rawLo);
+                                       Dbprintf("AWID Found - BitLength: %d, FC: %d, Card: %u - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, code2, rawHi2, rawHi, rawLo);

                                        break;
                                default:
                                        if (fmtLen > 32 ) {
                                                cardnum = bytebits_to_byte(dest+8+(fmtLen-17), 16);
                                                code1 = bytebits_to_byte(dest+8,fmtLen-32);
                                                code2 = bytebits_to_byte(dest+8+(fmtLen-32),32);
                                        break;
                                default:
                                        if (fmtLen > 32 ) {
                                                cardnum = bytebits_to_byte(dest+8+(fmtLen-17), 16);
                                                code1 = bytebits_to_byte(dest+8,fmtLen-32);
                                                code2 = bytebits_to_byte(dest+8+(fmtLen-32),32);

-                                               Dbprintf("AWID Found - BitLength: %d -unknown BitLength- (%d) - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, cardnum, code1, code2, rawHi2, rawHi, rawLo);
+                                               Dbprintf("AWID Found - BitLength: %d -unknown BitLength- (%u) - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, cardnum, code1, code2, rawHi2, rawHi, rawLo);

                                        } else {
                                                cardnum = bytebits_to_byte(dest+8+(fmtLen-17), 16);
                                                code1 = bytebits_to_byte(dest+8,fmtLen);
                                        } else {
                                                cardnum = bytebits_to_byte(dest+8+(fmtLen-17), 16);
                                                code1 = bytebits_to_byte(dest+8,fmtLen);

-                                               Dbprintf("AWID Found - BitLength: %d -unknown BitLength- (%d) - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, cardnum, code1, rawHi2, rawHi, rawLo);
+                                               Dbprintf("AWID Found - BitLength: %d -unknown BitLength- (%u) - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, cardnum, code1, rawHi2, rawHi, rawLo);

                                        }
                                        break;          
                        }
                                        }
                                        break;          
                        }

diff --git a/client/cmddata.c b/client/cmddata.c
index 6992c6d92b44f0d63a264a9f4a21f704f8a97c51..d0c2dfb34bfde114f80c0a6ca12a3fc47f7a0f7b 100644 (file)
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -1315,9 +1315,9 @@ int CmdFSKdemodAWID(const char *Cmd)
        // bbbbbbbb w ffffffff cccccccccccccccc w xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
        // |26 bit|   |-117--| |-----142------|
     //
        // bbbbbbbb w ffffffff cccccccccccccccc w xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
        // |26 bit|   |-117--| |-----142------|
     //

-       // 00110010 0 0000011111010000000000000001000100101000100001111 0 00000000 
-       // bbbbbbbb w ffffffffffffffffccccccccccccccccccccccccccccccccc w xxxxxxxx
-       // |50 bit|   |----4000------||-----------2248975-------------| 
+       // 00110010 0 0000111110100000 00000000000100010010100010000111 1 000000000 
+       // bbbbbbbb w ffffffffffffffff cccccccccccccccccccccccccccccccc w xxxxxxxxx
+       // |50 bit|   |----4000------| |-----------2248975------------| 

        // b = format bit len, o = odd parity of last 3 bits
        // f = facility code, c = card number
        // w = wiegand parity
        // b = format bit len, o = odd parity of last 3 bits
        // f = facility code, c = card number
        // w = wiegand parity


@@ -1332,25 +1332,25 @@ int CmdFSKdemodAWID(const char *Cmd)
                        fc = bytebits_to_byte(BitStream + 9, 8);
                        cardnum = bytebits_to_byte(BitStream + 17, 16);
                        code1 = bytebits_to_byte(BitStream + 8,fmtLen);
                        fc = bytebits_to_byte(BitStream + 9, 8);
                        cardnum = bytebits_to_byte(BitStream + 17, 16);
                        code1 = bytebits_to_byte(BitStream + 8,fmtLen);

-                       PrintAndLog("AWID Found - BitLength: %d, FC: %d, Card: %d - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, rawHi2, rawHi, rawLo);
+                       PrintAndLog("AWID Found - BitLength: %d, FC: %d, Card: %u - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, rawHi2, rawHi, rawLo);

                        break;
                case 50:
                        fc = bytebits_to_byte(BitStream + 9, 16);
                        cardnum = bytebits_to_byte(BitStream + 25, 32);
                        code1 = bytebits_to_byte(BitStream + 8, (fmtLen-32) );
                        code2 = bytebits_to_byte(BitStream + 8 + (fmtLen-32), 32);
                        break;
                case 50:
                        fc = bytebits_to_byte(BitStream + 9, 16);
                        cardnum = bytebits_to_byte(BitStream + 25, 32);
                        code1 = bytebits_to_byte(BitStream + 8, (fmtLen-32) );
                        code2 = bytebits_to_byte(BitStream + 8 + (fmtLen-32), 32);

-                       PrintAndLog("AWID Found - BitLength: %d, FC: %d, Card: %d - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, code2, rawHi2, rawHi, rawLo);
+                       PrintAndLog("AWID Found - BitLength: %d, FC: %d, Card: %u - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, code2, rawHi2, rawHi, rawLo);

                        break;
                default:
                        if (fmtLen > 32 ) {
                                cardnum = bytebits_to_byte(BitStream+8+(fmtLen-17), 16);
                                code1 = bytebits_to_byte(BitStream+8,fmtLen-32);
                                code2 = bytebits_to_byte(BitStream+8+(fmtLen-32),32);
                        break;
                default:
                        if (fmtLen > 32 ) {
                                cardnum = bytebits_to_byte(BitStream+8+(fmtLen-17), 16);
                                code1 = bytebits_to_byte(BitStream+8,fmtLen-32);
                                code2 = bytebits_to_byte(BitStream+8+(fmtLen-32),32);

-                               PrintAndLog("AWID Found - BitLength: %d -unknown BitLength- (%d) - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, cardnum, code1, code2, rawHi2, rawHi, rawLo);
+                               PrintAndLog("AWID Found - BitLength: %d -unknown BitLength- (%u) - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, cardnum, code1, code2, rawHi2, rawHi, rawLo);

                        } else {
                                cardnum = bytebits_to_byte(BitStream+8+(fmtLen-17), 16);
                                code1 = bytebits_to_byte(BitStream+8,fmtLen);
                        } else {
                                cardnum = bytebits_to_byte(BitStream+8+(fmtLen-17), 16);
                                code1 = bytebits_to_byte(BitStream+8,fmtLen);

-                               PrintAndLog("AWID Found - BitLength: %d -unknown BitLength- (%d) - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, cardnum, code1, rawHi2, rawHi, rawLo);
+                               PrintAndLog("AWID Found - BitLength: %d -unknown BitLength- (%u) - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, cardnum, code1, rawHi2, rawHi, rawLo);

                        }
                        break;          
        }
                        }
                        break;          
        }