From cf0d17853ef7b943dba493f4637ec98c6d5cdd00 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Sun, 28 Apr 2019 21:29:47 +0200 Subject: [PATCH] next --- client/scripts/ndef_dump.lua | 193 +++++++++++++++------------------- client/scripts/ntag_3d.lua | 33 +++--- client/scripts/parameters.lua | 30 ++++-- 3 files changed, 128 insertions(+), 128 deletions(-) diff --git a/client/scripts/ndef_dump.lua b/client/scripts/ndef_dump.lua index 0bb597a52..fee7af9fe 100644 --- a/client/scripts/ndef_dump.lua +++ b/client/scripts/ndef_dump.lua @@ -1,11 +1,13 @@ - --- Ability to read what card is there local getopt = require('getopt') local cmds = require('commands') local taglib = require('taglib') +local utils = require('utils') -local desc = -[[This script will automatically recognize and dump full content of a NFC NDEF Initialized tag; non-initialized tags will be ignored. +copyright = '' +author = 'Martin Holst Swende & Asper' +version = 'v1.0.1' +desc = [[ +This script will automatically recognize and dump full content of a NFC NDEF Initialized tag; non-initialized tags will be ignored. It also write the dump to an eml-file .eml. @@ -15,130 +17,104 @@ raw data, but when saving into that for, we lose the infromation about how the m For example: 24 bytes could be 6 blocks of 4 bytes, or vice versa. Therefore, the .eml is better to use file when saving dumps.) +]] +example = [[ + 1. script run ndef_dump +]] +usage = [[ +script run ndef_dump + Arguments: -h this help -d debug logging on ]] -local example = "script run xxx" -local author = "Martin Holst Swende & Asper" + +local DEBUG = true -- the debug flag + --- --- PrintAndLog -local function prlog(...) - -- TODO; replace this with a call to the proper PrintAndLog - print(...) +-- A debug printout-function +local function dbg(args) + if not DEBUG then return end + if type(args) == 'table' then + local i = 1 + while result[i] do + dbg(result[i]) + i = i+1 + end + else + print('###', args) + end end --- -- This is only meant to be used when errors occur local function oops(err) - prlog("ERROR: ",err) - return nil,err + print('ERROR:', err) + core.clearCommandBuffer() + return nil, err end - - --- Perhaps this will be moved to a separate library at one point -local utils = { - --- Writes an eml-file. - -- @param uid - the uid of the tag. Used in filename - -- @param blockData. Assumed to be on the format {'\0\1\2\3,'\b\e\e\f' ..., - -- that is, blockData[row] contains a string with the actual data, not ascii hex representation - -- return filename if all went well, - -- @reurn nil, error message if unsuccessfull - writeDumpFile = function(uid, blockData) - local destination = string.format("%s.eml", uid) - local file = io.open(destination, "w") - if file == nil then - return nil, string.format("Could not write to file %s", destination) - end - local rowlen = string.len(blockData[1]) - - for i,block in ipairs(blockData) do - if rowlen ~= string.len(block) then - prlog(string.format("WARNING: Dumpdata seems corrupted, line %d was not the same length as line 1",i)) - end - - local formatString = string.format("H%d", string.len(block)) - local _,hex = bin.unpack(formatString,block) - file:write(hex.."\n") - end - file:close() - return destination - end, -} - --- -- Usage help local function help() - prlog(desc) - prlog("Example usage") - prlog(example) + print(copyright) + print(author) + print(version) + print(desc) + print('Example usage') + print(example) + print(usage) end -local function debug(...) - if DEBUG then - prlog("debug:", ...) - end -end - - --- This function is a lua-implementation of -- cmdhf14a.c:waitCmd(uint8_t iSelect) local function waitCmd(iSelect) - local response = core.WaitForResponseTimeout(cmds.CMD_ACK,1000) + local response = core.WaitForResponseTimeout(cmds.CMD_ACK, 1000) if response then local count,cmd,arg0,arg1,arg2 = bin.unpack('LLLL',response) local iLen = arg0 if iSelect then iLen = arg1 end - debug(("Received %i octets (arg0:%d, arg1:%d)"):format(iLen, arg0, arg1)) + dbg(("Received %i octets (arg0:%d, arg1:%d)"):format(iLen, arg0, arg1)) if iLen == 0 then return nil, "No response from tag" end local recv = string.sub(response,count, iLen+count-1) return recv end return nil, "No response from device" end - - +--- +-- local function show(data) - if DEBUG then - local formatString = ("H%d"):format(string.len(data)) - local _,hexdata = bin.unpack(formatString, data) - debug("Hexdata" , hexdata) - end + local formatString = ('H%d'):format(string.len(data)) + local _,hexdata = bin.unpack(formatString, data) + dbg('Hexdata', hexdata) end --- Fire up a connection with a tag, return uid -- @return UID if successfull -- @return nil, errormessage if unsuccessfull - local function open() - debug("Opening connection") + dbg('Opening connection') core.clearCommandBuffer() - local x = string.format("hf 14a raw -r -p -s") - debug(x) + local x = string.format('hf 14a raw -r -p -s') + dbg(x) core.console(x) - debug("done") + dbg('done') data, err = waitCmd(true) if err then return oops(err) end show(data) - local formatString = ("H%d"):format(string.len(data)) + local formatString = ('H%d'):format(string.len(data)) local _,uid = bin.unpack(formatString, data) return uid end --- Shut down tag communication -- return no return values local function close() - debug("Closing connection") + dbg('Closing connection') core.clearCommandBuffer() - local x = string.format("hf 14a raw -r") - debug(x) + local x = string.format('hf 14a raw -r') + dbg(x) core.console(x) - debug("done") - --data, err = waitCmd(true) - --data, err = waitCmd(false) - + dbg('done') end - - ---_ Gets data from a block -- @return {block, block+1, block+2, block+3} if successfull -- @return nil, errormessage if unsuccessfull @@ -147,10 +123,10 @@ local function getBlock(block) core.clearCommandBuffer() - local x = string.format("hf 14a raw -r -c -p 30 %02x", block) - debug(x) + local x = string.format('hf 14a raw -r -c -p 30 %02x', block) + dbg(x) core.console(x) - debug("done") + dbg('done') -- By now, there should be an ACK waiting from the device, since -- we used the -r flag (don't read response). @@ -159,28 +135,28 @@ local function getBlock(block) show(data) if string.len(data) < 18 then - return nil, ("Expected at least 18 bytes, got %d - this tag is not NDEF-compliant"):format(string.len(data)) + return nil, ('Expected at least 18 bytes, got %d - this tag is not NDEF-compliant'):format(string.len(data)) end -- Now, parse out the block data -- 0534 00B9 049C AD7F 4A00 0000 E110 1000 2155 -- b0b0 b0b0 b1b1 b1b1 b2b2 b2b2 b3b3 b3b3 CRCC - b0 = string.sub(data,1,4) - b1 = string.sub(data,5,8) - b2 = string.sub(data,9,12) - b3 = string.sub(data,13,16) - return {b0,b1,b2,b3} + b0 = string.sub(data, 1, 4) + b1 = string.sub(data, 5, 8) + b2 = string.sub(data, 9, 12) + b3 = string.sub(data, 13, 16) + return {b0, b1, b2, b3} end - - - local function main( args) - debug("script started") - local err, data, data2,k,v,i + + print( string.rep('--',20) ) + print( string.rep('--',20) ) + dbg('script started') + local err, data, data2, k, v, i -- Read the parameters for o, a in getopt.getopt(args, 'hd') do - if o == "h" then help() return end - if o == "d" then DEBUG = true end + if o == 'h' then return help() end + if o == 'd' then DEBUG = true end end -- Info contained within the tag (block 0 example) @@ -196,15 +172,19 @@ local function main( args) -- First, get blockt 3 byte 2 local blocks, err = getBlock(0) - if err then return oops(err) end + if err then + close() + return oops(err) + end -- Block 3 contains number of blocks local b3chars = {string.byte(blocks[4], 1,4)} local numBlocks = b3chars[3] * 2 + 6 - prlog("Number of blocks:", numBlocks) + print("Number of blocks:", numBlocks) -- NDEF compliant? if b3chars[1] ~= 0xE1 then - return oops("This tag is not NDEF-Compliant") + close() + return oops('This tag is not NDEF-Compliant') end local ndefVersion = b3chars[2] @@ -214,34 +194,33 @@ local function main( args) local manufacturer = taglib.lookupManufacturer(bl1_b1) -- Reuse existing info - local blockData = {blocks[1],blocks[2],blocks[3],blocks[4]} - + local blockData = {blocks[1], blocks[2], blocks[3], blocks[4]} --[[ Due to the infineon my-d move bug (if I send 30 0F i receive block0f+block00+block01+block02 insted of block0f+block10+block11+block12) the only way to avoid this is to send the read command as many times as block numbers removing bytes from 5 to 18 from each answer. --]] - prlog("Dumping data...please wait") + print('Dumping data...please wait') for i=4,numBlocks-1,1 do blocks, err = getBlock(i) - if err then return oops(err) end - table.insert(blockData,blocks[1]) + if err then close(); return oops(err) end + table.insert(blockData, blocks[1]) end -- Deactivate field close() -- Print results - prlog(string.format("Tag manufacturer: %s", manufacturer)) - prlog(string.format("Tag UID: %s", uidHexstr)) - prlog(string.format("Tag NDEF version: 0x%02x", ndefVersion)) + print(string.format('Tag manufacturer: %s', manufacturer)) + print(string.format('Tag UID: %s', uidHexstr)) + print(string.format('Tag NDEF version: 0x%02x', ndefVersion)) for k,v in ipairs(blockData) do - prlog(string.format("Block %02x: %02x %02x %02x %02x",k-1, string.byte(v, 1,4))) + print(string.format('Block %02x: %02x %02x %02x %02x', k-1, string.byte(v, 1,4))) end local filename, err = utils.writeDumpFile(uidHexstr, blockData) if err then return oops(err) end - prlog(string.format("Dumped data into %s", filename)) + print(string.format('Dumped data into %s', filename)) end main(args) diff --git a/client/scripts/ntag_3d.lua b/client/scripts/ntag_3d.lua index abbfe5946..e5b4205d8 100644 --- a/client/scripts/ntag_3d.lua +++ b/client/scripts/ntag_3d.lua @@ -1,9 +1,10 @@ local getopt = require('getopt') local lib14a = require('read14a') +local utils = require('utils') copyright = 'Copyright (c) 2017 IceSQL AB. All rights reserved.' author = "Christian Herrmann" -version = 'v1.0.3' +version = 'v1.0.4' desc = [[ This script writes a empty template for 3D printing system onto a empty NTAG213 or MAGIC NTAG21* @@ -143,7 +144,6 @@ end -- A debug printout-function local function dbg(args) if not DEBUG then return end - if type(args) == 'table' then local i = 1 while result[i] do @@ -157,17 +157,20 @@ end --- -- This is only meant to be used when errors occur local function oops(err) - print('ERROR: ',err) - return nil,err + print('ERROR:', err) + core.clearCommandBuffer() + return nil, err end --- -- Usage help local function help() print(copyright) + print(author) print(version) print(desc) print('Example usage') print(example) + print(usage) end -- -- Exit message @@ -183,6 +186,7 @@ local function write_tag(uid, t) print('Writing to tag') core.console('hf mf dbg 0') + utils.Sleep(0.5) local cmd = '' local pwd, pack = core.keygen_algo_d(uid) @@ -200,6 +204,7 @@ local function write_tag(uid, t) core.console(('hf mfu wrbl b 40 d %s k %08X'):format(t[40], pwd)) core.console('hf mf dbg 1') + utils.Sleep(0.5) print('Done') end --- @@ -228,7 +233,7 @@ end --- -- generates random hex numbers between 31-39 local function random_num_hex(length) - local str = "" + local str = '' local i for i = 1, length, 1 do str = str..math.random(31, 39) @@ -325,15 +330,15 @@ local function main(args) -- Read the parameters for o, a in getopt.getopt(args, 'ht1u:l:m:c:p:s:') do - if o == "h" then return help() end - if o == "t" then return selftest() end - if o == "u" then uid = a; useUID = true end - if o == "m" then material = a end - if o == "c" then color = a end - if o == "l" then length = tonumber(a) end - if o == "p" then producer = a end - if o == "s" then sales = a end - if o == "1" then useMAGIC = true end + if o == 'h' then return help() end + if o == 't' then return selftest() end + if o == 'u' then uid = a; useUID = true end + if o == 'm' then material = a end + if o == 'c' then color = a end + if o == 'l' then length = tonumber(a) end + if o == 'p' then producer = a end + if o == 's' then sales = a end + if o == '1' then useMAGIC = true end end color = find(_colors, color) diff --git a/client/scripts/parameters.lua b/client/scripts/parameters.lua index 4eb86446d..d68b7b06a 100644 --- a/client/scripts/parameters.lua +++ b/client/scripts/parameters.lua @@ -1,19 +1,34 @@ - -- The getopt-functionality is loaded from pm3/getopt.lua -- Have a look there for further details getopt = require('getopt') -usage = "script run parameters.lua -a 1 -blala -c -de" -author = "Martin Holst Swende" -desc =[[ +copyright = '' +usage = 'script run parameters.lua -a 1 -blala -c -de' +author = 'Martin Holst Swende' +version = 'v1.0.1' +desc = [[ This is an example script to demonstrate handle parameters in scripts. For more info, check the comments in the code ]] +example = [[ +]] +usage = [[ +]] +--- +-- Usage help +local function help() + print(copyright) + print(author) + print(version) + print(desc) + print('Example usage') + print(example) + print(usage) +end local function main(args) - print(desc) - print("These parameters were passed") + print('These parameters were passed') --[[ When passing parameters, x: means that a value should follow x @@ -31,7 +46,8 @@ local function main(args) 4. The format b lala (without -) is *not* supported --]] - for o, a in getopt.getopt(args, 'a:b:ced') do + for o, a in getopt.getopt(args, 'ha:b:ced') do + if o == 'h' then return help() end print(o, a) end end