X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/db69363840b12d68566d7be2de512bf4c7c51b4e..8713b64fdff94662bd0851e7d045f24c631ef247:/client/cmdlft55xx.h?ds=sidebyside diff --git a/client/cmdlft55xx.h b/client/cmdlft55xx.h index e4eca17c..004154ff 100644 --- a/client/cmdlft55xx.h +++ b/client/cmdlft55xx.h @@ -12,18 +12,19 @@ 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_FSK = 0x04, + DEMOD_ASK = 0x08, + DEMOD_BI = 0x16, } modulation; bool inversed; uint8_t offset; uint32_t block0; } t55xx_conf_block_t; - int CmdLFT55XX(const char *Cmd); int CmdT55xxSetConfig(const char *Cmd); int CmdT55xxReadBlock(const char *Cmd); @@ -35,6 +36,7 @@ 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); void printT55xxBlock(const char *demodStr); @@ -42,6 +44,6 @@ void printConfiguration( t55xx_conf_block_t b); void DecodeT55xxBlock(); bool tryDetectModulation(); -bool test(); +bool test(uint8_t mode, uint8_t *offset); int special(const char *Cmd); #endif