Merge pull request #144 from dnet/makefile-paren-fix

[proxmark3-svn] / client / cmdlft55xx.c

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index b6b29c053240496b512951d4188f37c23997da29..887547248abe6e3945a4f6153bbcd493972d0e93 100644 (file)
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -10,6 +10,7 @@
 #include <stdio.h>\r
 #include <string.h>\r
 #include <inttypes.h>\r
 #include <stdio.h>\r
 #include <string.h>\r
 #include <inttypes.h>\r

+#include <time.h>\r

 #include "proxmark3.h"\r
 #include "ui.h"\r
 #include "graph.h"\r
 #include "proxmark3.h"\r
 #include "ui.h"\r
 #include "graph.h"\r


@@ -36,7 +37,7 @@ int usage_t55xx_config(){
        PrintAndLog("Options:        ");\r
        PrintAndLog("       h                        This help");\r
        PrintAndLog("       b <8|16|32|40|50|64|100|128>     Set bitrate");\r
        PrintAndLog("Options:        ");\r
        PrintAndLog("       h                        This help");\r
        PrintAndLog("       b <8|16|32|40|50|64|100|128>     Set bitrate");\r

-       PrintAndLog("       d <FSK|FSK1|FSK1a|FSK2|FSK2a|ASK|PSK1|PSK2|NZ|BI|BIa>  Set demodulation FSK / ASK / PSK / NZ / Biphase / Biphase A");\r
+       PrintAndLog("       d <FSK|FSK1|FSK1a|FSK2|FSK2a|ASK|PSK1|PSK2|NRZ|BI|BIa>  Set demodulation FSK / ASK / PSK / NRZ / Biphase / Biphase A");\r

        PrintAndLog("       i [1]                            Invert data signal, defaults to normal");\r
        PrintAndLog("       o [offset]                       Set offset, where data should start decode in bitstream");\r
        PrintAndLog("");\r
        PrintAndLog("       i [1]                            Invert data signal, defaults to normal");\r
        PrintAndLog("       o [offset]                       Set offset, where data should start decode in bitstream");\r
        PrintAndLog("");\r


@@ -49,24 +50,24 @@ int usage_t55xx_config(){
 }\r
 int usage_t55xx_read(){\r
        PrintAndLog("Usage:  lf t55xx read <block> <password>");\r
 }\r
 int usage_t55xx_read(){\r
        PrintAndLog("Usage:  lf t55xx read <block> <password>");\r

-    PrintAndLog("     <block>, block number to read. Between 0-7");\r
-    PrintAndLog("     <password>, OPTIONAL password (8 hex characters)");\r
-    PrintAndLog("");\r
+       PrintAndLog("     <block>, block number to read. Between 0-7");\r
+       PrintAndLog("     <password>, OPTIONAL password (8 hex characters)");\r
+       PrintAndLog("");\r

        PrintAndLog("Examples:");\r
        PrintAndLog("Examples:");\r

-    PrintAndLog("      lf t55xx read 0           - read data from block 0");\r
+       PrintAndLog("      lf t55xx read 0           - read data from block 0");\r

        PrintAndLog("      lf t55xx read 0 feedbeef  - read data from block 0 password feedbeef");\r
        PrintAndLog("");\r
        return 0;\r
 }\r
 int usage_t55xx_write(){\r
        PrintAndLog("Usage:  lf t55xx wr <block> <data> [password]");\r
        PrintAndLog("      lf t55xx read 0 feedbeef  - read data from block 0 password feedbeef");\r
        PrintAndLog("");\r
        return 0;\r
 }\r
 int usage_t55xx_write(){\r
        PrintAndLog("Usage:  lf t55xx wr <block> <data> [password]");\r

-    PrintAndLog("     <block>, block number to read. Between 0-7");\r
+       PrintAndLog("     <block>, block number to write. Between 0-7");\r

        PrintAndLog("     <data>,  4 bytes of data to write (8 hex characters)");\r
        PrintAndLog("     <data>,  4 bytes of data to write (8 hex characters)");\r

-    PrintAndLog("     [password], OPTIONAL password 4bytes (8 hex characters)");\r
-    PrintAndLog("");\r
+       PrintAndLog("     [password], OPTIONAL password 4bytes (8 hex characters)");\r
+       PrintAndLog("");\r

        PrintAndLog("Examples:");\r
        PrintAndLog("Examples:");\r

-    PrintAndLog("      lf t55xx wd 3 11223344           - write 11223344 to block 3");\r
-       PrintAndLog("      lf t55xx wd 3 11223344 feedbeef  - write 11223344 to block 3 password feedbeef");\r
+       PrintAndLog("      lf t55xx wr 3 11223344           - write 11223344 to block 3");\r
+       PrintAndLog("      lf t55xx wr 3 11223344 feedbeef  - write 11223344 to block 3 password feedbeef");\r

        PrintAndLog("");\r
        return 0;\r
 }\r
        PrintAndLog("");\r
        return 0;\r
 }\r


@@ -147,31 +148,37 @@ int CmdT55xxSetConfig(const char *Cmd) {
                        param_getstr(Cmd, cmdp+1, modulation);\r
                        cmdp += 2;\r
 \r
                        param_getstr(Cmd, cmdp+1, modulation);\r
                        cmdp += 2;\r
 \r

-                       if ( strcmp(modulation, "FSK" ) == 0)\r
+                       if ( strcmp(modulation, "FSK" ) == 0) {\r

                                config.modulation = DEMOD_FSK;\r
                                config.modulation = DEMOD_FSK;\r

-                       else if ( strcmp(modulation, "FSK1" ) == 0)\r
+                       } else if ( strcmp(modulation, "FSK1" ) == 0) {\r

                                config.modulation = DEMOD_FSK1;\r
                                config.modulation = DEMOD_FSK1;\r

-                       else if ( strcmp(modulation, "FSK1a" ) == 0)\r
+                               config.inverted=1;\r
+                       } else if ( strcmp(modulation, "FSK1a" ) == 0) {\r

                                config.modulation = DEMOD_FSK1a;\r
                                config.modulation = DEMOD_FSK1a;\r

-                       else if ( strcmp(modulation, "FSK2" ) == 0)\r
+                               config.inverted=0;\r
+                       } else if ( strcmp(modulation, "FSK2" ) == 0) {\r

                                config.modulation = DEMOD_FSK2;\r
                                config.modulation = DEMOD_FSK2;\r

-                       else if ( strcmp(modulation, "FSK2a" ) == 0)\r
+                               config.inverted=0;\r
+                       } else if ( strcmp(modulation, "FSK2a" ) == 0) {\r

                                config.modulation = DEMOD_FSK2a;\r
                                config.modulation = DEMOD_FSK2a;\r

-                       else if ( strcmp(modulation, "ASK" ) == 0)\r
+                               config.inverted=1;\r
+                       } else if ( strcmp(modulation, "ASK" ) == 0) {\r

                                config.modulation = DEMOD_ASK;\r
                                config.modulation = DEMOD_ASK;\r

-                       else if ( strcmp(modulation, "NRZ" ) == 0)\r
+                       } else if ( strcmp(modulation, "NRZ" ) == 0) {\r

                                config.modulation = DEMOD_NRZ;\r
                                config.modulation = DEMOD_NRZ;\r

-                       else if ( strcmp(modulation, "PSK1" ) == 0)\r
+                       } else if ( strcmp(modulation, "PSK1" ) == 0) {\r

                                config.modulation = DEMOD_PSK1;\r
                                config.modulation = DEMOD_PSK1;\r

-                       else if ( strcmp(modulation, "PSK2" ) == 0)\r
+                       } else if ( strcmp(modulation, "PSK2" ) == 0) {\r

                                config.modulation = DEMOD_PSK2;\r
                                config.modulation = DEMOD_PSK2;\r

-                       else if ( strcmp(modulation, "PSK3" ) == 0)\r
+                       } else if ( strcmp(modulation, "PSK3" ) == 0) {\r

                                config.modulation = DEMOD_PSK3;\r
                                config.modulation = DEMOD_PSK3;\r

-                       else if ( strcmp(modulation, "BIa" ) == 0)\r
+                       } else if ( strcmp(modulation, "BIa" ) == 0) {\r

                                config.modulation = DEMOD_BIa;\r
                                config.modulation = DEMOD_BIa;\r

-                       else if ( strcmp(modulation, "BI" ) == 0)\r
+                               config.inverted=1;\r
+                       } else if ( strcmp(modulation, "BI" ) == 0) {\r

                                config.modulation = DEMOD_BI;\r
                                config.modulation = DEMOD_BI;\r

-                       else {\r
+                               config.inverted=0;\r
+                       } else {\r

                                PrintAndLog("Unknown modulation '%s'", modulation);\r
                                errors = TRUE;\r
                        }\r
                                PrintAndLog("Unknown modulation '%s'", modulation);\r
                                errors = TRUE;\r
                        }\r


@@ -235,6 +242,7 @@ int CmdT55xxReadBlock(const char *Cmd) {
                c.d.asBytes[0] = 0x1; \r
        }\r
 \r
                c.d.asBytes[0] = 0x1; \r
        }\r
 \r

+       clearCommandBuffer();\r

        SendCommand(&c);\r
        if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {\r
                PrintAndLog("command execution time out");\r
        SendCommand(&c);\r
        if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {\r
                PrintAndLog("command execution time out");\r


@@ -255,77 +263,51 @@ int CmdT55xxReadBlock(const char *Cmd) {
 \r
 bool DecodeT55xxBlock(){\r
        \r
 \r
 bool DecodeT55xxBlock(){\r
        \r

-       char buf[8] = {0x00};\r
+       char buf[30] = {0x00};\r

        char *cmdStr = buf;\r
        int ans = 0;\r
        uint8_t bitRate[8] = {8,16,32,40,50,64,100,128};\r
        char *cmdStr = buf;\r
        int ans = 0;\r
        uint8_t bitRate[8] = {8,16,32,40,50,64,100,128};\r

-\r

        DemodBufferLen = 0x00;\r
 \r
        DemodBufferLen = 0x00;\r
 \r

+       //trim 1/2 a clock from beginning\r
+       snprintf(cmdStr, sizeof(buf),"%d", bitRate[config.bitrate]/2 );\r
+       CmdLtrim(cmdStr);\r

        switch( config.modulation ){\r
                case DEMOD_FSK:\r
        switch( config.modulation ){\r
                case DEMOD_FSK:\r

-                       //CmdLtrim("26");\r
-                       sprintf(cmdStr,"%d", bitRate[config.bitrate]/2 );\r
-                       CmdLtrim(cmdStr);                       \r
-                       sprintf(cmdStr,"%d %d", bitRate[config.bitrate], config.inverted );\r
+                       snprintf(cmdStr, sizeof(buf),"%d %d", bitRate[config.bitrate], config.inverted );\r

                        ans = FSKrawDemod(cmdStr, FALSE);\r
                        break;\r
                case DEMOD_FSK1:\r
                        ans = FSKrawDemod(cmdStr, FALSE);\r
                        break;\r
                case DEMOD_FSK1:\r

-                       //CmdLtrim("26");\r
-                       sprintf(cmdStr,"%d", bitRate[config.bitrate]/2 );\r
-                       CmdLtrim(cmdStr);                       \r
-                       sprintf(cmdStr,"%d 1 8 5", bitRate[config.bitrate] );\r
-                       ans = FSKrawDemod(cmdStr, FALSE);\r
-                       break;\r

                case DEMOD_FSK1a:\r
                case DEMOD_FSK1a:\r

-                       //CmdLtrim("26");\r
-                       sprintf(cmdStr,"%d", bitRate[config.bitrate]/2 );\r
-                       CmdLtrim(cmdStr);                       \r
-                       sprintf(cmdStr,"%d 0 8 5", bitRate[config.bitrate] );\r
+                       snprintf(cmdStr, sizeof(buf),"%d %d 8 5", bitRate[config.bitrate], config.inverted );\r

                        ans = FSKrawDemod(cmdStr, FALSE);\r
                        break;\r
                case DEMOD_FSK2:\r
                        ans = FSKrawDemod(cmdStr, FALSE);\r
                        break;\r
                case DEMOD_FSK2:\r

-                       //CmdLtrim("26");\r
-                       sprintf(cmdStr,"%d", bitRate[config.bitrate]/2 );\r
-                       CmdLtrim(cmdStr);                       \r
-                       sprintf(cmdStr,"%d 0 10 8", bitRate[config.bitrate] );\r
-                       ans = FSKrawDemod(cmdStr, FALSE);\r
-                       break;\r

                case DEMOD_FSK2a:\r
                case DEMOD_FSK2a:\r

-                       //CmdLtrim("26");\r
-                       sprintf(cmdStr,"%d", bitRate[config.bitrate]/2 );\r
-                       CmdLtrim(cmdStr);                       \r
-                       sprintf(cmdStr,"%d 1 10 8", bitRate[config.bitrate] );\r
+                       snprintf(cmdStr, sizeof(buf),"%d %d 10 8", bitRate[config.bitrate], config.inverted );\r

                        ans = FSKrawDemod(cmdStr, FALSE);\r
                        break;\r
                case DEMOD_ASK:\r
                        ans = FSKrawDemod(cmdStr, FALSE);\r
                        break;\r
                case DEMOD_ASK:\r

-                       sprintf(cmdStr,"%d %d 1", bitRate[config.bitrate], config.inverted );\r
-                       ans = ASKmanDemod(cmdStr, FALSE, FALSE);\r
+                       snprintf(cmdStr, sizeof(buf),"%d %d 0", bitRate[config.bitrate], config.inverted );\r
+                       ans = ASKDemod(cmdStr, FALSE, FALSE, 1);\r

                        break;\r
                case DEMOD_PSK1:\r
                        break;\r
                case DEMOD_PSK1:\r

-                       sprintf(cmdStr,"%d %d 1", bitRate[config.bitrate], config.inverted );\r
-                       ans = PSKDemod(cmdStr, FALSE);\r
-                       break;\r
-               case DEMOD_PSK2:\r
-                       sprintf(cmdStr,"%d 1", bitRate[config.bitrate] );\r
+                       snprintf(cmdStr, sizeof(buf),"%d %d 0", bitRate[config.bitrate], config.inverted );\r

                        ans = PSKDemod(cmdStr, FALSE);\r
                        ans = PSKDemod(cmdStr, FALSE);\r

-                       psk1TOpsk2(DemodBuffer, DemodBufferLen);\r

                        break;\r
                        break;\r

-               case DEMOD_PSK3:\r
-                       sprintf(cmdStr,"%d %d 1", bitRate[config.bitrate], config.inverted );\r
+               case DEMOD_PSK2: //inverted won't affect this\r
+               case DEMOD_PSK3: //not fully implemented\r
+                       snprintf(cmdStr, sizeof(buf),"%d 0 1", bitRate[config.bitrate] );\r

                        ans = PSKDemod(cmdStr, FALSE);\r
                        psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
                        break;\r
                case DEMOD_NRZ:\r
                        ans = PSKDemod(cmdStr, FALSE);\r
                        psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
                        break;\r
                case DEMOD_NRZ:\r

-                       sprintf(cmdStr,"%d %d 1", bitRate[config.bitrate], config.inverted );\r
+                       snprintf(cmdStr, sizeof(buf),"%d %d 1", bitRate[config.bitrate], config.inverted );\r

                        ans = NRZrawDemod(cmdStr, FALSE);\r
                        break;\r
                case DEMOD_BI:\r
                        ans = NRZrawDemod(cmdStr, FALSE);\r
                        break;\r
                case DEMOD_BI:\r

-                       sprintf(cmdStr,"0 %d 0 1", bitRate[config.bitrate] );\r
-                       ans = ASKbiphaseDemod(cmdStr, FALSE);\r
-                       break;\r

                case DEMOD_BIa:\r
                case DEMOD_BIa:\r

-                       sprintf(cmdStr,"0 %d 1 1", bitRate[config.bitrate] );\r
+                       snprintf(cmdStr, sizeof(buf),"0 %d %d 0", bitRate[config.bitrate], config.inverted );\r

                        ans = ASKbiphaseDemod(cmdStr, FALSE);\r
                        break;\r
                default:\r
                        ans = ASKbiphaseDemod(cmdStr, FALSE);\r
                        break;\r
                default:\r


@@ -354,114 +336,141 @@ bool tryDetectModulation(){
        char cmdStr[8] = {0};\r
        uint8_t hits = 0;\r
        t55xx_conf_block_t tests[15];\r
        char cmdStr[8] = {0};\r
        uint8_t hits = 0;\r
        t55xx_conf_block_t tests[15];\r

-       \r
+       int bitRate=0;\r
+       uint8_t fc1 = 0, fc2 = 0, clk=0;\r
+       save_restoreGB(1);\r

        if (GetFskClock("", FALSE, FALSE)){ \r
        if (GetFskClock("", FALSE, FALSE)){ \r

-               uint8_t fc1 = 0, fc2 = 0, clk=0;\r

                fskClocks(&fc1, &fc2, &clk, FALSE);\r
                sprintf(cmdStr,"%d", clk/2);\r
                CmdLtrim(cmdStr);\r
                fskClocks(&fc1, &fc2, &clk, FALSE);\r
                sprintf(cmdStr,"%d", clk/2);\r
                CmdLtrim(cmdStr);\r

-               if ( FSKrawDemod("0 0", FALSE) && test(DEMOD_FSK, &tests[hits].offset)){\r
+               if ( FSKrawDemod("0 0", FALSE) && test(DEMOD_FSK, &tests[hits].offset, &bitRate)){\r

                        tests[hits].modulation = DEMOD_FSK;\r
                        if (fc1==8 && fc2 == 5)\r
                                tests[hits].modulation = DEMOD_FSK1a;\r
                        else if (fc1==10 && fc2 == 8)\r
                                tests[hits].modulation = DEMOD_FSK2;\r
                        tests[hits].modulation = DEMOD_FSK;\r
                        if (fc1==8 && fc2 == 5)\r
                                tests[hits].modulation = DEMOD_FSK1a;\r
                        else if (fc1==10 && fc2 == 8)\r
                                tests[hits].modulation = DEMOD_FSK2;\r

-\r
+                       tests[hits].bitrate = bitRate;\r

                        tests[hits].inverted = FALSE;\r
                        tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
                        ++hits;\r
                }\r
                        tests[hits].inverted = FALSE;\r
                        tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
                        ++hits;\r
                }\r

-               if ( FSKrawDemod("0 1", FALSE) && test(DEMOD_FSK, &tests[hits].offset)) {\r
+               if ( FSKrawDemod("0 1", FALSE) && test(DEMOD_FSK, &tests[hits].offset, &bitRate)) {\r

                        tests[hits].modulation = DEMOD_FSK;\r
                        tests[hits].modulation = DEMOD_FSK;\r

-                       if (fc1==8 && fc2 == 5)\r
+                       if (fc1 == 8 && fc2 == 5)\r

                                tests[hits].modulation = DEMOD_FSK1;\r
                                tests[hits].modulation = DEMOD_FSK1;\r

-                       else if (fc1==10 && fc2 == 8)\r
+                       else if (fc1 == 10 && fc2 == 8)\r

                                tests[hits].modulation = DEMOD_FSK2a;\r
 \r
                                tests[hits].modulation = DEMOD_FSK2a;\r
 \r

+                       tests[hits].bitrate = bitRate;\r

                        tests[hits].inverted = TRUE;\r
                        tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
                        ++hits;\r
                }\r
        } else {\r
                        tests[hits].inverted = TRUE;\r
                        tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
                        ++hits;\r
                }\r
        } else {\r

-               if ( ASKmanDemod("0 0 1", FALSE, FALSE) && test(DEMOD_ASK, &tests[hits].offset)) {\r
-                       tests[hits].modulation = DEMOD_ASK;\r
-                       tests[hits].inverted = FALSE;\r
-                       tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
-                       ++hits;\r
+               clk = GetAskClock("", FALSE, FALSE);\r
+               if (clk>0) {\r
+                       sprintf(cmdStr,"%d", clk/2);\r
+                       CmdLtrim(cmdStr);\r
+                       if ( ASKDemod("0 0 0", FALSE, FALSE, 1) && test(DEMOD_ASK, &tests[hits].offset, &bitRate)) {\r
+                               tests[hits].modulation = DEMOD_ASK;\r
+                               tests[hits].bitrate = bitRate;\r
+                               tests[hits].inverted = FALSE;\r
+                               tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
+                               ++hits;\r

                        }\r
                        }\r

-\r
-               if ( ASKmanDemod("0 1 1", FALSE, FALSE)  && test(DEMOD_ASK, &tests[hits].offset)) {\r
-                       tests[hits].modulation = DEMOD_ASK;\r
-                       tests[hits].inverted = TRUE;\r
-                       tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
-                       ++hits;\r
+                       if ( ASKDemod("0 1 0", FALSE, FALSE, 1)  && test(DEMOD_ASK, &tests[hits].offset, &bitRate)) {\r
+                               tests[hits].modulation = DEMOD_ASK;\r
+                               tests[hits].bitrate = bitRate;\r
+                               tests[hits].inverted = TRUE;\r
+                               tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
+                               ++hits;\r
+                       }\r
+                       if ( ASKbiphaseDemod("0 0 0 0", FALSE) && test(DEMOD_BI, &tests[hits].offset, &bitRate) ) {\r
+                               tests[hits].modulation = DEMOD_BI;\r
+                               tests[hits].bitrate = bitRate;\r
+                               tests[hits].inverted = FALSE;\r
+                               tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
+                               ++hits;\r
+                       }\r
+                       if ( ASKbiphaseDemod("0 0 1 0", FALSE) && test(DEMOD_BIa, &tests[hits].offset, &bitRate) ) {\r
+                               tests[hits].modulation = DEMOD_BIa;\r
+                               tests[hits].bitrate = bitRate;\r
+                               tests[hits].inverted = TRUE;\r
+                               tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
+                               ++hits;\r

                        }\r
                        }\r

-               \r
-               if ( NRZrawDemod("0 0 1", FALSE)  && test(DEMOD_NRZ, &tests[hits].offset)) {\r
-                       tests[hits].modulation = DEMOD_NRZ;\r
-                       tests[hits].inverted = FALSE;\r
-                       tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
-                       ++hits;\r

                }\r
                }\r

+               //undo trim from ask\r
+               save_restoreGB(0);\r
+               clk = GetNrzClock("", FALSE, FALSE);\r
+               if (clk>0) {\r
+                       sprintf(cmdStr,"%d", clk/2);\r
+                       CmdLtrim(cmdStr);\r
+                       if ( NRZrawDemod("0 0 1", FALSE)  && test(DEMOD_NRZ, &tests[hits].offset, &bitRate)) {\r
+                               tests[hits].modulation = DEMOD_NRZ;\r
+                               tests[hits].bitrate = bitRate;\r
+                               tests[hits].inverted = FALSE;\r
+                               tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
+                               ++hits;\r
+                       }\r

 \r
 \r

-               if ( NRZrawDemod("0 1 1", FALSE)  && test(DEMOD_NRZ, &tests[hits].offset)) {\r
-                       tests[hits].modulation = DEMOD_NRZ;\r
-                       tests[hits].inverted = TRUE;\r
-                       tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
-                       ++hits;\r
+                       if ( NRZrawDemod("0 1 1", FALSE)  && test(DEMOD_NRZ, &tests[hits].offset, &bitRate)) {\r
+                               tests[hits].modulation = DEMOD_NRZ;\r
+                               tests[hits].bitrate = bitRate;\r
+                               tests[hits].inverted = TRUE;\r
+                               tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
+                               ++hits;\r

                        }\r
                        }\r

-               \r
-               if ( PSKDemod("0 0 1", FALSE) && test(DEMOD_PSK1, &tests[hits].offset)) {\r
-                       tests[hits].modulation = DEMOD_PSK1;\r
-                       tests[hits].inverted = FALSE;\r
-                       tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
-                       ++hits;\r

                }\r
                \r
                }\r
                \r

-               if ( PSKDemod("0 1 1", FALSE) && test(DEMOD_PSK1, &tests[hits].offset)) {\r
-                       tests[hits].modulation = DEMOD_PSK1;\r
-                       tests[hits].inverted = TRUE;\r
-                       tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
-                       ++hits;\r
-               }\r
-\r
-               // PSK2 - needs a call to psk1TOpsk2.\r
-               if ( PSKDemod("0 0 1", FALSE)) {\r
-                       psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
-                       if (test(DEMOD_PSK2, &tests[hits].offset)){\r
-                               tests[hits].modulation = DEMOD_PSK2;\r
+               //undo trim from nrz\r
+               save_restoreGB(0);\r
+               clk = GetPskClock("", FALSE, FALSE);\r
+               if (clk>0) {\r
+                       PrintAndLog("clk %d",clk);\r
+                       sprintf(cmdStr,"%d", clk/2);\r
+                       CmdLtrim(cmdStr);       \r
+                       if ( PSKDemod("0 0 1", FALSE) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate)) {\r
+                               tests[hits].modulation = DEMOD_PSK1;\r
+                               tests[hits].bitrate = bitRate;\r

                                tests[hits].inverted = FALSE;\r
                                tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
                                ++hits;\r
                        }\r
                                tests[hits].inverted = FALSE;\r
                                tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
                                ++hits;\r
                        }\r

-               } // inverse waves does not affect this demod\r
-\r
-               // PSK3 - needs a call to psk1TOpsk2.\r
-               if ( PSKDemod("0 0 1", FALSE)) {\r
-                       psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
-                       if (test(DEMOD_PSK3, &tests[hits].offset)){\r
-                               tests[hits].modulation = DEMOD_PSK3;\r
-                               tests[hits].inverted = FALSE;\r
+                       if ( PSKDemod("0 1 1", FALSE) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate)) {\r
+                               tests[hits].modulation = DEMOD_PSK1;\r
+                               tests[hits].bitrate = bitRate;\r
+                               tests[hits].inverted = TRUE;\r

                                tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
                                ++hits;\r
                        }\r
                                tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
                                ++hits;\r
                        }\r

-               } // inverse waves does not affect this demod\r
-       \r
-               if ( ASKbiphaseDemod("0 0 0 1", FALSE) && test(DEMOD_BI, &tests[hits].offset) ) {\r
-                       tests[hits].modulation = DEMOD_BI;\r
-                       tests[hits].inverted = FALSE;\r
-                       tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
-                       ++hits;\r
-               }\r
-               if ( ASKbiphaseDemod("0 0 1 1", FALSE) && test(DEMOD_BIa, &tests[hits].offset) ) {\r
-                       tests[hits].modulation = DEMOD_BIa;\r
-                       tests[hits].inverted = TRUE;\r
-                       tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
-                       ++hits;\r
+                       // PSK2 - needs a call to psk1TOpsk2.\r
+                       if ( PSKDemod("0 0 1", FALSE)) {\r
+                               psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
+                               if (test(DEMOD_PSK2, &tests[hits].offset, &bitRate)){\r
+                                       tests[hits].modulation = DEMOD_PSK2;\r
+                                       tests[hits].bitrate = bitRate;\r
+                                       tests[hits].inverted = FALSE;\r
+                                       tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
+                                       ++hits;\r
+                               }\r
+                       } // inverse waves does not affect this demod\r
+                       // PSK3 - needs a call to psk1TOpsk2.\r
+                       if ( PSKDemod("0 0 1", FALSE)) {\r
+                               psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
+                               if (test(DEMOD_PSK3, &tests[hits].offset, &bitRate)){\r
+                                       tests[hits].modulation = DEMOD_PSK3;\r
+                                       tests[hits].bitrate = bitRate;\r
+                                       tests[hits].inverted = FALSE;\r
+                                       tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
+                                       ++hits;\r
+                               }\r
+                       } // inverse waves does not affect this demod\r

                }\r
        }               \r
        if ( hits == 1) {\r
                config.modulation = tests[0].modulation;\r
                }\r
        }               \r
        if ( hits == 1) {\r
                config.modulation = tests[0].modulation;\r

+               config.bitrate = tests[0].bitrate;\r

                config.inverted = tests[0].inverted;\r
                config.offset = tests[0].offset;\r
                config.block0 = tests[0].block0;\r
                config.inverted = tests[0].inverted;\r
                config.offset = tests[0].offset;\r
                config.block0 = tests[0].block0;\r


@@ -516,81 +525,32 @@ bool testBitRate(uint8_t readRate, uint8_t mod){
        uint8_t detRate = 0;\r
        switch( mod ){\r
                case DEMOD_FSK:\r
        uint8_t detRate = 0;\r
        switch( mod ){\r
                case DEMOD_FSK:\r

-                       detRate = GetFskClock("",FALSE, FALSE); \r
-                       if (expected[readRate] == detRate) {\r
-                               config.bitrate = readRate;\r
-                               return TRUE;\r
-                       }\r
-                       break;\r

                case DEMOD_FSK1:\r
                case DEMOD_FSK1:\r

-                       detRate = GetFskClock("",FALSE, FALSE); \r
-                       if (expected[readRate] == detRate) {\r
-                               config.bitrate = readRate;\r
-                               return TRUE;\r
-                       }\r
-                       break;\r

                case DEMOD_FSK1a:\r
                case DEMOD_FSK1a:\r

-                       detRate = GetFskClock("",FALSE, FALSE); \r
-                       if (expected[readRate] == detRate) {\r
-                               config.bitrate = readRate;\r
-                               return TRUE;\r
-                       }\r
-                       break;\r

                case DEMOD_FSK2:\r
                case DEMOD_FSK2:\r

-                       detRate = GetFskClock("",FALSE, FALSE); \r
-                       if (expected[readRate] == detRate) {\r
-                               config.bitrate = readRate;\r
-                               return TRUE;\r
-                       }\r
-                       break;\r

                case DEMOD_FSK2a:\r
                        detRate = GetFskClock("",FALSE, FALSE); \r
                case DEMOD_FSK2a:\r
                        detRate = GetFskClock("",FALSE, FALSE); \r

-                       if (expected[readRate] == detRate) {\r
-                               config.bitrate = readRate;\r
+                       if (expected[readRate] == detRate) \r

                                return TRUE;\r
                                return TRUE;\r

-                       }\r

                        break;\r
                case DEMOD_ASK:\r
                        break;\r
                case DEMOD_ASK:\r

+               case DEMOD_BI:\r
+               case DEMOD_BIa:\r

                        detRate = GetAskClock("",FALSE, FALSE); \r
                        detRate = GetAskClock("",FALSE, FALSE); \r

-                       if (expected[readRate] == detRate) {\r
-                               config.bitrate = readRate;\r
+                       if (expected[readRate] == detRate) \r

                                return TRUE;\r
                                return TRUE;\r

-                       }\r

                        break;\r
                case DEMOD_PSK1:\r
                        break;\r
                case DEMOD_PSK1:\r

-                       detRate = GetPskClock("",FALSE, FALSE); \r
-                       if (expected[readRate] == detRate) {\r
-                               config.bitrate = readRate;\r
-                               return TRUE;\r
-                       }\r
-                       break;\r

                case DEMOD_PSK2:\r
                case DEMOD_PSK2:\r

-                       detRate = GetPskClock("",FALSE, FALSE); \r
-                       if (expected[readRate] == detRate) {\r
-                               config.bitrate = readRate;\r
-                               return TRUE;\r
-                       }\r
-                       break;\r

                case DEMOD_PSK3:\r
                        detRate = GetPskClock("",FALSE, FALSE); \r
                case DEMOD_PSK3:\r
                        detRate = GetPskClock("",FALSE, FALSE); \r

-                       if (expected[readRate] == detRate) {\r
-                               config.bitrate = readRate;\r
+                       if (expected[readRate] == detRate)\r

                                return TRUE;\r
                                return TRUE;\r

-                       }\r

                        break;\r
                case DEMOD_NRZ:\r
                        detRate = GetNrzClock("",FALSE, FALSE); \r
                        break;\r
                case DEMOD_NRZ:\r
                        detRate = GetNrzClock("",FALSE, FALSE); \r

-                       if (expected[readRate] == detRate) {\r
-                               config.bitrate = readRate;\r
+                       if (expected[readRate] == detRate)\r

                                return TRUE;\r
                                return TRUE;\r

-                       }\r
-                       break;\r
-               case DEMOD_BI:\r
-                       detRate = GetAskClock("",FALSE, FALSE); \r
-                       if (expected[readRate] == detRate) {\r
-                               config.bitrate = readRate;\r
-                               return TRUE;\r
-                       }\r

                        break;\r
                default:\r
                        return FALSE;\r
                        break;\r
                default:\r
                        return FALSE;\r


@@ -598,26 +558,27 @@ bool testBitRate(uint8_t readRate, uint8_t mod){
        return FALSE;\r
 }\r
 \r
        return FALSE;\r
 }\r
 \r

-bool test(uint8_t mode, uint8_t *offset){\r
+bool test(uint8_t mode, uint8_t *offset, int *fndBitRate){\r

 \r
 \r

-       if ( !DemodBufferLen) return FALSE;\r
+       if ( DemodBufferLen < 64 ) return FALSE;\r

        uint8_t si = 0;\r
        for (uint8_t idx = 0; idx < 64; idx++){\r
                si = idx;\r
                if ( PackBits(si, 32, DemodBuffer) == 0x00 ) continue;\r
 \r
        uint8_t si = 0;\r
        for (uint8_t idx = 0; idx < 64; idx++){\r
                si = idx;\r
                if ( PackBits(si, 32, DemodBuffer) == 0x00 ) continue;\r
 \r

-               uint8_t safer    = PackBits(si, 4, DemodBuffer); si += 4;           //master key\r
+               uint8_t safer    = PackBits(si, 4, DemodBuffer); si += 4;     //master key\r

                uint8_t resv     = PackBits(si, 4, DemodBuffer); si += 4;     //was 7 & +=7+3 //should be only 4 bits if extended mode\r
                // 2nibble must be zeroed.\r
                // moved test to here, since this gets most faults first.\r
                if ( resv > 0x00) continue;\r
 \r
                uint8_t resv     = PackBits(si, 4, DemodBuffer); si += 4;     //was 7 & +=7+3 //should be only 4 bits if extended mode\r
                // 2nibble must be zeroed.\r
                // moved test to here, since this gets most faults first.\r
                if ( resv > 0x00) continue;\r
 \r

-               uint8_t xtRate   = PackBits(si, 3, DemodBuffer); si += 3;   //new\r
-               uint8_t bitRate  = PackBits(si, 3, DemodBuffer); si += 3;   //new  could check bit rate\r
+               uint8_t xtRate   = PackBits(si, 3, DemodBuffer); si += 3;     //extended mode part of rate\r
+               int bitRate  = PackBits(si, 3, DemodBuffer); si += 3;     //bit rate\r
+               if (bitRate > 7) continue;\r

                uint8_t extend   = PackBits(si, 1, DemodBuffer); si += 1;     //bit 15 extended mode\r
                uint8_t extend   = PackBits(si, 1, DemodBuffer); si += 1;     //bit 15 extended mode\r

-               uint8_t modread  = PackBits(si, 5, DemodBuffer); si += 5+2+1; //new\r
-               //uint8_t pskcr   = PackBits(si, 2, DemodBuffer); si += 2+1;  //new  could check psk cr\r
-               uint8_t nml01    = PackBits(si, 1, DemodBuffer); si += 1+5;   //bit 24 , 30, 31 could be tested for 0 if not extended mode\r
+               uint8_t modread  = PackBits(si, 5, DemodBuffer); si += 5+2+1; \r
+               //uint8_t pskcr   = PackBits(si, 2, DemodBuffer); si += 2+1;  //could check psk cr\r
+               uint8_t nml01    = PackBits(si, 1, DemodBuffer); si += 1+5;   //bit 24, 30, 31 could be tested for 0 if not extended mode\r

                uint8_t nml02    = PackBits(si, 2, DemodBuffer); si += 2;\r
                \r
                //if extended mode\r
                uint8_t nml02    = PackBits(si, 2, DemodBuffer); si += 2;\r
                \r
                //if extended mode\r


@@ -628,15 +589,15 @@ bool test(uint8_t mode, uint8_t *offset){
                }\r
                //test modulation\r
                if (!testModulation(mode, modread)) continue;\r
                }\r
                //test modulation\r
                if (!testModulation(mode, modread)) continue;\r

-\r
-               *offset = idx;\r

                if (!testBitRate(bitRate, mode)) continue;\r
                if (!testBitRate(bitRate, mode)) continue;\r

+               *fndBitRate = bitRate;\r
+               *offset = idx;\r

                return TRUE;\r
        }\r
        return FALSE;\r
 }\r
 \r
                return TRUE;\r
        }\r
        return FALSE;\r
 }\r
 \r

-void printT55xxBlock(const char *demodStr){\r
+void printT55xxBlock(const char *blockNum){\r

        \r
        uint8_t i = config.offset;\r
        uint8_t endpos = 32 + i;\r
        \r
        uint8_t i = config.offset;\r
        uint8_t endpos = 32 + i;\r


@@ -654,7 +615,7 @@ void printT55xxBlock(const char *demodStr){
                bits[i - config.offset]=DemodBuffer[i];\r
 \r
        blockData = PackBits(0, 32, bits);\r
                bits[i - config.offset]=DemodBuffer[i];\r
 \r
        blockData = PackBits(0, 32, bits);\r

-       PrintAndLog("0x%08X  %s [%s]", blockData, sprint_bin(bits,32), demodStr);\r
+       PrintAndLog("[%s] 0x%08X  %s", blockNum, blockData, sprint_bin(bits,32));\r

 }\r
 \r
 int special(const char *Cmd) {\r
 }\r
 \r
 int special(const char *Cmd) {\r


@@ -710,6 +671,7 @@ int CmdT55xxWriteBlock(const char *Cmd)
        }\r
        \r
        UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {data, block, 0}};\r
        }\r
        \r
        UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {data, block, 0}};\r

+       UsbCommand resp;\r

        c.d.asBytes[0] = 0x0; \r
 \r
        PrintAndLog("Writing to block: %d  data  : 0x%08X", block, data);\r
        c.d.asBytes[0] = 0x0; \r
 \r
        PrintAndLog("Writing to block: %d  data  : 0x%08X", block, data);\r


@@ -720,7 +682,12 @@ int CmdT55xxWriteBlock(const char *Cmd)
                c.d.asBytes[0] = 0x1; \r
                PrintAndLog("pwd   : 0x%08X", password);\r
        }\r
                c.d.asBytes[0] = 0x1; \r
                PrintAndLog("pwd   : 0x%08X", password);\r
        }\r

+       clearCommandBuffer();\r

        SendCommand(&c);\r
        SendCommand(&c);\r

+       if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)){\r
+               PrintAndLog("Error occurred, device did not ACK write operation. (May be due to old firmware)");\r
+               return -1;\r
+       }\r

        return 0;\r
 }\r
 \r
        return 0;\r
 }\r
 \r


@@ -746,16 +713,28 @@ int CmdT55xxReadTrace(const char *Cmd)
        uint32_t bl0     = PackBits(si, 32, DemodBuffer);\r
        uint32_t bl1     = PackBits(si+32, 32, DemodBuffer);\r
        \r
        uint32_t bl0     = PackBits(si, 32, DemodBuffer);\r
        uint32_t bl1     = PackBits(si+32, 32, DemodBuffer);\r
        \r

-       uint32_t acl     = PackBits(si,  8, DemodBuffer); si += 8;\r
-       uint32_t mfc     = PackBits(si, 8, DemodBuffer); si += 8;\r
-       uint32_t cid     = PackBits(si, 5, DemodBuffer); si += 5;\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, 14, DemodBuffer); si += 14;\r
-       uint32_t wafer   = PackBits(si, 5, DemodBuffer); si += 5;\r
+       uint32_t acl     = PackBits(si, 8,  DemodBuffer); si += 8;\r
+       uint32_t mfc     = PackBits(si, 8,  DemodBuffer); si += 8;\r
+       uint32_t cid     = PackBits(si, 5,  DemodBuffer); si += 5;\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, 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 dw      = PackBits(si, 15, DemodBuffer); \r
        \r

+       time_t t = time(NULL);\r
+       struct tm tm = *localtime(&t);\r
+       if ( year > tm.tm_year-110)\r
+               year += 2000;\r
+       else\r
+               year += 2010;\r
+\r
+       if ( acl != 0xE0 ) {\r
+               PrintAndLog("The modulation is most likely wrong since the ACL is not 0xE0. ");\r
+               return 1;\r
+       }\r
+\r

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


@@ -764,7 +743,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 : 20?%d/%d",year, quarter);\r
+       PrintAndLog("     Year/Quarter : %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


@@ -774,8 +753,6 @@ int CmdT55xxReadTrace(const char *Cmd)
        PrintAndLog("     Block 1  : 0x%08X  %s", bl1, sprint_bin(DemodBuffer+config.offset+repeat+32,32) );\r
        PrintAndLog("-------------------------------------------------------------");\r
 \r
        PrintAndLog("     Block 1  : 0x%08X  %s", bl1, sprint_bin(DemodBuffer+config.offset+repeat+32,32) );\r
        PrintAndLog("-------------------------------------------------------------");\r
 \r

-       if ( acl != 0xE0 )\r
-               PrintAndLog("The modulation is most likely wrong since the ACL is not 0xE0. ");\r

        /*\r
        TRACE - BLOCK O\r
                Bits    Definition                                                              HEX\r
        /*\r
        TRACE - BLOCK O\r
                Bits    Definition                                                              HEX\r


@@ -809,10 +786,10 @@ int CmdT55xxInfo(const char *Cmd){
        \r
        if (strlen(Cmd)==0)\r
                AquireData( CONFIGURATION_BLOCK );\r
        \r
        if (strlen(Cmd)==0)\r
                AquireData( CONFIGURATION_BLOCK );\r

-       \r
+\r

        if (!DecodeT55xxBlock()) return 1;\r
 \r
        if (!DecodeT55xxBlock()) return 1;\r
 \r

-       if ( !DemodBufferLen) return 1;\r
+       if ( DemodBufferLen < 32) return 1;\r

 \r
        uint8_t si = config.offset;\r
        uint32_t bl0      = PackBits(si, 32, DemodBuffer);\r
 \r
        uint8_t si = config.offset;\r
        uint32_t bl0      = PackBits(si, 32, DemodBuffer);\r


@@ -908,6 +885,7 @@ int AquireData( uint8_t block ){
                // c.d.asBytes[0] = 0x1; \r
        // }\r
 \r
                // c.d.asBytes[0] = 0x1; \r
        // }\r
 \r

+       clearCommandBuffer();\r

        SendCommand(&c);\r
        if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {\r
                PrintAndLog("command execution time out");\r
        SendCommand(&c);\r
        if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {\r
                PrintAndLog("command execution time out");\r


@@ -922,7 +900,8 @@ int AquireData( uint8_t block ){
 }\r
 \r
 char * GetBitRateStr(uint32_t id){\r
 }\r
 \r
 char * GetBitRateStr(uint32_t id){\r

-       static char buf[40];\r
+       static char buf[25];\r
+\r

        char *retStr = buf;\r
                switch (id){\r
                case 0: \r
        char *retStr = buf;\r
                switch (id){\r
                case 0: \r


@@ -957,7 +936,6 @@ char * GetBitRateStr(uint32_t id){
        return buf;\r
 }\r
 \r
        return buf;\r
 }\r
 \r

-\r

 char * GetSaferStr(uint32_t id){\r
        static char buf[40];\r
        char *retStr = buf;\r
 char * GetSaferStr(uint32_t id){\r
        static char buf[40];\r
        char *retStr = buf;\r


@@ -974,7 +952,7 @@ char * GetSaferStr(uint32_t id){
 }\r
 \r
 char * GetModulationStr( uint32_t id){\r
 }\r
 \r
 char * GetModulationStr( uint32_t id){\r

-       static char buf[40];\r
+       static char buf[60];\r

        char *retStr = buf;\r
        \r
        switch (id){\r
        char *retStr = buf;\r
        \r
        switch (id){\r


@@ -1003,7 +981,7 @@ char * GetModulationStr( uint32_t id){
                        snprintf(retStr,sizeof(buf),"%d - FSK 2a RF/10  RF/8",id);\r
                        break;\r
                case 8:\r
                        snprintf(retStr,sizeof(buf),"%d - FSK 2a RF/10  RF/8",id);\r
                        break;\r
                case 8:\r

-                       snprintf(retStr,sizeof(buf),"%d - Manschester",id);\r
+                       snprintf(retStr,sizeof(buf),"%d - Manchester",id);\r

                        break;\r
                case 16:\r
                        snprintf(retStr,sizeof(buf),"%d - Biphase",id);\r
                        break;\r
                case 16:\r
                        snprintf(retStr,sizeof(buf),"%d - Biphase",id);\r


@@ -1026,8 +1004,8 @@ char * GetModelStrFromCID(uint32_t cid){
        static char buf[10];\r
        char *retStr = buf;\r
        \r
        static char buf[10];\r
        char *retStr = buf;\r
        \r

-       if (cid == 1) sprintf(retStr,"ATA5577M1");\r
-       if (cid == 2) sprintf(retStr,"ATA5577M2");      \r
+       if (cid == 1) snprintf(retStr, sizeof(buf),"ATA5577M1");\r
+       if (cid == 2) snprintf(retStr, sizeof(buf),"ATA5577M2");        \r

        return buf;\r
 }\r
 \r
        return buf;\r
 }\r
 \r