FIX: test_t55x7_psk.lua now correctly handles bitrate/modulation/clockrate combina...

[proxmark3-svn] / client / cmdlft55xx.h

diff --git a/client/cmdlft55xx.h b/client/cmdlft55xx.h
index e4eca17cb18cf1a941c2cbb428ba94b01c665234..5a9af6a7f6cd5df19472d4db56263ad3204aef46 100644 (file)
--- a/client/cmdlft55xx.h
+++ b/client/cmdlft55xx.h
@@ -12,18 +12,19 @@
 \r
 typedef struct {\r
        enum {\r
-               DEMOD_FSK = 0x01,     \r
-               DEMOD_ASK = 0x02,\r
-               DEMOD_NZR = 0x03,    \r
-               DEMOD_PSK = 0x04,\r
-               DEMOD_BI  = 0x05,\r
+               DEMOD_NRZ  = 0x00,    \r
+               DEMOD_PSK1 = 0x01,\r
+               DEMOD_PSK2 = 0x02,\r
+               DEMOD_PSK3 = 0x03,\r
+               DEMOD_FSK  = 0x04,     \r
+               DEMOD_ASK  = 0x08,\r
+               DEMOD_BI   = 0x16,\r
        }  modulation;\r
-       bool inversed;\r
+       bool inverted;\r
        uint8_t offset;\r
        uint32_t block0;\r
 } t55xx_conf_block_t;\r
 \r
-\r
 int CmdLFT55XX(const char *Cmd);\r
 int CmdT55xxSetConfig(const char *Cmd);\r
 int CmdT55xxReadBlock(const char *Cmd);\r
@@ -35,6 +36,7 @@ int CmdT55xxDetect(const char *Cmd);
 char * GetBitRateStr(uint32_t id);\r
 char * GetSaferStr(uint32_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
 void printT55xxBlock(const char *demodStr);\r
@@ -42,6 +44,7 @@ void printConfiguration( t55xx_conf_block_t b);
 \r
 void DecodeT55xxBlock();\r
 bool tryDetectModulation();\r
-bool test();\r
+bool test(uint8_t mode, uint8_t *offset);\r
 int special(const char *Cmd);\r
+int AquireData( uint8_t block );\r
 #endif\r