ADD: @marshmellow42 's fixex and resetread t55x7

[proxmark3-svn] / client / cmdlft55xx.h

diff --git a/client/cmdlft55xx.h b/client/cmdlft55xx.h
index 37895fe85e8a958e36b36ed4c8fc6826ca8bf125..d17adbf2ede2a75cd12ac69c9848d600e05d3370 100644 (file)
--- a/client/cmdlft55xx.h
+++ b/client/cmdlft55xx.h
@@ -20,13 +20,14 @@
 // 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\r
 // 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,\r
 // and it should actually be "10000" (16)\r
-// #define T55X7_FDXB_CONFIG_BLOCK         903F8080      // emulate fdx-b - xtended mode, BiPhase ('57), data rate 32, 4 data blocks\r
-#define T55X7_FDXB_CONFIG_BLOCK         0x903F0082      // emulate fdx-b - xtended mode, BiPhase ('50), invert data, data rate 32, 4 data blocks\r
-#define T55X7_HID_26_CONFIG_BLOCK       0x00107060      // hid 26 bit - compat mode, FSK2a, data rate 50, 3 data blocks\r
-#define T55X7_INDALA_64_CONFIG_BLOCK    0x00081040      // emulate indala 64 bit - compat mode, PSK1, psk carrier FC * 2, data rate 32, maxblock 2\r
-#define T55X7_INDALA_224_CONFIG_BLOCK   0x000810E0      // emulate indala 224 bit - compat mode, PSK1, psk carrier FC * 2, data rate 32, maxblock 7\r
-#define T55X7_GUARDPROXII_CONFIG_BLOCK 0x00150060              // bitrate 64pcb, Direct modulation, Biphase, 3 data blocks\r
-#define T55X7_VIKING_CONFIG_BLOCK              0x00088040              // compat mode, data rate 32, Manchester, 2 data blocks\r
+// #define T55X7_FDXB_CONFIG_BLOCK         903F8080  // emulate fdx-b - xtended mode, BiPhase ('57), data rate 32, 4 data blocks\r
+#define T55X7_FDXB_CONFIG_BLOCK         0x903F0082  // emulate fdx-b - xtended mode, BiPhase ('50), invert data, data rate 32, 4 data blocks\r
+#define T55X7_HID_26_CONFIG_BLOCK       0x00107060  // hid 26 bit - compat mode, FSK2a, data rate 50, 3 data blocks\r
+#define T55X7_INDALA_64_CONFIG_BLOCK    0x00081040  // emulate indala 64 bit - compat mode, PSK1, psk carrier FC * 2, data rate 32, maxblock 2\r
+#define T55X7_INDALA_224_CONFIG_BLOCK   0x000810E0  // emulate indala 224 bit - compat mode, PSK1, psk carrier FC * 2, data rate 32, maxblock 7\r
+#define T55X7_GUARDPROXII_CONFIG_BLOCK 0x00150060      // bitrate 64pcb, Direct modulation, Biphase, 3 data blocks\r
+#define T55X7_VIKING_CONFIG_BLOCK              0x00088040      // compat mode, data rate 32, Manchester, 2 data blocks\r
+#define T55X7_NORALYS_CONFIG_BLOCK             0x00088C6A      // compat mode,   (NORALYS - KCP3000)\r
 #define T55X7_bin 0b0010\r
 \r
 \r
@@ -59,6 +60,9 @@ typedef struct {
                RF_128 = 0x07,\r
        } bitrate;\r
 } t55xx_conf_block_t;\r
+t55xx_conf_block_t Get_t55xx_Config();\r
+void Set_t55xx_Config(t55xx_conf_block_t conf);\r
+\r
 \r
 int CmdLFT55XX(const char *Cmd);\r
 int CmdT55xxSetConfig(const char *Cmd);\r
@@ -67,6 +71,7 @@ int CmdT55xxWriteBlock(const char *Cmd);
 int CmdT55xxReadTrace(const char *Cmd);\r
 int CmdT55xxInfo(const char *Cmd);\r
 int CmdT55xxDetect(const char *Cmd);\r
+int CmdResetRead(const char *Cmd);\r
 \r
 char * GetBitRateStr(uint32_t id);\r
 char * GetSaferStr(uint32_t id);\r
@@ -75,12 +80,12 @@ char * GetModelStrFromCID(uint32_t cid);
 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
-void printConfiguration( t55xx_conf_block_t b);\r
+int printConfiguration( t55xx_conf_block_t b);\r
 \r
 bool DecodeT55xxBlock();\r
 bool tryDetectModulation();\r
 bool test(uint8_t mode, uint8_t *offset, int *fndBitRate);\r
 int special(const char *Cmd);\r
-int AquireData( uint8_t block );\r
+int AquireData( uint8_t page, uint8_t block, bool pwdmode, uint32_t password );\r
 \r
 #endif\r