FIX: 'hw tune' - peakf shouldn't be compare with voltages limits :)

[proxmark3-svn] / client / cmdlft55xx.h

diff --git a/client/cmdlft55xx.h b/client/cmdlft55xx.h
index 9df0cb550d8277fe7a3b775fcaae8eef8e8eefee..ff4f0e6903e2a2578a29b52ccacd1c0e5e4683c0 100644 (file)
--- a/client/cmdlft55xx.h
+++ b/client/cmdlft55xx.h
@@ -13,10 +13,7 @@
 // config blocks\r
 #define T55X7_DEFAULT_CONFIG_BLOCK      0x000880E8      // compat mode, data rate 32, manchester, ST, 7 data blocks\r
 #define T55X7_RAW_CONFIG_BLOCK          0x000880E0      // compat mode, data rate 32, manchester, 7 data blocks\r
 // config blocks\r
 #define T55X7_DEFAULT_CONFIG_BLOCK      0x000880E8      // compat mode, data rate 32, manchester, ST, 7 data blocks\r
 #define T55X7_RAW_CONFIG_BLOCK          0x000880E0      // compat mode, data rate 32, manchester, 7 data blocks\r

-\r

 #define T55X7_EM_UNIQUE_CONFIG_BLOCK    0x00148040      // emulate em4x02/unique - compat mode, manchester, data rate 64, 2 data blocks\r
 #define T55X7_EM_UNIQUE_CONFIG_BLOCK    0x00148040      // emulate em4x02/unique - compat mode, manchester, data rate 64, 2 data blocks\r

-\r
-\r

 // 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
 // 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


@@ -30,6 +27,7 @@
 #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_IOPROX_CONFIG_BLOCK              0x00147040  // maxblock 2\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_IOPROX_CONFIG_BLOCK              0x00147040  // maxblock 2\r

+#define T55X7_PRESCO_CONFIG_BLOCK              0x00088088  // data rate 32, Manchester, 5 data blocks, STT\r

 #define T55X7_bin 0b0010\r
 \r
 #define T5555_DEFAULT_CONFIG_BLOCK             0x6001F004  // data rate 64 , ask, manchester, 2 data blocks?\r
 #define T55X7_bin 0b0010\r
 \r
 #define T5555_DEFAULT_CONFIG_BLOCK             0x6001F004  // data rate 64 , ask, manchester, 2 data blocks?\r


@@ -60,7 +58,7 @@ typedef struct {
        uint32_t lotid; \r
        uint32_t wafer; \r
        uint32_t dw;\r
        uint32_t lotid; \r
        uint32_t wafer; \r
        uint32_t dw;\r

-} t55xx_tracedata_t;\r
+} t55x7_tracedata_t;\r

 \r
 typedef struct {\r
        uint32_t bl1;\r
 \r
 typedef struct {\r
        uint32_t bl1;\r


@@ -101,11 +99,11 @@ typedef struct {
                RF_128 = 0x07,\r
        } bitrate;\r
        bool Q5;\r
                RF_128 = 0x07,\r
        } bitrate;\r
        bool Q5;\r

+       bool ST;\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
 } 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
 int CmdT55xxReadBlock(const char *Cmd);\r
 int CmdLFT55XX(const char *Cmd);\r
 int CmdT55xxSetConfig(const char *Cmd);\r
 int CmdT55xxReadBlock(const char *Cmd);\r


@@ -129,13 +127,14 @@ int printConfiguration( t55xx_conf_block_t b);
 \r
 bool DecodeT55xxBlock();\r
 bool tryDetectModulation();\r
 \r
 bool DecodeT55xxBlock();\r
 bool tryDetectModulation();\r

+bool testKnownConfigBlock(uint32_t block0);\r

 bool test(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk, bool *Q5);\r
 int special(const char *Cmd);\r
 int AquireData( uint8_t page, uint8_t block, bool pwdmode, uint32_t password );\r
 \r
 bool detectPassword(int password);\r
 \r
 bool test(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk, bool *Q5);\r
 int special(const char *Cmd);\r
 int AquireData( uint8_t page, uint8_t block, bool pwdmode, uint32_t password );\r
 \r
 bool detectPassword(int password);\r
 \r

-void printT55xxTrace( t55xx_tracedata_t data, uint8_t repeat );\r
+void printT55x7Trace( t55x7_tracedata_t data, uint8_t repeat );\r

 void printT5555Trace( t5555_tracedata_t data, uint8_t repeat );\r
 \r
 #endif\r
 void printT5555Trace( t5555_tracedata_t data, uint8_t repeat );\r
 \r
 #endif\r