X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/a087e9cf40bdb4d7546a7645995624a519aef2a6..8d53ea1403aed85abc8ff04437369167751a51dd:/client/cmdlft55xx.h?ds=sidebyside

diff --git a/client/cmdlft55xx.h b/client/cmdlft55xx.h
index 004154ff..364f0271 100644
--- a/client/cmdlft55xx.h
+++ b/client/cmdlft55xx.h
@@ -16,13 +16,28 @@ typedef struct {
 		DEMOD_PSK1 = 0x01,
 		DEMOD_PSK2 = 0x02,
 		DEMOD_PSK3 = 0x03,
-		DEMOD_FSK  = 0x04,     
+		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   = 0x16,
+		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);
@@ -38,12 +53,14 @@ 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(uint8_t mode, uint8_t *offset);
+bool test(uint8_t mode, uint8_t *offset, int *fndBitRate);
 int special(const char *Cmd);
+int AquireData( uint8_t block );
+
 #endif