MINOR CHG: help text change for the "lf t55xx config" command. change NZ into NRZ

[proxmark3-svn] / client / lualibs / commands.lua

diff --git a/client/lualibs/commands.lua b/client/lualibs/commands.lua
index aeba31a7e218bf876e98b7622692f5ba49721c6b..fdc2b18d0ecb9ebed643cbb8cfc2c7ed7baa5a7c 100644 (file)
--- a/client/lualibs/commands.lua
+++ b/client/lualibs/commands.lua
@@ -20,7 +20,8 @@ local _commands = {
        CMD_BUFF_CLEAR =                                                     0x0105,
        CMD_READ_MEM =                                                       0x0106,
        CMD_VERSION =                                                        0x0107,
-
+       CMD_STATUS =                                                         0x0108,
+       CMD_PING =                                                           0x0109,
        --// For low-frequency tags
        CMD_READ_TI_TYPE =                                                   0x0202,
        CMD_WRITE_TI_TYPE =                                                  0x0203,
@@ -48,15 +49,21 @@ local _commands = {
        CMD_EM4X_READ_WORD =                                                 0x0218,
        CMD_EM4X_WRITE_WORD =                                                0x0219,
        CMD_IO_DEMOD_FSK =                                                   0x021A,
-  CMD_IO_CLONE_TAG =                                                   0x021B,
-  CMD_EM410X_DEMOD =                                                                                                                                                                                            0x021C,
+       CMD_IO_CLONE_TAG =                                                   0x021B,
+       CMD_EM410X_DEMOD =                                                   0x021c,
+       CMD_SET_LF_SAMPLING_CONFIG =                                         0x021d,
+       CMD_FSK_SIM_TAG =                                                    0x021E,
+       CMD_ASK_SIM_TAG =                                                    0x021F,
+       CMD_PSK_SIM_TAG =                                                    0x0220,
+       CMD_AWID_DEMOD_FSK =                                                 0x0221,
+
        --/* CMD_SET_ADC_MUX: ext1 is 0 for lopkd, 1 for loraw, 2 for hipkd, 3 for hiraw */
 
        --// For the 13.56 MHz tags
        CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693 =                              0x0300,
-       CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443 =                              0x0301,
        CMD_READ_SRI512_TAG =                                                0x0303,
        CMD_READ_SRIX4K_TAG =                                                0x0304,
+       CMD_ISO_14443B_COMMAND =                                                                                         0x0305,
        CMD_READER_ISO_15693 =                                               0x0310,
        CMD_SIMTAG_ISO_15693 =                                               0x0311,
        CMD_RECORD_RAW_ADC_SAMPLES_ISO_15693 =                               0x0312,
@@ -64,15 +71,15 @@ local _commands = {
        CMD_ISO_15693_COMMAND_DONE =                                         0x0314,
        CMD_ISO_15693_FIND_AFI =                                             0x0315,
        CMD_ISO_15693_DEBUG =                                                0x0316,
+       CMD_LF_SNOOP_RAW_ADC_SAMPLES =                                       0x0317,
 
        --// For Hitag2 transponders
        CMD_SNOOP_HITAG =                                                    0x0370,
        CMD_SIMULATE_HITAG =                                                 0x0371,
        CMD_READER_HITAG =                                                   0x0372,
 
-       CMD_SIMULATE_TAG_HF_LISTEN =                                         0x0380,
-       CMD_SIMULATE_TAG_ISO_14443 =                                         0x0381,
-       CMD_SNOOP_ISO_14443 =                                                0x0382,
+       CMD_SIMULATE_TAG_ISO_14443B =                                        0x0381,
+       CMD_SNOOP_ISO_14443B =                                               0x0382,
        CMD_SNOOP_ISO_14443a =                                               0x0383,
        CMD_SIMULATE_TAG_ISO_14443a =                                        0x0384,
        CMD_READER_ISO_14443a =                                              0x0385,
@@ -80,10 +87,13 @@ local _commands = {
        CMD_READER_LEGIC_RF =                                                0x0388,
        CMD_WRITER_LEGIC_RF =                                                0x0389,
        CMD_EPA_PACE_COLLECT_NONCE =                                         0x038A,
+       CMD_EPA_PACE_REPLAY =                                                0x038B,
 
        CMD_SNOOP_ICLASS =                                                   0x0392,
        CMD_SIMULATE_TAG_ICLASS =                                            0x0393,
        CMD_READER_ICLASS =                                                  0x0394,
+       CMD_READER_ICLASS_REPLAY =                                                                                       0x0395,
+       CMD_ICLASS_ISO14443A_WRITE =                                                                             0x0397,
 
        --// For measurements of the antenna tuning
        CMD_MEASURE_ANTENNA_TUNING =                                         0x0400,
@@ -100,8 +110,11 @@ local _commands = {
        CMD_MIFARE_EML_MEMSET =                                              0x0602,
        CMD_MIFARE_EML_MEMGET =                                              0x0603,
        CMD_MIFARE_EML_CARDLOAD =                                            0x0604,
-       CMD_MIFARE_EML_CSETBLOCK =                                           0x0605,
-       CMD_MIFARE_EML_CGETBLOCK =                                           0x0606,
+       
+       --// magic chinese card commands
+       CMD_MIFARE_CSETBLOCK =                                               0x0605,
+       CMD_MIFARE_CGETBLOCK =                                               0x0606,
+       CMD_MIFARE_CIDENT =                                                  0x0607,
 
        CMD_SIMULATE_MIFARE_CARD =                                           0x0610,
 
@@ -109,12 +122,33 @@ local _commands = {
        CMD_MIFARE_NESTED =                                                  0x0612,
 
        CMD_MIFARE_READBL =                                                  0x0620,
+       CMD_MIFAREU_READBL =                                                 0x0720,
+       
        CMD_MIFARE_READSC =                                                  0x0621,
+       CMD_MIFAREU_READCARD =                                               0x0721,
+       
        CMD_MIFARE_WRITEBL =                                                 0x0622,
+       CMD_MIFAREU_WRITEBL =                                                0x0722,
+       CMD_MIFAREU_WRITEBL_COMPAT =                                         0x0723,
+       
        CMD_MIFARE_CHKKEYS =                                                 0x0623,
 
        CMD_MIFARE_SNIFFER =                                                 0x0630,
 
+       --//ultralightC
+       CMD_MIFAREUC_AUTH =                                                  0x0724,
+       CMD_MIFAREUC_SETPWD =                                                                                            0x0727,
+       CMD_MIFAREU_SETUID =                                                                         0x0728,
+
+       --// mifare desfire
+       CMD_MIFARE_DESFIRE_READBL =                                          0x0728,
+       CMD_MIFARE_DESFIRE_WRITEBL =                                         0x0729,
+       CMD_MIFARE_DESFIRE_AUTH1 =                                           0x072a,
+       CMD_MIFARE_DESFIRE_AUTH2 =                                           0x072b,
+       CMD_MIFARE_DES_READER =                                              0x072c,
+       CMD_MIFARE_DESFIRE_INFO =                                            0x072d,
+       CMD_MIFARE_DESFIRE =                                                 0x072e,
+       
        CMD_UNKNOWN =                                                        0xFFFF,
 }
 
@@ -139,7 +173,6 @@ Command = {
                self.__index = self
 
                o.cmd = o.cmd or _commands.CMD_UNKNOWN
-               --o.arg1 = "test"
                o.arg1 = o.arg1 or 0
                o.arg2 = o.arg2 or 0
                o.arg3 = o.arg3 or 0 
@@ -161,14 +194,14 @@ Command = {
                else 
                        print(("WARNING; data was NOT a (hex-) string, but was %s"):format(type(data)))
                end
-               o.data = data
-               
+               o.data = data   
                return o
        end,
-       parse = function (packet)
-               local count,cmd,arg1,arg2,arg3,data = bin.unpack('LLLLH512',packet)
+       parse = function(packet)
+               local count, cmd, arg1, arg2, arg3, data = bin.unpack('LLLLH512', packet)
                return Command:new{cmd = cmd, arg1 = arg1, arg2 = arg2, arg3 = arg3, data = data}
-       end,
+       end
+
 }
 function Command:__tostring()
        local output = ("%s\r\nargs : (%s, %s, %s)\r\ndata:\r\n%s\r\n"):format(
@@ -184,8 +217,6 @@ function Command:getBytes()
        local data  = self.data
        local cmd = self.cmd 
        local arg1, arg2, arg3 = self.arg1, self.arg2, self.arg3
-
-       
-       return bin.pack("LLLLH",cmd, arg1, arg2, arg3,data);
+       return bin.pack("LLLLH",cmd, arg1, arg2, arg3, data);
 end
-return _commands
\ No newline at end of file
+return _commands