FIX: move and rename the CRC8Maxim method into crc.c

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 4a1bdaa07ce6fbfb0c4d8e82733dbbaab70ff58a..61c8ec2b352372eeafd0e1a87dfb5b4ce7631f15 100644 (file)
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -21,10 +21,60 @@
 #include "util.h"\r
 #include "data.h"\r
 #include "lfdemod.h"\r
+#include "../common/crc.h"\r
 \r
 #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
+//  0 = FSK\r
+//  1 = ASK\r
+//  2 = PSK\r
+//  4 = NZR (direct)\r
+typedef struct {\r
+       uint8_t modulation;\r
+       bool inversed;\r
+       uint32_t block0;\r
+} t55xx_conf_block;\r
+\r
+// Default configuration: FSK, not inversed.\r
+t55xx_conf_block config = {0x00, FALSE, 0x00};\r
+\r
+       // FSK\r
+       // FSK inverted\r
+       //FSKrawDemod("", FALSE)\r
+       //FSKrawDemod("1", FALSE)\r
+\r
+       // ASK/MAN\r
+       // ASK/MAN inverted\r
+       //ASKmanDemod("", FALSE, FALSE)\r
+       \r
+       // NZR (autoclock, normal, maxerrors 1)\r
+       // NZR (autoclock, inverse, maxerrors 1)\r
+       //NRZrawDemod("0 0 1", FALSE) ) {\r
+               \r
+       // PSK (autoclock, normal, maxerrors 1)\r
+       // PSK (autoclock, inverse, maxerrors 1)\r
+       //PSKDemod("0 0 1", FALSE)\r
+\r
+int usage_t55xx_config(){\r
+       PrintAndLog("Usage: lf t55xx config [d <demodulation>] [i 0|1]");\r
+       PrintAndLog("Options:        ");\r
+       PrintAndLog("       h             This help");\r
+       PrintAndLog("       d <>          Set demodulation FSK / ASK / PSK / NZR");\r
+       PrintAndLog("       i [0|1]       Inverse data signal, Default: 0");\r
+       PrintAndLog("Examples:");\r
+       PrintAndLog("      lf t55xx config d FSK ");\r
+       PrintAndLog("                    FSK demodulation");\r
+       PrintAndLog("      lf t55xx config d FSK i 1");\r
+       PrintAndLog("                    FSK demodulation, inverse data");\r
+       PrintAndLog("      lf dump");\r
+       PrintAndLog("                    Dumps all block from tag");\r
+       PrintAndLog("      lf trace");\r
+       PrintAndLog("                    Read trace block and decode it");\r
+       PrintAndLog("      lf info");\r
+       PrintAndLog("                    Read configuration and decode it");\r
+       return 0;\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
@@ -76,20 +126,33 @@ int usage_t55xx_dump(){
 \r
 static int CmdHelp(const char *Cmd);\r
 \r
+int CmdT55xxSetConfig(const char *Cmd){\r
+       \r
+       uint8_t paramNum =0;\r
+       if(param_getchar(Cmd, paramNum) == 'h')\r
+       {\r
+               return usage_t55xx_config();\r
+       }\r
+\r
+       uint8_t buff[] = { 0x01, 0x01, 0x01, 0x01,\r
+                                          0x01, 0x01, 0x01, 0x01,\r
+                                          0x01, 0x40, 0x01, 0x01, 0x04 };\r
+       PrintAndLog("CRC-8: %x",CRC8Maxim(buff, 13));\r
+\r
+       //config = { 0, FALSE};\r
+       return 0;\r
+}\r
+\r
+// detect configuration?\r
+\r
 int CmdReadBlk(const char *Cmd)\r
 {\r
-       int i = 0;\r
        int block = -1;\r
        int password = 0xFFFFFFFF; //default to blank Block 7\r
-       size_t bitlen = 0;\r
-       uint32_t blockData = 0;\r
-       uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0x00};\r
-       \r
+\r
        char cmdp = param_getchar(Cmd, 0);\r
-       if (cmdp == 'h' || cmdp == 'H') {\r
-               usage_t55xx_read();\r
-               return 0;\r
-       }\r
+       if (cmdp == 'h' || cmdp == 'H')\r
+               return usage_t55xx_read();\r
 \r
        int res = sscanf(Cmd, "%d %x", &block, &password);\r
 \r
@@ -123,41 +186,63 @@ int CmdReadBlk(const char *Cmd)
        WaitForResponse(CMD_ACK,NULL);\r
 \r
        setGraphBuf(got, 12000);\r
-       \r
-       bitlen = getFromGraphBuf(bits);\r
-\r
-       int ans = 0;\r
-       ans = CmdFSKrawdemod("");\r
-       ans = CmdFSKrawdemod("1"); //invert?\r
-       ans = Cmdaskmandemod("");\r
-       ans = Cmdaskrawdemod("");\r
-       ans = CmdNRZrawDemod("");\r
-       ans = CmdPSK1rawDemod("");\r
-       ans = CmdPSK2rawDemod("");\r
+\r
+       if (block == 0){\r
+               // try a detection.\r
+               \r
+       }\r
        \r
-       // if ( !tryDemod(bits, bitlen) )\r
-               // return 3;\r
+       if (CmdDetectClockRate("f")){ //wave is almost certainly FSK\r
+      //call FSK DEMOD\r
+               // FSK\r
+               if ( FSKrawDemod("", FALSE))\r
+                       printT55xx("FSK");\r
+               // FSK inverted\r
+               if ( FSKrawDemod("1", FALSE)) \r
+                       printT55xx("FSK inv");\r
+    } else {\r
+               // ASK/MAN (autoclock, normal, maxerrors 1)\r
+               if ( ASKmanDemod("0 0 1", FALSE, FALSE) )\r
+                       printT55xx("ASK/MAN");\r
+               \r
+               // ASK/MAN (autoclock, inverted, maxerrors 1)\r
+               if ( ASKmanDemod("0 1 1", FALSE, FALSE) )\r
+                       printT55xx("ASK/MAN Inv");\r
+\r
+               // NZR (autoclock, normal, maxerrors 1)\r
+               if  ( NRZrawDemod("0 0 1", FALSE) )\r
+                       printT55xx("NZR");\r
+               // NZR (autoclock, inverted, maxerrors 1)\r
+               if  ( NRZrawDemod("0 1 1", FALSE) )\r
+                       printT55xx("NZR inv");\r
+               \r
+               // PSK (autoclock, normal, maxerrors 1)\r
+               if (!PSKDemod("0 0 1", FALSE))\r
+                       printT55xx("PSK");\r
+\r
+               // PSK (autoclock, inverted, maxerrors 1)\r
+               if (!PSKDemod("0 1 1", FALSE))\r
+                       printT55xx("PSK inv");\r
+       }\r
+       return 0;\r
+}\r
+\r
+void printT55xx(const char *demodStr){\r
        \r
-       // //move bits back to DemodBuffer\r
-       // setDemodBuf(bits, bitlen, 0);\r
-       // printBitStream(bits, bitlen);\r
+       uint32_t blockData = 0;\r
+       uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0x00};\r
+               \r
        if ( !DemodBufferLen) \r
-               return 0;\r
+               return;\r
        \r
+       int i =0;\r
     for (;i<DemodBufferLen;++i)\r
                bits[i]=DemodBuffer[i];\r
        \r
        blockData = PackBits(1, 32, bits);\r
-\r
-       if ( block < 0)\r
-               PrintAndLog(" Decoded     : 0x%08X  %s", blockData, sprint_bin(bits+1,32) );\r
-       else\r
-               PrintAndLog(" Block %d    : 0x%08X  %s", block, blockData, sprint_bin(bits+1,32) );\r
-       \r
-       return 0;\r
+       PrintAndLog("0x%08X  %s [%s]", blockData, sprint_bin(bits+1,32), demodStr );\r
 }\r
 \r
-\r
 /*\r
 FSK1 / FSK1a\r
 size = fskdemod(dest, size, 32, 0, 8, 10);  // fsk1 RF/32 \r
@@ -172,54 +257,6 @@ size = fskdemod(dest, size, 64, 1, 10, 8);  // FSK2a RF/64
 PSK1\r
 errCnt = pskRawDemod(bits, &bitlen, 32, 0);\r
 */\r
-bool tryDemod(uint8_t bits[], size_t bitlen) {\r
-       \r
-       int invert = 0;\r
-       int clk = 0;\r
-       int errCnt, size;\r
-       int maxErr = 100;\r
-       uint8_t rflen, fchigh, fclow, dummy = 0;\r
-       uint16_t fcs=0;\r
-\r
-       // ASK - manchester demod\r
-       errCnt = askmandemod(bits, &bitlen, &clk, &invert, maxErr);\r
-       if ( analyseDemod(errCnt, bitlen, clk, invert) ) \r
-               return true;\r
-\r
-       // FSK demod\r
-       fcs = countFC(bits, bitlen, &dummy);\r
-       if (fcs == 0){\r
-         fchigh = 10;\r
-         fclow = 8;\r
-       }else{\r
-         fchigh = (fcs >> 8) & 0xFF;\r
-         fclow = fcs & 0xFF;\r
-       }\r
-       //get bit clock length\r
-       rflen = detectFSKClk(bits, bitlen, fchigh, fclow);\r
-       rflen = (rflen == 0) ? 50 : rflen;\r
-\r
-       size = fskdemod(bits, bitlen, rflen, invert, fchigh, fclow);\r
-       if ( analyseDemod(size, bitlen, clk, invert) ) \r
-               return true;    \r
-       \r
-       // PSK demod\r
-       return false;\r
-}\r
-\r
-bool analyseDemod( int errCnt, size_t bitlen, uint8_t clock, uint8_t invert){\r
-       if (g_debugMode) \r
-               PrintAndLog("ErrorCount: %d, Bits Found: %d, Clock: %d, invert: %d", errCnt, bitlen, clock, invert);\r
-         //PrintAndLog("Args invert: %d - Clock:%d - fchigh:%d - fclow: %d",invert,rfLen,fchigh, fclow);\r
-         \r
-       //throw away static - allow 1 and -1 (in case of threshold command first)\r
-       if ( errCnt == -1 || bitlen < 32 ){  \r
-               PrintAndLog("no success demod");\r
-               return false;\r
-       }\r
-       return true;\r
-}\r
-\r
 int CmdWriteBlk(const char *Cmd)\r
 {\r
        int block = 8; //default to invalid block\r
@@ -263,7 +300,6 @@ int CmdWriteBlk(const char *Cmd)
 \r
 int CmdReadTrace(const char *Cmd)\r
 {\r
-       size_t bitlen;\r
        uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0x00};\r
 \r
        char cmdp = param_getchar(Cmd, 0);\r
@@ -285,9 +321,10 @@ int CmdReadTrace(const char *Cmd)
                //CmdSamples("12000");\r
        }\r
        \r
-       bitlen = getFromGraphBuf(bits);\r
-\r
-\r
+       size_t bitlen = getFromGraphBuf(bits);\r
+       if ( bitlen == 0 )\r
+               return 2;\r
+       \r
        RepaintGraphWindow();\r
 \r
        uint8_t si = 5;\r
@@ -349,18 +386,17 @@ int CmdInfo(const char *Cmd){
        */\r
        char cmdp = param_getchar(Cmd, 0);\r
 \r
-       if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') {\r
-               usage_t55xx_info();\r
-               return 0;\r
+       if (cmdp == 'h' || cmdp == 'H') {\r
+               return usage_t55xx_info();\r
        } else {\r
                CmdReadBlk("0");\r
        }       \r
 \r
+       // config\r
+       \r
        uint8_t bits[LF_BITSSTREAM_LEN] = {0x00};\r
 \r
-       manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bits, LF_BITSSTREAM_LEN);\r
-       \r
-       uint8_t si = 5;\r
+       uint8_t si = 1;\r
        uint32_t bl0      = PackBits(si, 32, bits);\r
        \r
        uint32_t safer    = PackBits(si, 4, bits); si += 4;     \r
@@ -434,40 +470,6 @@ int CmdDump(const char *Cmd){
        return 0;\r
 }\r
 \r
-int CmdIceFsk(const char *Cmd){\r
-\r
-       if (!HasGraphData()) return 0;\r
-\r
-       iceFsk3(GraphBuffer, LF_TRACE_BUFF_SIZE);\r
-       RepaintGraphWindow();\r
-       return 0;\r
-}\r
-int CmdIceManchester(const char *Cmd){\r
-       ManchesterDemod( -1);\r
-       return 0;\r
-}\r
-int ManchesterDemod(int blockNum){\r
-\r
-       if (!HasGraphData()) return 0;\r
-               \r
-       uint8_t sizebyte = 32;\r
-       // the value 5 was selected during empirical studies of the decoded data. Some signal noise to skip.\r
-       uint8_t offset = 5;\r
-       uint32_t blockData;\r
-       uint8_t  bits[LF_BITSSTREAM_LEN] = {0x00};\r
-       uint8_t * bitstream = bits;\r
-       \r
-       manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bits, LF_BITSSTREAM_LEN);    \r
-       blockData = PackBits(offset, sizebyte, bits);\r
-\r
-       if ( blockNum < 0)\r
-               PrintAndLog(" Decoded     : 0x%08X  %s", blockData, sprint_bin(bitstream+offset,sizebyte) );\r
-               else\r
-               PrintAndLog(" Block %d    : 0x%08X  %s", blockNum, blockData, sprint_bin(bitstream+offset,sizebyte) );\r
-       \r
-       return 0;\r
-} \r
-\r
 char * GetBitRateStr(uint32_t id){\r
        static char buf[40];\r
        char *retStr = buf;\r
@@ -563,7 +565,6 @@ char * GetModulationStr( uint32_t id){
        return buf;\r
 }\r
 \r
-\r
 uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits){\r
        \r
        int i = start;\r
@@ -580,12 +581,13 @@ uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits){
 \r
 static command_t CommandTable[] =\r
 {\r
-  {"help",   CmdHelp,        1, "This help"},\r
-  {"read",   CmdReadBlk,     0, "<block> [password] -- Read T55xx block data (page 0) [optional password]"},\r
-  {"write",  CmdWriteBlk,    0, "<block> <data> [password] -- Write T55xx block data (page 0) [optional password]"},\r
-  {"trace",  CmdReadTrace,   0, "[1] Read T55xx traceability data (page 1/ blk 0-1)"},\r
-  {"info",   CmdInfo,        0, "[1] Read T55xx configuration data (page 0/ blk 0)"},\r
-  {"dump",   CmdDump,        0, "[password] Dump T55xx card block 0-7. [optional password]"},\r
+  {"help",   CmdHelp,           1, "This help"},\r
+  {"config", CmdT55xxSetConfig, 1, "Set T55XX config for modulation, inversed data"},\r
+  {"read",   CmdReadBlk,        0, "<block> [password] -- Read T55xx block data (page 0) [optional password]"},\r
+  {"write",  CmdWriteBlk,       0, "<block> <data> [password] -- Write T55xx block data (page 0) [optional password]"},\r
+  {"trace",  CmdReadTrace,      0, "[1] Read T55xx traceability data (page 1/ blk 0-1)"},\r
+  {"info",   CmdInfo,           0, "[1] Read T55xx configuration data (page 0/ blk 0)"},\r
+  {"dump",   CmdDump,           0, "[password] Dump T55xx card block 0-7. [optional password]"},\r
   {NULL, NULL, 0, NULL}\r
 };\r
 \r

diff --git a/client/cmdlft55xx.h b/client/cmdlft55xx.h
index cbd6312a71ace8112f8d948160baf7e33967bfe4..7ae0159b9026a9ecb2550e854427f9d13117ee66 100644 (file)
--- a/client/cmdlft55xx.h
+++ b/client/cmdlft55xx.h
@@ -11,18 +11,15 @@
 #define CMDLFT55XX_H__\r
 \r
 int CmdLFT55XX(const char *Cmd);\r
-\r
+int CmdT55xxSetConfig(const char *Cmd);\r
 int CmdReadBlk(const char *Cmd);\r
 int CmdWriteBlk(const char *Cmd);\r
 int CmdReadTrace(const char *Cmd);\r
 int CmdInfo(const char *Cmd);\r
-int CmdIceFsk(const char *Cmd);\r
-int CmdIceManchester(const char *Cmd);\r
-int ManchesterDemod(int block);\r
+\r
 char * GetBitRateStr(uint32_t id);\r
 char * GetSaferStr(uint32_t id);\r
 char * GetModulationStr( uint32_t id);\r
 uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bitstream);\r
-bool tryDemod(uint8_t bits[], uint32_t bitlen);\r
-bool analyseDemod( int errCnt, size_t bitlen, uint8_t clock, uint8_t invert);\r
+void printT55xx(const char *demodStr);\r
 #endif\r

diff --git a/common/crc.c b/common/crc.c
index 90d57afab6a56c90bdfbc4b8840b718ffea247cf..153ff11c235d50ecaf8f60de04654986e25c887a 100644 (file)
--- a/common/crc.c
+++ b/common/crc.c
@@ -5,8 +5,9 @@
 //-----------------------------------------------------------------------------
 // Generic CRC calculation code.
 //-----------------------------------------------------------------------------
-
 #include "crc.h"
+#include <stdint.h>
+#include <stddef.h>
 
 void crc_init(crc_t *crc, int order, uint32_t polynom, uint32_t initial_value, uint32_t final_xor)
 {
@@ -40,3 +41,15 @@ uint32_t crc_finish(crc_t *crc)
 {
        return ( crc->state ^ crc->final_xor ) & crc->mask;
 }
+
+int CRC8Maxim(uint8_t *buff, size_t size  ) {
+       
+       crc_t crc;
+       crc_init(&crc, 8, 0x31, 0x00, 0x00);
+       crc_clear(&crc);
+
+       for ( int i=0; i < size; ++i){
+               crc_update(&crc, buff[i], 8);
+       }
+       return crc_finish(&crc);
+}

diff --git a/common/crc.h b/common/crc.h
index 8e68f3b336379e792680d957053b638b222e84de..eb91196bdf7beb944ca9b540981fcf8685fc8b23 100644 (file)
--- a/common/crc.h
+++ b/common/crc.h
@@ -10,6 +10,7 @@
 #define __CRC_H
 
 #include <stdint.h>
+#include <stddef.h>
 
 typedef struct crc {
        uint32_t state;
@@ -36,6 +37,9 @@ extern void crc_clear(crc_t *crc);
 /* Get the result of the crc calculation */
 extern uint32_t crc_finish(crc_t *crc);
 
+// Calculate CRC-8/Maxim checksum
+int CRC8Maxim(uint8_t *buff, size_t size  );
+
 /* Static initialization of a crc structure */
 #define CRC_INITIALIZER(_order, _polynom, _initial_value, _final_xor) { \
        .state = ((_initial_value) & ((1L<<(_order))-1)), \