add: @pwpipi 's fixes to 14B

[proxmark3-svn] / client / cmdlft55xx.h

diff --git a/client/cmdlft55xx.h b/client/cmdlft55xx.h
index 004154ff26e802a0158c5b8e55cdef64725f723c..364f0271f472d18ef3f9a39d80e94ab816b81d0a 100644 (file)
--- a/client/cmdlft55xx.h
+++ b/client/cmdlft55xx.h
@@ -16,13 +16,28 @@ typedef struct {
                DEMOD_PSK1 = 0x01,\r
                DEMOD_PSK2 = 0x02,\r
                DEMOD_PSK3 = 0x03,\r
                DEMOD_PSK1 = 0x01,\r
                DEMOD_PSK2 = 0x02,\r
                DEMOD_PSK3 = 0x03,\r

-               DEMOD_FSK  = 0x04,     \r
+               DEMOD_FSK1  = 0x04,     \r
+               DEMOD_FSK1a = 0x05,     \r
+               DEMOD_FSK2  = 0x06,     \r
+               DEMOD_FSK2a = 0x07, \r
+               DEMOD_FSK   = 0xF0, //generic FSK (auto detect FCs)    \r

                DEMOD_ASK  = 0x08,\r
                DEMOD_ASK  = 0x08,\r

-               DEMOD_BI   = 0x16,\r
+               DEMOD_BI   = 0x10,\r
+               DEMOD_BIa  = 0x18,              \r

        }  modulation;\r
        }  modulation;\r

-       bool inversed;\r
+       bool inverted;\r

        uint8_t offset;\r
        uint32_t block0;\r
        uint8_t offset;\r
        uint32_t block0;\r

+       enum {\r
+               RF_8 = 0x00,\r
+               RF_16 = 0x01,\r
+               RF_32 = 0x02,\r
+               RF_40 = 0x03,\r
+               RF_50 = 0x04,\r
+               RF_64 = 0x05,\r
+               RF_100 = 0x06,\r
+               RF_128 = 0x07,\r
+       } bitrate;\r

 } t55xx_conf_block_t;\r
 \r
 int CmdLFT55XX(const char *Cmd);\r
 } t55xx_conf_block_t;\r
 \r
 int CmdLFT55XX(const char *Cmd);\r


@@ -38,12 +53,14 @@ char * GetSaferStr(uint32_t id);
 char * GetModulationStr( uint32_t id);\r
 char * GetModelStrFromCID(uint32_t cid);\r
 char * GetSelectedModulationStr( uint8_t id);\r
 char * GetModulationStr( uint32_t id);\r
 char * GetModelStrFromCID(uint32_t cid);\r
 char * GetSelectedModulationStr( uint8_t id);\r

-uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bitstream);\r
+uint32_t PackBits(uint8_t start, uint8_t len, uint8_t *bitstream);\r

 void printT55xxBlock(const char *demodStr);\r
 void printConfiguration( t55xx_conf_block_t b);\r
 \r
 void printT55xxBlock(const char *demodStr);\r
 void printConfiguration( t55xx_conf_block_t b);\r
 \r

-void DecodeT55xxBlock();\r
+bool DecodeT55xxBlock();\r

 bool tryDetectModulation();\r
 bool tryDetectModulation();\r

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

 int special(const char *Cmd);\r
 int special(const char *Cmd);\r

+int AquireData( uint8_t block );\r
+\r

 #endif\r
 #endif\r