Split data askgproxiidemod to own file

[proxmark3-svn] / client / cmdlft55xx.c

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 9e4883c759b55240b8ce052baf6f150271dbecf4..b287ce28efec268a710783ee506e159d8d8c7273 100644 (file)
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -10,6 +10,8 @@
 #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 <ctype.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


@@ -30,7 +32,7 @@
 #define REGULAR_READ_MODE_BLOCK 0xFF\r
 \r
 // Default configuration\r
 #define REGULAR_READ_MODE_BLOCK 0xFF\r
 \r
 // Default configuration\r

-t55xx_conf_block_t config = { .modulation = DEMOD_ASK, .inverted = FALSE, .offset = 0x00, .block0 = 0x00, .Q5 = FALSE };\r
+t55xx_conf_block_t config = { .modulation = DEMOD_ASK, .inverted = false, .offset = 0x00, .block0 = 0x00, .Q5 = false };\r

 \r
 t55xx_conf_block_t Get_t55xx_Config(){\r
        return config;\r
 \r
 t55xx_conf_block_t Get_t55xx_Config(){\r
        return config;\r


@@ -194,7 +196,7 @@ int CmdT55xxSetConfig(const char *Cmd) {
        uint8_t bitRate = 0;\r
        uint8_t rates[9] = {8,16,32,40,50,64,100,128,0};\r
        uint8_t cmdp = 0;\r
        uint8_t bitRate = 0;\r
        uint8_t rates[9] = {8,16,32,40,50,64,100,128,0};\r
        uint8_t cmdp = 0;\r

-       bool errors = FALSE;\r
+       bool errors = false;\r

        while(param_getchar(Cmd, cmdp) != 0x00 && !errors)\r
        {\r
                tmp = param_getchar(Cmd, cmdp);\r
        while(param_getchar(Cmd, cmdp) != 0x00 && !errors)\r
        {\r
                tmp = param_getchar(Cmd, cmdp);\r


@@ -213,7 +215,7 @@ int CmdT55xxSetConfig(const char *Cmd) {
                                                break;\r
                                        }\r
                                }\r
                                                break;\r
                                        }\r
                                }\r

-                               if (i==9) errors = TRUE;\r
+                               if (i==9) errors = true;\r

                        }\r
                        cmdp+=2;\r
                        break;\r
                        }\r
                        cmdp+=2;\r
                        break;\r


@@ -253,7 +255,7 @@ int CmdT55xxSetConfig(const char *Cmd) {
                                config.inverted=0;\r
                        } else {\r
                                PrintAndLog("Unknown modulation '%s'", modulation);\r
                                config.inverted=0;\r
                        } else {\r
                                PrintAndLog("Unknown modulation '%s'", modulation);\r

-                               errors = TRUE;\r
+                               errors = true;\r

                        }\r
                        break;\r
                case 'i':\r
                        }\r
                        break;\r
                case 'i':\r


@@ -268,17 +270,17 @@ int CmdT55xxSetConfig(const char *Cmd) {
                        break;\r
                case 'Q':\r
                case 'q':               \r
                        break;\r
                case 'Q':\r
                case 'q':               \r

-                       config.Q5 = TRUE;\r
+                       config.Q5 = true;\r

                        cmdp++;\r
                        break;\r
                case 'S':\r
                case 's':               \r
                        cmdp++;\r
                        break;\r
                case 'S':\r
                case 's':               \r

-                       config.ST = TRUE;\r
+                       config.ST = true;\r

                        cmdp++;\r
                        break;\r
                default:\r
                        PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));\r
                        cmdp++;\r
                        break;\r
                default:\r
                        PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));\r

-                       errors = TRUE;\r
+                       errors = true;\r

                        break;\r
                }\r
        }\r
                        break;\r
                }\r
        }\r


@@ -383,28 +385,28 @@ bool DecodeT55xxBlock(){
        switch( config.modulation ){\r
                case DEMOD_FSK:\r
                        snprintf(cmdStr, sizeof(buf),"%d %d", bitRate[config.bitrate], config.inverted );\r
        switch( config.modulation ){\r
                case DEMOD_FSK:\r
                        snprintf(cmdStr, sizeof(buf),"%d %d", bitRate[config.bitrate], config.inverted );\r

-                       ans = FSKrawDemod(cmdStr, FALSE);\r
+                       ans = FSKrawDemod(cmdStr, false);\r

                        break;\r
                case DEMOD_FSK1:\r
                case DEMOD_FSK1a:\r
                        snprintf(cmdStr, sizeof(buf),"%d %d 8 5", bitRate[config.bitrate], config.inverted );\r
                        break;\r
                case DEMOD_FSK1:\r
                case DEMOD_FSK1a:\r
                        snprintf(cmdStr, sizeof(buf),"%d %d 8 5", bitRate[config.bitrate], config.inverted );\r

-                       ans = FSKrawDemod(cmdStr, FALSE);\r
+                       ans = FSKrawDemod(cmdStr, false);\r

                        break;\r
                case DEMOD_FSK2:\r
                case DEMOD_FSK2a:\r
                        snprintf(cmdStr, sizeof(buf),"%d %d 10 8", bitRate[config.bitrate], config.inverted );\r
                        break;\r
                case DEMOD_FSK2:\r
                case DEMOD_FSK2a:\r
                        snprintf(cmdStr, sizeof(buf),"%d %d 10 8", bitRate[config.bitrate], config.inverted );\r

-                       ans = FSKrawDemod(cmdStr, FALSE);\r
+                       ans = FSKrawDemod(cmdStr, false);\r

                        break;\r
                case DEMOD_ASK:\r
                        snprintf(cmdStr, sizeof(buf),"%d %d 1", bitRate[config.bitrate], config.inverted );\r
                        break;\r
                case DEMOD_ASK:\r
                        snprintf(cmdStr, sizeof(buf),"%d %d 1", bitRate[config.bitrate], config.inverted );\r

-                       ans = ASKDemod_ext(cmdStr, FALSE, FALSE, 1, &ST);\r
+                       ans = ASKDemod_ext(cmdStr, false, false, 1, &ST);\r

                        break;\r
                case DEMOD_PSK1:\r
                        // skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)\r
                        save_restoreGB(1);\r
                        CmdLtrim("160");\r
                        snprintf(cmdStr, sizeof(buf),"%d %d 6", bitRate[config.bitrate], config.inverted );\r
                        break;\r
                case DEMOD_PSK1:\r
                        // skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)\r
                        save_restoreGB(1);\r
                        CmdLtrim("160");\r
                        snprintf(cmdStr, sizeof(buf),"%d %d 6", bitRate[config.bitrate], config.inverted );\r

-                       ans = PSKDemod(cmdStr, FALSE);\r
+                       ans = PSKDemod(cmdStr, false);\r

                        //undo trim samples\r
                        save_restoreGB(0);\r
                        break;\r
                        //undo trim samples\r
                        save_restoreGB(0);\r
                        break;\r


@@ -414,22 +416,22 @@ bool DecodeT55xxBlock(){
                        save_restoreGB(1);\r
                        CmdLtrim("160");\r
                        snprintf(cmdStr, sizeof(buf),"%d 0 6", bitRate[config.bitrate] );\r
                        save_restoreGB(1);\r
                        CmdLtrim("160");\r
                        snprintf(cmdStr, sizeof(buf),"%d 0 6", bitRate[config.bitrate] );\r

-                       ans = PSKDemod(cmdStr, FALSE);\r
+                       ans = PSKDemod(cmdStr, false);\r

                        psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
                        //undo trim samples\r
                        save_restoreGB(0);\r
                        break;\r
                case DEMOD_NRZ:\r
                        snprintf(cmdStr, sizeof(buf),"%d %d 1", bitRate[config.bitrate], config.inverted );\r
                        psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
                        //undo trim samples\r
                        save_restoreGB(0);\r
                        break;\r
                case DEMOD_NRZ:\r
                        snprintf(cmdStr, sizeof(buf),"%d %d 1", bitRate[config.bitrate], config.inverted );\r

-                       ans = NRZrawDemod(cmdStr, FALSE);\r
+                       ans = NRZrawDemod(cmdStr, false);\r

                        break;\r
                case DEMOD_BI:\r
                case DEMOD_BIa:\r
                        snprintf(cmdStr, sizeof(buf),"0 %d %d 1", bitRate[config.bitrate], config.inverted );\r
                        break;\r
                case DEMOD_BI:\r
                case DEMOD_BIa:\r
                        snprintf(cmdStr, sizeof(buf),"0 %d %d 1", bitRate[config.bitrate], config.inverted );\r

-                       ans = ASKbiphaseDemod(cmdStr, FALSE);\r
+                       ans = ASKbiphaseDemod(cmdStr, false);\r

                        break;\r
                default:\r
                        break;\r
                default:\r

-                       return FALSE;\r
+                       return false;\r

        }\r
        return (bool) ans;\r
 }\r
        }\r
        return (bool) ans;\r
 }\r


@@ -438,13 +440,13 @@ bool DecodeT5555TraceBlock() {
        DemodBufferLen = 0x00;\r
        \r
        // According to datasheet. Always: RF/64, not inverted, Manchester\r
        DemodBufferLen = 0x00;\r
        \r
        // According to datasheet. Always: RF/64, not inverted, Manchester\r

-       return (bool) ASKDemod("64 0 1", FALSE, FALSE, 1);\r
+       return (bool) ASKDemod("64 0 1", false, false, 1);\r

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

-       bool errors = FALSE;\r
-       bool useGB = FALSE;\r
-       bool usepwd = FALSE;\r
+       bool errors = false;\r
+       bool useGB = false;\r
+       bool usepwd = false;\r

        uint32_t password = 0;\r
        uint8_t cmdp = 0;\r
 \r
        uint32_t password = 0;\r
        uint8_t cmdp = 0;\r
 \r


@@ -456,12 +458,12 @@ int CmdT55xxDetect(const char *Cmd){
                case 'p':\r
                case 'P':\r
                        password = param_get32ex(Cmd, cmdp+1, 0, 16);\r
                case 'p':\r
                case 'P':\r
                        password = param_get32ex(Cmd, cmdp+1, 0, 16);\r

-                       usepwd = TRUE;\r
+                       usepwd = true;\r

                        cmdp += 2;\r
                        break;\r
                case '1':\r
                        // use Graphbuffer data\r
                        cmdp += 2;\r
                        break;\r
                case '1':\r
                        // use Graphbuffer data\r

-                       useGB = TRUE;\r
+                       useGB = true;\r

                        cmdp++;\r
                        break;\r
                default:\r
                        cmdp++;\r
                        break;\r
                default:\r


@@ -489,87 +491,87 @@ bool tryDetectModulation(){
        t55xx_conf_block_t tests[15];\r
        int bitRate=0;\r
        uint8_t fc1 = 0, fc2 = 0, clk=0;\r
        t55xx_conf_block_t tests[15];\r
        int bitRate=0;\r
        uint8_t fc1 = 0, fc2 = 0, clk=0;\r

-       if (GetFskClock("", FALSE, FALSE)){ \r
-               fskClocks(&fc1, &fc2, &clk, FALSE);\r
-               if ( FSKrawDemod("0 0", FALSE) && test(DEMOD_FSK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r
+       if (GetFskClock("", false, false)){ \r
+               fskClocks(&fc1, &fc2, &clk, false);\r
+               if ( FSKrawDemod("0 0", false) && test(DEMOD_FSK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\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].bitrate = 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].bitrate = bitRate;\r

-                       tests[hits].inverted = FALSE;\r
+                       tests[hits].inverted = false;\r

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

-                       tests[hits].ST = FALSE;\r
+                       tests[hits].ST = false;\r

                        ++hits;\r
                }\r
                        ++hits;\r
                }\r

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

                        tests[hits].modulation = DEMOD_FSK;\r
                        if (fc1 == 8 && fc2 == 5)\r
                                tests[hits].modulation = DEMOD_FSK1;\r
                        else if (fc1 == 10 && fc2 == 8)\r
                                tests[hits].modulation = DEMOD_FSK2a;\r
                        tests[hits].bitrate = bitRate;\r
                        tests[hits].modulation = DEMOD_FSK;\r
                        if (fc1 == 8 && fc2 == 5)\r
                                tests[hits].modulation = DEMOD_FSK1;\r
                        else if (fc1 == 10 && fc2 == 8)\r
                                tests[hits].modulation = DEMOD_FSK2a;\r
                        tests[hits].bitrate = bitRate;\r

-                       tests[hits].inverted = TRUE;\r
+                       tests[hits].inverted = true;\r

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

-                       tests[hits].ST = FALSE;\r
+                       tests[hits].ST = false;\r

                        ++hits;\r
                }\r
        } else {\r
                        ++hits;\r
                }\r
        } else {\r

-               clk = GetAskClock("", FALSE, FALSE);\r
+               clk = GetAskClock("", false, false);\r

                if (clk>0) {\r
                if (clk>0) {\r

-                       tests[hits].ST = TRUE;\r
-                       if ( ASKDemod_ext("0 0 1", FALSE, FALSE, 1, &tests[hits].ST) && test(DEMOD_ASK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r
+                       tests[hits].ST = true;\r
+                       if ( ASKDemod_ext("0 0 1", false, false, 1, &tests[hits].ST) && test(DEMOD_ASK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r

                                tests[hits].modulation = DEMOD_ASK;\r
                                tests[hits].bitrate = bitRate;\r
                                tests[hits].modulation = DEMOD_ASK;\r
                                tests[hits].bitrate = bitRate;\r

-                               tests[hits].inverted = FALSE;\r
+                               tests[hits].inverted = false;\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

-                       tests[hits].ST = TRUE;\r
-                       if ( ASKDemod_ext("0 1 1", FALSE, FALSE, 1, &tests[hits].ST)  && test(DEMOD_ASK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r
+                       tests[hits].ST = true;\r
+                       if ( ASKDemod_ext("0 1 1", false, false, 1, &tests[hits].ST)  && test(DEMOD_ASK, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r

                                tests[hits].modulation = DEMOD_ASK;\r
                                tests[hits].bitrate = bitRate;\r
                                tests[hits].modulation = DEMOD_ASK;\r
                                tests[hits].bitrate = bitRate;\r

-                               tests[hits].inverted = TRUE;\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

-                       if ( ASKbiphaseDemod("0 0 0 2", FALSE) && test(DEMOD_BI, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5) ) {\r
+                       if ( ASKbiphaseDemod("0 0 0 2", false) && test(DEMOD_BI, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5) ) {\r

                                tests[hits].modulation = DEMOD_BI;\r
                                tests[hits].bitrate = bitRate;\r
                                tests[hits].modulation = DEMOD_BI;\r
                                tests[hits].bitrate = bitRate;\r

-                               tests[hits].inverted = FALSE;\r
+                               tests[hits].inverted = false;\r

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

-                               tests[hits].ST = FALSE;\r
+                               tests[hits].ST = false;\r

                                ++hits;\r
                        }\r
                                ++hits;\r
                        }\r

-                       if ( ASKbiphaseDemod("0 0 1 2", FALSE) && test(DEMOD_BIa, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5) ) {\r
+                       if ( ASKbiphaseDemod("0 0 1 2", false) && test(DEMOD_BIa, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5) ) {\r

                                tests[hits].modulation = DEMOD_BIa;\r
                                tests[hits].bitrate = bitRate;\r
                                tests[hits].modulation = DEMOD_BIa;\r
                                tests[hits].bitrate = bitRate;\r

-                               tests[hits].inverted = TRUE;\r
+                               tests[hits].inverted = true;\r

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

-                               tests[hits].ST = FALSE;\r
+                               tests[hits].ST = false;\r

                                ++hits;\r
                        }\r
                }\r
                //undo trim from ask\r
                //save_restoreGB(0);\r
                                ++hits;\r
                        }\r
                }\r
                //undo trim from ask\r
                //save_restoreGB(0);\r

-               clk = GetNrzClock("", FALSE, FALSE);\r
+               clk = GetNrzClock("", false, false);\r

                if (clk>0) {\r
                if (clk>0) {\r

-                       if ( NRZrawDemod("0 0 1", FALSE)  && test(DEMOD_NRZ, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r
+                       if ( NRZrawDemod("0 0 1", false)  && test(DEMOD_NRZ, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r

                                tests[hits].modulation = DEMOD_NRZ;\r
                                tests[hits].bitrate = bitRate;\r
                                tests[hits].modulation = DEMOD_NRZ;\r
                                tests[hits].bitrate = bitRate;\r

-                               tests[hits].inverted = FALSE;\r
+                               tests[hits].inverted = false;\r

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

-                               tests[hits].ST = FALSE;\r
+                               tests[hits].ST = false;\r

                                ++hits;\r
                        }\r
 \r
                                ++hits;\r
                        }\r
 \r

-                       if ( NRZrawDemod("0 1 1", FALSE)  && test(DEMOD_NRZ, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r
+                       if ( NRZrawDemod("0 1 1", false)  && test(DEMOD_NRZ, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r

                                tests[hits].modulation = DEMOD_NRZ;\r
                                tests[hits].bitrate = bitRate;\r
                                tests[hits].modulation = DEMOD_NRZ;\r
                                tests[hits].bitrate = bitRate;\r

-                               tests[hits].inverted = TRUE;\r
+                               tests[hits].inverted = true;\r

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

-                               tests[hits].ST = FALSE;\r
+                               tests[hits].ST = false;\r

                                ++hits;\r
                        }\r
                }\r
                                ++hits;\r
                        }\r
                }\r


@@ -578,45 +580,45 @@ bool tryDetectModulation(){
                // skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)\r
                save_restoreGB(1);\r
                CmdLtrim("160");\r
                // skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)\r
                save_restoreGB(1);\r
                CmdLtrim("160");\r

-               clk = GetPskClock("", FALSE, FALSE);\r
+               clk = GetPskClock("", false, false);\r

                if (clk>0) {\r
                if (clk>0) {\r

-                       if ( PSKDemod("0 0 6", FALSE) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r
+                       if ( PSKDemod("0 0 6", false) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r

                                tests[hits].modulation = DEMOD_PSK1;\r
                                tests[hits].bitrate = bitRate;\r
                                tests[hits].modulation = DEMOD_PSK1;\r
                                tests[hits].bitrate = bitRate;\r

-                               tests[hits].inverted = FALSE;\r
+                               tests[hits].inverted = false;\r

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

-                               tests[hits].ST = FALSE;\r
+                               tests[hits].ST = false;\r

                                ++hits;\r
                        }\r
                                ++hits;\r
                        }\r

-                       if ( PSKDemod("0 1 6", FALSE) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r
+                       if ( PSKDemod("0 1 6", false) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {\r

                                tests[hits].modulation = DEMOD_PSK1;\r
                                tests[hits].bitrate = bitRate;\r
                                tests[hits].modulation = DEMOD_PSK1;\r
                                tests[hits].bitrate = bitRate;\r

-                               tests[hits].inverted = TRUE;\r
+                               tests[hits].inverted = true;\r

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

-                               tests[hits].ST = FALSE;\r
+                               tests[hits].ST = false;\r

                                ++hits;\r
                        }\r
                        // PSK2 - needs a call to psk1TOpsk2.\r
                                ++hits;\r
                        }\r
                        // PSK2 - needs a call to psk1TOpsk2.\r

-                       if ( PSKDemod("0 0 6", FALSE)) {\r
+                       if ( PSKDemod("0 0 6", false)) {\r

                                psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
                                if (test(DEMOD_PSK2, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)){\r
                                        tests[hits].modulation = DEMOD_PSK2;\r
                                        tests[hits].bitrate = bitRate;\r
                                psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
                                if (test(DEMOD_PSK2, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)){\r
                                        tests[hits].modulation = DEMOD_PSK2;\r
                                        tests[hits].bitrate = bitRate;\r

-                                       tests[hits].inverted = FALSE;\r
+                                       tests[hits].inverted = false;\r

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

-                                       tests[hits].ST = FALSE;\r
+                                       tests[hits].ST = false;\r

                                        ++hits;\r
                                }\r
                        } // inverse waves does not affect this demod\r
                        // PSK3 - needs a call to psk1TOpsk2.\r
                                        ++hits;\r
                                }\r
                        } // inverse waves does not affect this demod\r
                        // PSK3 - needs a call to psk1TOpsk2.\r

-                       if ( PSKDemod("0 0 6", FALSE)) {\r
+                       if ( PSKDemod("0 0 6", false)) {\r

                                psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
                                if (test(DEMOD_PSK3, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)){\r
                                        tests[hits].modulation = DEMOD_PSK3;\r
                                        tests[hits].bitrate = bitRate;\r
                                psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
                                if (test(DEMOD_PSK3, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)){\r
                                        tests[hits].modulation = DEMOD_PSK3;\r
                                        tests[hits].bitrate = bitRate;\r

-                                       tests[hits].inverted = FALSE;\r
+                                       tests[hits].inverted = false;\r

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

-                                       tests[hits].ST = FALSE;\r
+                                       tests[hits].ST = false;\r

                                        ++hits;\r
                                }\r
                        } // inverse waves does not affect this demod\r
                                        ++hits;\r
                                }\r
                        } // inverse waves does not affect this demod\r


@@ -633,7 +635,7 @@ bool tryDetectModulation(){
                config.Q5 = tests[0].Q5;\r
                config.ST = tests[0].ST;\r
                printConfiguration( config );\r
                config.Q5 = tests[0].Q5;\r
                config.ST = tests[0].ST;\r
                printConfiguration( config );\r

-               return TRUE;\r
+               return true;\r

        }\r
        \r
        if ( hits > 1) {\r
        }\r
        \r
        if ( hits > 1) {\r


@@ -643,68 +645,68 @@ bool tryDetectModulation(){
                        printConfiguration( tests[i] );\r
                }\r
        }\r
                        printConfiguration( tests[i] );\r
                }\r
        }\r

-       return FALSE;\r
+       return false;\r

 }\r
 \r
 bool testModulation(uint8_t mode, uint8_t modread){\r
        switch( mode ){\r
                case DEMOD_FSK:\r
 }\r
 \r
 bool testModulation(uint8_t mode, uint8_t modread){\r
        switch( mode ){\r
                case DEMOD_FSK:\r

-                       if (modread >= DEMOD_FSK1 && modread <= DEMOD_FSK2a) return TRUE;\r
+                       if (modread >= DEMOD_FSK1 && modread <= DEMOD_FSK2a) return true;\r

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

-                       if (modread == DEMOD_ASK) return TRUE;\r
+                       if (modread == DEMOD_ASK) return true;\r

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

-                       if (modread == DEMOD_PSK1) return TRUE;\r
+                       if (modread == DEMOD_PSK1) return true;\r

                        break;\r
                case DEMOD_PSK2:\r
                        break;\r
                case DEMOD_PSK2:\r

-                       if (modread == DEMOD_PSK2) return TRUE;\r
+                       if (modread == DEMOD_PSK2) return true;\r

                        break;\r
                case DEMOD_PSK3:\r
                        break;\r
                case DEMOD_PSK3:\r

-                       if (modread == DEMOD_PSK3) return TRUE;\r
+                       if (modread == DEMOD_PSK3) return true;\r

                        break;\r
                case DEMOD_NRZ:\r
                        break;\r
                case DEMOD_NRZ:\r

-                       if (modread == DEMOD_NRZ) return TRUE;\r
+                       if (modread == DEMOD_NRZ) return true;\r

                        break;\r
                case DEMOD_BI:\r
                        break;\r
                case DEMOD_BI:\r

-                       if (modread == DEMOD_BI) return TRUE;\r
+                       if (modread == DEMOD_BI) return true;\r

                        break;\r
                case DEMOD_BIa:\r
                        break;\r
                case DEMOD_BIa:\r

-                       if (modread == DEMOD_BIa) return TRUE;\r
+                       if (modread == DEMOD_BIa) return true;\r

                        break;          \r
                default:\r
                        break;          \r
                default:\r

-                       return FALSE;\r
+                       return false;\r

        }\r
        }\r

-       return FALSE;\r
+       return false;\r

 }\r
 \r
 bool testQ5Modulation(uint8_t  mode, uint8_t   modread){\r
        switch( mode ){\r
                case DEMOD_FSK:\r
 }\r
 \r
 bool testQ5Modulation(uint8_t  mode, uint8_t   modread){\r
        switch( mode ){\r
                case DEMOD_FSK:\r

-                       if (modread >= 4 && modread <= 5) return TRUE;\r
+                       if (modread >= 4 && modread <= 5) return true;\r

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

-                       if (modread == 0) return TRUE;\r
+                       if (modread == 0) return true;\r

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

-                       if (modread == 1) return TRUE;\r
+                       if (modread == 1) return true;\r

                        break;\r
                case DEMOD_PSK2:\r
                        break;\r
                case DEMOD_PSK2:\r

-                       if (modread == 2) return TRUE;\r
+                       if (modread == 2) return true;\r

                        break;\r
                case DEMOD_PSK3:\r
                        break;\r
                case DEMOD_PSK3:\r

-                       if (modread == 3) return TRUE;\r
+                       if (modread == 3) return true;\r

                        break;\r
                case DEMOD_NRZ:\r
                        break;\r
                case DEMOD_NRZ:\r

-                       if (modread == 7) return TRUE;\r
+                       if (modread == 7) return true;\r

                        break;\r
                case DEMOD_BI:\r
                        break;\r
                case DEMOD_BI:\r

-                       if (modread == 6) return TRUE;\r
+                       if (modread == 6) return true;\r

                        break;\r
                default:\r
                        break;\r
                default:\r

-                       return FALSE;\r
+                       return false;\r

        }\r
        }\r

-       return FALSE;\r
+       return false;\r

 }\r
 \r
 int convertQ5bitRate(uint8_t bitRateRead) {\r
 }\r
 \r
 int convertQ5bitRate(uint8_t bitRateRead) {\r


@@ -718,7 +720,7 @@ int convertQ5bitRate(uint8_t bitRateRead) {
 \r
 bool testQ5(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t    clk){\r
 \r
 \r
 bool testQ5(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t    clk){\r
 \r

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

        uint8_t si = 0;\r
        for (uint8_t idx = 28; idx < 64; idx++){\r
                si = idx;\r
        uint8_t si = 0;\r
        for (uint8_t idx = 28; idx < 64; idx++){\r
                si = idx;\r


@@ -751,9 +753,9 @@ bool testQ5(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk){
                if (*fndBitRate < 0) continue;\r
                *offset = idx;\r
 \r
                if (*fndBitRate < 0) continue;\r
                *offset = idx;\r
 \r

-               return TRUE;\r
+               return true;\r

        }\r
        }\r

-       return FALSE;\r
+       return false;\r

 }\r
 \r
 bool testBitRate(uint8_t readRate, uint8_t clk){\r
 }\r
 \r
 bool testBitRate(uint8_t readRate, uint8_t clk){\r


@@ -766,7 +768,7 @@ bool testBitRate(uint8_t readRate, uint8_t clk){
 \r
 bool test(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk, bool *Q5){\r
 \r
 \r
 bool test(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk, bool *Q5){\r
 \r

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

        uint8_t si = 0;\r
        for (uint8_t idx = 28; idx < 64; idx++){\r
                si = idx;\r
        uint8_t si = 0;\r
        for (uint8_t idx = 28; idx < 64; idx++){\r
                si = idx;\r


@@ -788,7 +790,7 @@ bool test(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk, bool *Q5)
                //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

-               bool extMode =( (safer == 0x6 || safer == 0x9) && extend) ? TRUE : FALSE;\r
+               bool extMode =( (safer == 0x6 || safer == 0x9) && extend) ? true : false;\r

 \r
                if (!extMode){\r
                        if (xtRate) continue;  //nml01 || nml02 ||  caused issues on noralys tags\r
 \r
                if (!extMode){\r
                        if (xtRate) continue;  //nml01 || nml02 ||  caused issues on noralys tags\r


@@ -798,14 +800,14 @@ bool test(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk, bool *Q5)
                if (!testBitRate(bitRate, clk)) continue;\r
                *fndBitRate = bitRate;\r
                *offset = idx;\r
                if (!testBitRate(bitRate, clk)) continue;\r
                *fndBitRate = bitRate;\r
                *offset = idx;\r

-               *Q5 = FALSE;\r
-               return TRUE;\r
+               *Q5 = false;\r
+               return true;\r

        }\r
        if (testQ5(mode, offset, fndBitRate, clk)) {\r
        }\r
        if (testQ5(mode, offset, fndBitRate, clk)) {\r

-               *Q5 = TRUE;\r
-               return TRUE;\r
+               *Q5 = true;\r
+               return true;\r

        }\r
        }\r

-       return FALSE;\r
+       return false;\r

 }\r
 \r
 void printT55xxBlock(const char *blockNum){\r
 }\r
 \r
 void printT55xxBlock(const char *blockNum){\r


@@ -1471,7 +1473,7 @@ int CmdT55xxBruteForce(const char *Cmd) {
 \r
                        PrintAndLog("Testing %08X", testpwd);\r
 \r
 \r
                        PrintAndLog("Testing %08X", testpwd);\r
 \r

-                       if ( !AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, TRUE, testpwd)) {\r
+                       if ( !AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, testpwd)) {\r

                                PrintAndLog("Aquireing data from device failed. Quitting");\r
                                free(keyBlock);\r
                                return 0;\r
                                PrintAndLog("Aquireing data from device failed. Quitting");\r
                                free(keyBlock);\r
                                return 0;\r


@@ -1516,7 +1518,7 @@ int CmdT55xxBruteForce(const char *Cmd) {
                        return 0;\r
                }\r
 \r
                        return 0;\r
                }\r
 \r

-               if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, TRUE, i)) {\r
+               if (!AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, true, i)) {\r

                        PrintAndLog("Aquireing data from device failed. Quitting");\r
                        free(keyBlock);\r
                        return 0;\r
                        PrintAndLog("Aquireing data from device failed. Quitting");\r
                        free(keyBlock);\r
                        return 0;\r