update changelog

[proxmark3-svn] / client / cmdlft55xx.c

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 57540bd82913b6ef9bd90769c97ee03885e63aed..4d1eaa00d19b635d2827b58357116ac9ff18b315 100644 (file)
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -246,7 +246,7 @@ int CmdT55xxReadBlock(const char *Cmd) {
        WaitForResponse(CMD_ACK,NULL);\r
        setGraphBuf(got, 12000);\r
        DemodBufferLen=0;\r
        WaitForResponse(CMD_ACK,NULL);\r
        setGraphBuf(got, 12000);\r
        DemodBufferLen=0;\r

-       if (!DecodeT55xxBlock()) return 0;\r
+       if (!DecodeT55xxBlock()) return 3;\r

        char blk[10]={0};\r
        sprintf(blk,"%d", block);\r
        printT55xxBlock(blk);\r
        char blk[10]={0};\r
        sprintf(blk,"%d", block);\r
        printT55xxBlock(blk);\r


@@ -752,12 +752,10 @@ int CmdT55xxReadTrace(const char *Cmd)
        uint32_t icr     = PackBits(si, 3, DemodBuffer); si += 3;\r
        uint32_t year    = PackBits(si, 4, DemodBuffer); si += 4;\r
        uint32_t quarter = PackBits(si, 2, DemodBuffer); si += 2;\r
        uint32_t icr     = PackBits(si, 3, DemodBuffer); si += 3;\r
        uint32_t year    = PackBits(si, 4, DemodBuffer); si += 4;\r
        uint32_t quarter = PackBits(si, 2, DemodBuffer); si += 2;\r

-       uint32_t lotid    = PackBits(si, 12, DemodBuffer); si += 12;\r
+       uint32_t lotid    = PackBits(si, 14, DemodBuffer); si += 14;\r

        uint32_t wafer   = PackBits(si, 5, DemodBuffer); si += 5;\r
        uint32_t dw      = PackBits(si, 15, DemodBuffer); \r
        \r
        uint32_t wafer   = PackBits(si, 5, DemodBuffer); si += 5;\r
        uint32_t dw      = PackBits(si, 15, DemodBuffer); \r
        \r

-       year += 2000;\r
-       \r

        PrintAndLog("");\r
        PrintAndLog("-- T55xx Trace Information ----------------------------------");\r
        PrintAndLog("-------------------------------------------------------------");\r
        PrintAndLog("");\r
        PrintAndLog("-- T55xx Trace Information ----------------------------------");\r
        PrintAndLog("-------------------------------------------------------------");\r


@@ -766,7 +764,7 @@ int CmdT55xxReadTrace(const char *Cmd)
        PrintAndLog(" CID                                     : 0x%02X (%d) - %s", cid, cid, GetModelStrFromCID(cid));\r
        PrintAndLog(" ICR IC Revision                         : %d",icr );\r
        PrintAndLog(" Manufactured");\r
        PrintAndLog(" CID                                     : 0x%02X (%d) - %s", cid, cid, GetModelStrFromCID(cid));\r
        PrintAndLog(" ICR IC Revision                         : %d",icr );\r
        PrintAndLog(" Manufactured");\r

-       PrintAndLog("     Year/Quarter : %d/%d",year, quarter );\r
+       PrintAndLog("     Year/Quarter : 20?%d/%d",year, quarter);\r

        PrintAndLog("     Lot ID       : %d", lotid );\r
        PrintAndLog("     Wafer number : %d", wafer);\r
        PrintAndLog("     Die Number   : %d", dw);\r
        PrintAndLog("     Lot ID       : %d", lotid );\r
        PrintAndLog("     Wafer number : %d", wafer);\r
        PrintAndLog("     Die Number   : %d", dw);\r


@@ -1009,7 +1007,7 @@ char * GetModulationStr( uint32_t id){
                        sprintf(retStr,"%d - Biphase",id);\r
                        break;\r
                case 0x18:\r
                        sprintf(retStr,"%d - Biphase",id);\r
                        break;\r
                case 0x18:\r

-                       sprintf(retStr,"%d - Biphase a",id);\r
+                       sprintf(retStr,"%d - Biphase a - AKA Conditional Dephase Encoding(CDP)",id);\r

                        break;\r
                case 17:\r
                        sprintf(retStr,"%d - Reserved",id);\r
                        break;\r
                case 17:\r
                        sprintf(retStr,"%d - Reserved",id);\r


@@ -1071,7 +1069,7 @@ char * GetSelectedModulationStr( uint8_t id){
                        sprintf(retStr,"BIPHASE");\r
                        break;\r
                case DEMOD_BIa:\r
                        sprintf(retStr,"BIPHASE");\r
                        break;\r
                case DEMOD_BIa:\r

-                       sprintf(retStr,"BIPHASEa");\r
+                       sprintf(retStr,"BIPHASEa - (CDP)");\r

                        break;\r
                default:\r
                        sprintf(retStr,"(Unknown)");\r
                        break;\r
                default:\r
                        sprintf(retStr,"(Unknown)");\r