dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename few CMD_* to get some less diversity

Browse Source
This commit is contained in:
Philippe Teuwen
2019-08-03 19:17:00 +02:00
parent cbf5c717f7
commit a0a232a985
71 changed files with 687 additions and 687 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/lualibs/emulator.lua
View File

@@ -12,7 +12,7 @@ local Emulator = {
function Emulator:set_mem (data, clear_first)
if clear_first then
-- Clear out the emulator memory first
local memclrCmd = Command:newMIX{cmd = cmds.CMD_MIFARE_EML_MEMCLR}
local memclrCmd = Command:newMIX{cmd = cmds.CMD_HF_MIFARE_EML_MEMCLR}
local _, err = memclrCmd:sendMIX()
if err then
@@ -30,7 +30,7 @@ function Emulator:set_mem (data, clear_first)
-- arg1: start block number
-- arg2: block count
local memsetCmd = Command:newMIX{cmd = cmds.CMD_MIFARE_EML_MEMSET,
local memsetCmd = Command:newMIX{cmd = cmds.CMD_HF_MIFARE_EML_MEMSET,
data = utils.hexlify(cur_out_block),
arg1 = i * self.BLOCK_COUNT,
arg2 = self.BLOCK_COUNT}
@@ -57,7 +57,7 @@ function Emulator:get_mem (size)
for i = 0, (size / (MAX_BLOCKS * 16)) do
-- arg1: start block number
-- arg2: block count (max 4)
local getmemCmd = Command:newMIX{cmd = cmds.CMD_MIFARE_EML_MEMGET,
local getmemCmd = Command:newMIX{cmd = cmds.CMD_HF_MIFARE_EML_MEMGET,
arg1 = i * MAX_BLOCKS,
arg2 = MAX_BLOCKS,
arg3 = 0}

4
client/lualibs/read14a.lua
View File

@@ -86,7 +86,7 @@ local function read14443a(dont_disconnect, no_rats)
local command, result, info, err, data
command = Command:newMIX{
cmd = cmds.CMD_READER_ISO_14443a,
cmd = cmds.CMD_HF_ISO14443A_READER,
arg1 = ISO14A_COMMAND.ISO14A_CONNECT
}
@@ -132,7 +132,7 @@ end
-- Sends an instruction to do nothing, only disconnect
local function disconnect14443a()
local c = Command:newMIX{cmd = cmds.CMD_READER_ISO_14443a}
local c = Command:newMIX{cmd = cmds.CMD_HF_ISO14443A_READER}
-- We can ignore the response here, no ACK is returned for this command
-- Check /armsrc/iso14443a.c, ReaderIso14443a() for details
return c:sendMIX(true)

6
client/lualibs/read14b.lua
View File

@@ -70,7 +70,7 @@ local function read14443b(disconnect)
end
command = Command:newMIX{
cmd = cmds.CMD_ISO_14443B_COMMAND,
cmd = cmds.CMD_HF_ISO14443B_COMMAND,
arg1 = flags
}
@@ -111,13 +111,13 @@ end
---
-- turns on the HF field.
local function connect14443b()
local c = Command:newMIX{cmd = cmds.CMD_ISO_14443B_COMMAND, arg1 = ISO14B_COMMAND.ISO14B_CONNECT}
local c = Command:newMIX{cmd = cmds.CMD_HF_ISO14443B_COMMAND, arg1 = ISO14B_COMMAND.ISO14B_CONNECT}
return c:sendMIX(true)
end
---
-- Sends an instruction to do nothing, only disconnect
local function disconnect14443b()
local c = Command:newMIX{cmd = cmds.CMD_ISO_14443B_COMMAND, arg1 = ISO14B_COMMAND.ISO14B_DISCONNECT}
local c = Command:newMIX{cmd = cmds.CMD_HF_ISO14443B_COMMAND, arg1 = ISO14B_COMMAND.ISO14B_DISCONNECT}
-- We can ignore the response here, no ACK is returned for this command
-- Check /armsrc/iso14443b.c, ReaderIso14443b() for details
return c:sendMIX(true)

4
client/lualibs/read15.lua
View File

@@ -95,7 +95,7 @@ local function read15693(slow, dont_readresponse)
data = utils.Crc15("260100")
command = Command:newMIX{
cmd = cmds.CMD_ISO_15693_COMMAND,
cmd = cmds.CMD_HF_ISO15693_COMMAND,
arg1 = #data / 2,
arg2 = 1,
arg3 = 1,
@@ -144,7 +144,7 @@ end
-- Sends an instruction to do nothing, only disconnect
local function disconnect15693()
local c = Command:newMIX{cmd = cmds.CMD_ISO_15693_COMMAND}
local c = Command:newMIX{cmd = cmds.CMD_HF_ISO15693_COMMAND}
-- We can ignore the response here, no ACK is returned for this command
-- Check /armsrc/iso14443a.c, ReaderIso14443a() for details
return c:sendMIX(true)