X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/db69363840b12d68566d7be2de512bf4c7c51b4e..a198737b44d487782fb75bdc163744e14f5e1ac6:/client/cmdlft55xx.h

diff --git a/client/cmdlft55xx.h b/client/cmdlft55xx.h
index e4eca17c..364f0271 100644
--- a/client/cmdlft55xx.h
+++ b/client/cmdlft55xx.h
@@ -12,18 +12,34 @@
 
 typedef struct {
 	enum {
-		DEMOD_FSK = 0x01,     
-		DEMOD_ASK = 0x02,
-		DEMOD_NZR = 0x03,    
-		DEMOD_PSK = 0x04,
-		DEMOD_BI  = 0x05,
+		DEMOD_NRZ  = 0x00,    
+		DEMOD_PSK1 = 0x01,
+		DEMOD_PSK2 = 0x02,
+		DEMOD_PSK3 = 0x03,
+		DEMOD_FSK1  = 0x04,     
+		DEMOD_FSK1a = 0x05,     
+		DEMOD_FSK2  = 0x06,     
+		DEMOD_FSK2a = 0x07, 
+		DEMOD_FSK   = 0xF0, //generic FSK (auto detect FCs)    
+		DEMOD_ASK  = 0x08,
+		DEMOD_BI   = 0x10,
+		DEMOD_BIa  = 0x18,		
 	}  modulation;
-	bool inversed;
+	bool inverted;
 	uint8_t offset;
 	uint32_t block0;
+	enum {
+		RF_8 = 0x00,
+		RF_16 = 0x01,
+		RF_32 = 0x02,
+		RF_40 = 0x03,
+		RF_50 = 0x04,
+		RF_64 = 0x05,
+		RF_100 = 0x06,
+		RF_128 = 0x07,
+	} bitrate;
 } t55xx_conf_block_t;
 
-
 int CmdLFT55XX(const char *Cmd);
 int CmdT55xxSetConfig(const char *Cmd);
 int CmdT55xxReadBlock(const char *Cmd);
@@ -35,13 +51,16 @@ int CmdT55xxDetect(const char *Cmd);
 char * GetBitRateStr(uint32_t id);
 char * GetSaferStr(uint32_t id);
 char * GetModulationStr( uint32_t id);
+char * GetModelStrFromCID(uint32_t cid);
 char * GetSelectedModulationStr( uint8_t id);
-uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bitstream);
+uint32_t PackBits(uint8_t start, uint8_t len, uint8_t *bitstream);
 void printT55xxBlock(const char *demodStr);
 void printConfiguration( t55xx_conf_block_t b);
 
-void DecodeT55xxBlock();
+bool DecodeT55xxBlock();
 bool tryDetectModulation();
-bool test();
+bool test(uint8_t mode, uint8_t *offset, int *fndBitRate);
 int special(const char *Cmd);
+int AquireData( uint8_t block );
+
 #endif