diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f1511adf..d8e94a5a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac ## [unreleased][unreleased] - Fixed `lf em 4x50 rdbl/info/dump`, `lf search` - RM was sent into the tag data instead of the second listen window on strong, AC-coupled signals, so every command failed; reads now retry within 1 s (@abou28) - Added `lf em 4x50 config` - runtime EM4x50 reader timings, and `lf_em4x50_tune.lua` to sweep them; extended debug level captures the raw exchange for `data samples` (@abou28) +- Fixed payload for `CMD_HF_MIFARE_EML_MEMSET` in `hf_mfu_amiibo_sim.lua` (@tpglitch) - Fixed `hf thinfilm sim` - a second simulation in the same client no longer ends at once with `Done!` (@matrix) - Added `hf mf supercard -u` - UID change on super card generation 2 (@mishamyte) - Changed `hf mf supercard` - a refused `-r`/`-u` now exits non-zero instead of reporting success (@mishamyte) diff --git a/client/luascripts/hf_mfu_amiibo_sim.lua b/client/luascripts/hf_mfu_amiibo_sim.lua index bedd0b8a6..0ea66422c 100644 --- a/client/luascripts/hf_mfu_amiibo_sim.lua +++ b/client/luascripts/hf_mfu_amiibo_sim.lua @@ -6,8 +6,8 @@ local ansicolors = require('ansicolors') local amiibo_tools = require('amiibo_tools') copyright = '' -author = 'George Talusan, modified by Lee Hambley' -version = 'v0.0.3' +author = 'George Talusan, modified by Lee Hambley and tpglitch' +version = 'v0.0.4' desc = [[ This script will try to load a binary datadump of an Amiibo. It will recalculate PWD and PACK if necessary. @@ -82,10 +82,10 @@ local function LoadEmulator(uid, blocks) io.write('.') io.flush() core.clearCommandBuffer() - -- Pack blockno (uint16_t LE) + blockcnt (uint8_t) + blockwidth (uint8_t) + data + -- Pack blockno (uint16_t LE) + blockcnt (uint8_t) + blockwidth (uint8_t) + flags (uint8_t) + data local block_lo = bit32.band(i, 0xff) local block_hi = bit32.rshift(i, 8) - local payload = ('%02x%02x%02x%02x'):format(block_lo, block_hi, 1, 4)..blockdata + local payload = ('%02x%02x%02x%02x%02x'):format(block_lo, block_hi, 1, 4, 0)..blockdata cmd = Command:newNG{cmd = cmds.CMD_HF_MIFARE_EML_MEMSET, data = payload} local err, msg = cmd:sendNG(true) if err == nil then return err, msg end