Merge pull request #12 from k02a/patch-1

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

diff --git a/client/lualibs/commands.lua b/client/lualibs/commands.lua
index fdc2b18d0ecb9ebed643cbb8cfc2c7ed7baa5a7c..afdba7e701a03d14e4fcc2a87452cf5ee3f079c9 100644 (file)
--- a/client/lualibs/commands.lua
+++ b/client/lualibs/commands.lua
@@ -22,6 +22,9 @@ local _commands = {
        CMD_VERSION =                                                        0x0107,
        CMD_STATUS =                                                         0x0108,
        CMD_PING =                                                           0x0109,
+       CMD_DOWNLOAD_EML_BIGBUF =                                                                                        0x0110,
+       CMD_DOWNLOADED_EML_BIGBUF =                                                                                      0x0111,
+
        --// For low-frequency tags
        CMD_READ_TI_TYPE =                                                   0x0202,
        CMD_WRITE_TI_TYPE =                                                  0x0203,
@@ -44,8 +47,9 @@ local _commands = {
        CMD_INDALA_CLONE_TAG_L =                                             0x0213,
        CMD_T55XX_READ_BLOCK =                                               0x0214,
        CMD_T55XX_WRITE_BLOCK =                                              0x0215,
-       CMD_T55XX_READ_TRACE =                                               0x0216,
+       CMD_T55XX_RESET_READ =                                               0x0216,
        CMD_PCF7931_READ =                                                   0x0217,
+       CMD_PCF7931_WRITE =                                                  0x0223,
        CMD_EM4X_READ_WORD =                                                 0x0218,
        CMD_EM4X_WRITE_WORD =                                                0x0219,
        CMD_IO_DEMOD_FSK =                                                   0x021A,
@@ -56,13 +60,14 @@ local _commands = {
        CMD_ASK_SIM_TAG =                                                    0x021F,
        CMD_PSK_SIM_TAG =                                                    0x0220,
        CMD_AWID_DEMOD_FSK =                                                 0x0221,
-
+       CMD_VIKING_CLONE_TAG =                                               0x0222,
+       CMD_T55XX_WAKEUP =                                                       0x0224,
+       
        --/* 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_READ_SRI512_TAG =                                                0x0303,
-       CMD_READ_SRIX4K_TAG =                                                0x0304,
+       CMD_READ_SRI_TAG =                                                   0x0303,
        CMD_ISO_14443B_COMMAND =                                                                                         0x0305,
        CMD_READER_ISO_15693 =                                               0x0310,
        CMD_SIMTAG_ISO_15693 =                                               0x0311,
@@ -78,6 +83,13 @@ local _commands = {
        CMD_SIMULATE_HITAG =                                                 0x0371,
        CMD_READER_HITAG =                                                   0x0372,
 
+       --// For HitagS
+       CMD_TEST_HITAGS_TRACES =                                                                                         0x0367,
+       CMD_SIMULATE_HITAG_S =                                                                                           0x0368,
+       CMD_READ_HITAG_S =                                                                                                       0x0373,
+       CMD_WR_HITAG_S =                                                                                                         0x0375,
+       CMD_EMU_HITAG_S =                                                                                                        0x0376,
+       
        CMD_SIMULATE_TAG_ISO_14443B =                                        0x0381,
        CMD_SNOOP_ISO_14443B =                                               0x0382,
        CMD_SNOOP_ISO_14443a =                                               0x0383,
@@ -89,11 +101,17 @@ local _commands = {
        CMD_EPA_PACE_COLLECT_NONCE =                                         0x038A,
        CMD_EPA_PACE_REPLAY =                                                0x038B,
 
+       CMD_ICLASS_READCHECK =                                               0x038F,
+       CMD_ICLASS_CLONE =                                                   0x0390,
+       CMD_ICLASS_DUMP =                                                    0x0391,
        CMD_SNOOP_ICLASS =                                                   0x0392,
        CMD_SIMULATE_TAG_ICLASS =                                            0x0393,
        CMD_READER_ICLASS =                                                  0x0394,
        CMD_READER_ICLASS_REPLAY =                                                                                       0x0395,
-       CMD_ICLASS_ISO14443A_WRITE =                                                                             0x0397,
+       CMD_ICLASS_READBLOCK =                                               0x0396,
+       CMD_ICLASS_WRITEBLOCK =                                              0x0397,
+       CMD_ICLASS_EML_MEMSET =                                              0x0398,
+       CMD_ICLASS_AUTHENTICATION =                                          0x0399,
 
        --// For measurements of the antenna tuning
        CMD_MEASURE_ANTENNA_TUNING =                                         0x0400,
@@ -120,6 +138,7 @@ local _commands = {
 
        CMD_READER_MIFARE =                                                  0x0611,
        CMD_MIFARE_NESTED =                                                  0x0612,
+       CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES =                                0x0613,
 
        CMD_MIFARE_READBL =                                                  0x0620,
        CMD_MIFAREU_READBL =                                                 0x0720,
@@ -148,7 +167,8 @@ local _commands = {
        CMD_MIFARE_DES_READER =                                              0x072c,
        CMD_MIFARE_DESFIRE_INFO =                                            0x072d,
        CMD_MIFARE_DESFIRE =                                                 0x072e,
-       
+    CMD_HF_SNIFFER =                                                     0x0800,       
+
        CMD_UNKNOWN =                                                        0xFFFF,
 }
 
@@ -198,7 +218,7 @@ Command = {
                return o
        end,
        parse = function(packet)
-               local count, cmd, arg1, arg2, arg3, data = bin.unpack('LLLLH512', packet)
+               local count, cmd, arg1, arg2, arg3, data = bin.unpack('LLLLH511', packet)
                return Command:new{cmd = cmd, arg1 = arg1, arg2 = arg2, arg3 = arg3, data = data}
        end
 
@@ -217,6 +237,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