X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/7d5ebac99397fe7661760259377a4f222fdb92cb..5330f5329f68fa6a95658ebd946d5eefc74e10c4:/client/lualibs/commands.lua?ds=sidebyside

diff --git a/client/lualibs/commands.lua b/client/lualibs/commands.lua
index a5442f2a..4c7bc638 100644
--- a/client/lualibs/commands.lua
+++ b/client/lualibs/commands.lua
@@ -48,13 +48,17 @@ 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_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_READER_ISO_15693 =                                               0x0310,
@@ -71,9 +75,8 @@ local _commands = {
 	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,
@@ -130,9 +133,9 @@ local _commands = {
 	CMD_MIFARE_SNIFFER =                                                 0x0630,
 
 	--//ultralightC
-	CMD_MIFAREUC_AUTH1 =						                         0x0724,
-	CMD_MIFAREUC_AUTH2 =						                         0x0725,
-	CMD_MIFAREUC_READCARD =		   					                     0x0726,
+	CMD_MIFAREUC_AUTH =                                                  0x0724,
+	CMD_MIFAREUC_SETPWD =                                                0x0727,
+	CMD_MIFAREU_SETUID =                                                 0x0728,
 
 	--// mifare desfire
 	CMD_MIFARE_DESFIRE_READBL =                                          0x0728,
@@ -148,10 +151,10 @@ local _commands = {
 
 
 local _reverse_lookup,k,v = {}
-for k, v in pairs(_commands) do
-	_reverse_lookup[v] =  k
-end
-_commands.tostring = function(command)
+	for k, v in pairs(_commands) do
+		_reverse_lookup[v] =  k
+	end
+	_commands.tostring = function(command)
 	if(type(command) == 'number') then
 		return ("%s (%d)"):format(_reverse_lookup[command]or "ERROR UNDEFINED!", command) 
 	end
@@ -212,7 +215,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