CHG: now with enums :)

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 5ecf290a2f3e27568973e01d533e9dc72d9fa2af..44c511fb32871202d979d92bec1dac68f1719d4e 100644 (file)
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -26,8 +26,6 @@
 #define LF_TRACE_BUFF_SIZE 20000 // 32 x 32 x 10  (32 bit times numofblock (7), times clock skip..)\r
 #define LF_BITSSTREAM_LEN 1000 // more then 1000 bits shouldn't happend..  8block * 4 bytes * 8bits = \r
 \r
-\r
-\r
 // Default configuration: ASK, not inversed.\r
 t55xx_conf_block_t config = { .modulation = 2, .inversed = FALSE, .block0 = 0x00};\r
 \r
@@ -219,6 +217,9 @@ void DecodeT55xxBlock(){
        char buf[6] = {0x00};\r
        char *cmdStr = buf;\r
 \r
+       // clearing the DemodBuffer.\r
+       DemodBufferLen = 0x00;\r
+       \r
        // use the configuration\r
        switch( config.modulation ){\r
                case 1:\r
@@ -285,59 +286,59 @@ bool tryDetectModulation(){
        \r
        if (GetFskClock("", FALSE, FALSE)){ \r
                if ( FSKrawDemod("0 0", FALSE) && test()){\r
-                       tests[hits].modulation = 1;\r
-                       tests[hits].inversed = 0;\r
+                       tests[hits].modulation = DEMOD_FSK;\r
+                       tests[hits].inversed = FALSE;\r
                        ++hits;\r
                }\r
                if ( FSKrawDemod("0 1", FALSE) && test()) {\r
-                       tests[hits].modulation = 1;\r
-                       tests[hits].inversed = 1;\r
+                       tests[hits].modulation = DEMOD_FSK;\r
+                       tests[hits].inversed = TRUE;\r
                        ++hits;\r
                        }\r
     } else {\r
                if ( ASKmanDemod("0 0 1", FALSE, FALSE) && test()) {\r
-                       tests[hits].modulation = 2;\r
-                       tests[hits].inversed = 0;\r
+                       tests[hits].modulation = DEMOD_ASK;\r
+                       tests[hits].inversed = FALSE;\r
                        ++hits;\r
                        }\r
 \r
                if ( ASKmanDemod("0 1 1", FALSE, FALSE)  && test()) {\r
-                       tests[hits].modulation = 2;\r
-                       tests[hits].inversed = 1;\r
+                       tests[hits].modulation = DEMOD_ASK;\r
+                       tests[hits].inversed = TRUE;\r
                        ++hits;\r
                        }\r
                \r
                if ( NRZrawDemod("0 0 1", FALSE)  && test()) {\r
-                       tests[hits].modulation = 3;\r
-                       tests[hits].inversed = 0;\r
+                       tests[hits].modulation = DEMOD_NZR;\r
+                       tests[hits].inversed = FALSE;\r
                        ++hits;\r
                }\r
 \r
                if ( NRZrawDemod("0 1 1", FALSE)  && test()) {\r
-                       tests[hits].modulation = 3;\r
-                       tests[hits].inversed = 1;\r
+                       tests[hits].modulation = DEMOD_NZR;\r
+                       tests[hits].inversed = TRUE;\r
                        ++hits;\r
                        }\r
                \r
                if ( PSKDemod("0 0 1", FALSE)  && test()) {\r
-                       tests[hits].modulation = 4;\r
-                       tests[hits].inversed = 0;\r
+                       tests[hits].modulation = DEMOD_PSK;\r
+                       tests[hits].inversed = FALSE;\r
                        ++hits;\r
                }\r
                \r
                if ( PSKDemod("0 1 1", FALSE) && test()) {\r
-                       tests[++hits].modulation = 4;\r
-                       tests[hits].inversed = 1;\r
+                       tests[++hits].modulation = DEMOD_PSK;\r
+                       tests[hits].inversed = TRUE;\r
                        ++hits;\r
                }\r
                //PSK2?\r
                // if (!BiphaseRawDecode("0",FALSE)  && test()) {\r
-               //      tests[++hits].modulation = 5;\r
-               //      tests[hits].inversed = 0;\r
+               //      tests[++hits].modulation = DEMOD_BI;\r
+               //      tests[hits].inversed = FALSE;\r
                //}\r
                // if (!BiphaseRawDecode("1",FALSE) && test()) {\r
-               //      tests[++hits].modulation = 5;\r
-               //      tests[hits].inversed = 1;\r
+               //      tests[++hits].modulation = DEMOD_BI;\r
+               //      tests[hits].inversed = TRUE;\r
                // }\r
        }               \r
        if ( hits == 1) {\r
@@ -402,20 +403,6 @@ void printConfiguration( t55xx_conf_block_t b){
        PrintAndLog("");\r
 }\r
 \r
-/*\r
-FSK1 / FSK1a\r
-size = fskdemod(dest, size, 32, 0, 8, 10);  // fsk1 RF/32 \r
-size = fskdemod(dest, size, 32, 1, 8, 10);  // fsk1a RF/32 \r
-\r
-FSK2 / FSK2a\r
-size = fskdemod(dest, size, 32, 0, 10, 8);  // fsk2 RF/32 \r
-size = fskdemod(dest, size, 32, 1, 10, 8);  // fsk2a RF/32 \r
-size = fskdemod(dest, size, 50, 1, 10, 8);  // fsk2a RF/50 \r
-size = fskdemod(dest, size, 64, 1, 10, 8);  // FSK2a RF/64 \r
-\r
-PSK1\r
-errCnt = pskRawDemod(bits, &bitlen, 32, 0);\r
-*/\r
 int CmdT55xxWriteBlock(const char *Cmd)\r
 {\r
        int block = 8; //default to invalid block\r
@@ -517,7 +504,7 @@ int CmdT55xxReadTrace(const char *Cmd)
        PrintAndLog("-------------------------------------------------------------");\r
        PrintAndLog(" Raw Data - Page 1");\r
        PrintAndLog("     Block 0  : 0x%08X  %s", bl0, sprint_bin(DemodBuffer+5,32) );\r
-       PrintAndLog("     Block 0  : 0x%08X  %s", bl1, sprint_bin(DemodBuffer+37,32) );\r
+       PrintAndLog("     Block 1  : 0x%08X  %s", bl1, sprint_bin(DemodBuffer+37,32) );\r
        PrintAndLog("-------------------------------------------------------------");\r
        /*\r
        TRACE - BLOCK O\r
@@ -755,19 +742,19 @@ char * GetSelectedModulationStr( uint8_t id){
        char *retStr = buf;\r
        \r
        switch (id){\r
-               case 1:\r
+               case DEMOD_FSK:\r
                        sprintf(retStr,"FSK (%d)",id);\r
                        break;\r
-               case 2:         \r
+               case DEMOD_ASK:         \r
                        sprintf(retStr,"ASK (%d)",id);\r
                        break;\r
-               case 3:\r
+               case DEMOD_NZR:\r
                        sprintf(retStr,"DIRECT/NRZ (%d)",id);\r
                        break;\r
-               case 4:\r
+               case DEMOD_PSK:\r
                        sprintf(retStr,"PSK (%d)",id);\r
                        break;\r
-               case 5:\r
+               case DEMOD_BI:\r
                        sprintf(retStr,"BIPHASE (%d)",id);\r
                        break;\r
                default:\r

diff --git a/client/cmdlft55xx.h b/client/cmdlft55xx.h
index ec74aed48e543a2355d3b5c21d2bdc065b5b9fab..9362c9f43ae52f29d13818b42515806be12cf11f 100644 (file)
--- a/client/cmdlft55xx.h
+++ b/client/cmdlft55xx.h
@@ -11,7 +11,13 @@
 #define CMDLFT55XX_H__\r
 \r
 typedef struct {\r
-       uint8_t modulation;\r
+       enum {\r
+               DEMOD_FSK = 0x01,     \r
+               DEMOD_ASK = 0x02,\r
+               DEMOD_NZR = 0x03,    \r
+               DEMOD_PSK = 0x04,\r
+               DEMOD_BI  = 0x05,\r
+       }  modulation;\r
        bool inversed;\r
        uint32_t block0;\r
 } t55xx_conf_block_t;\r