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

diff --git a/client/cmdlft55xx.h b/client/cmdlft55xx.h
index e4eca17c..37895fe8 100644
--- a/client/cmdlft55xx.h
+++ b/client/cmdlft55xx.h
@@ -10,20 +10,56 @@
 #ifndef CMDLFT55XX_H__
 #define CMDLFT55XX_H__
 
+// config blocks
+#define T55X7_DEFAULT_CONFIG_BLOCK      0x000880E8      // compat mode, data rate 32, manchester, ST, 7 data blocks
+#define T55X7_RAW_CONFIG_BLOCK          0x000880E0      // compat mode, data rate 32, manchester, 7 data blocks
+
+#define T55X7_EM_UNIQUE_CONFIG_BLOCK    0x00148040      // emulate em4x02/unique - compat mode, manchester, data rate 64, 2 data blocks
+
+
+// FDXB requires data inversion and BiPhase 57 is simply BipHase 50 inverted, so we can either do it using the modulation scheme or the inversion flag
+// we've done both below to prove that it works either way, and the modulation value for BiPhase 50 in the Atmel data sheet of binary "10001" (17) is a typo,
+// and it should actually be "10000" (16)
+// #define T55X7_FDXB_CONFIG_BLOCK         903F8080      // emulate fdx-b - xtended mode, BiPhase ('57), data rate 32, 4 data blocks
+#define T55X7_FDXB_CONFIG_BLOCK         0x903F0082      // emulate fdx-b - xtended mode, BiPhase ('50), invert data, data rate 32, 4 data blocks
+#define T55X7_HID_26_CONFIG_BLOCK       0x00107060      // hid 26 bit - compat mode, FSK2a, data rate 50, 3 data blocks
+#define T55X7_INDALA_64_CONFIG_BLOCK    0x00081040      // emulate indala 64 bit - compat mode, PSK1, psk carrier FC * 2, data rate 32, maxblock 2
+#define T55X7_INDALA_224_CONFIG_BLOCK   0x000810E0      // emulate indala 224 bit - compat mode, PSK1, psk carrier FC * 2, data rate 32, maxblock 7
+#define T55X7_GUARDPROXII_CONFIG_BLOCK	0x00150060		// bitrate 64pcb, Direct modulation, Biphase, 3 data blocks
+#define T55X7_VIKING_CONFIG_BLOCK		0x00088040		// compat mode, data rate 32, Manchester, 2 data blocks
+#define T55X7_bin 0b0010
+
+
 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 +71,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