fix calypso lua script

client/lualibs/commands.lua

@@ -93,8 +93,10 @@ Command = {
         o.data = data
         return o
     end,
-    parse = function (packet)
-            local count, cmd, arg1, arg2, arg3, data = bin.unpack('LLLLH511', packet)
+    parse = function(packet)
+            local count, cmd, arg1, arg2, arg3, data = bin.unpack('LLLL', packet)
+            local length = #packet - count + 1
+            count, data = bin.unpack('H'..length, packet, count)
             return Command:new{cmd = cmd, arg1 = arg1, arg2 = arg2, arg3 = arg3, data = data}
     end
 }
@@ -121,26 +123,28 @@ end
 -- @param command - the usb packet to send
 -- @param ignoreresponse - if set to true, we don't read the device answer packet
 --     which is usually recipe for fail. If not sent, the host will wait 2s for a
---     response of type CMD_ACK
+--     response of type CMD_ACK or like NG use the CMD as ack..
 -- @return packet,nil if successful
 --         nil, errormessage if unsuccessful
-function Command:sendMIX( ignore_response, timeout )
+function Command:sendMIX( ignore_response, timeout, use_cmd_ack)
+    if timeout == nil then timeout = TIMEOUT end
     local data = self.data
     local cmd = self.cmd
-    local arg1, arg2, arg3 = self.arg1, self.arg2, self.arg3
+    local arg1, arg2, arg3 = self.arg1, self.arg2, self.arg3   
 
     local err, msg = core.SendCommandMIX(cmd, arg1, arg2, arg3, data)
     if err == nil then return err, msg end
-
     if ignore_response then return true, nil end
+    
+    local ack = _commands.CMD_ACK 
+    if use_cmd_ack then
+        ack = cmd
+    end
 
-    if timeout == nil then timeout = TIMEOUT end
-
-    local response, msg = core.WaitForResponseTimeout(_commands.CMD_ACK, timeout)
+    local response, msg = core.WaitForResponseTimeout(ack, timeout)
     if response == nil then
         return nil, 'Error, waiting for response timed out :: '..msg
     end
-
     -- lets digest
     data = nil
     cmd = nil
@@ -157,15 +161,13 @@ function Command:sendMIX( ignore_response, timeout )
     return packed, nil;
 end
 function Command:sendNG( ignore_response, timeout )
+    if timeout == nil then timeout = TIMEOUT end
     local data = self.data
     local cmd = self.cmd
     local err, msg = core.SendCommandNG(cmd, data)
     if err == nil then return nil, msg end
 
     if ignore_response then return true, nil end
-
-    if timeout == nil then timeout = TIMEOUT end
-
     local response, msg = core.WaitForResponseTimeout(cmd, timeout)
     if response == nil then
         return nil, 'Error, waiting for response timed out :: '..msg

client/lualibs/read14b.lua

@@ -15,17 +15,18 @@ local cmds = require('commands')
 local utils = require('utils')
 
 -- Shouldn't take longer than 2.5 seconds
-local TIMEOUT = 2500
+local TIMEOUT = 2000
 
 local ISO14B_COMMAND = {
-    ISO14B_CONNECT = 1,
-    ISO14B_DISCONNECT = 2,
-    ISO14B_APDU = 4,
-    ISO14B_RAW = 8,
+    ISO14B_CONNECT = 0x1,
+    ISO14B_DISCONNECT = 0x2,
+    ISO14B_APDU = 0x4,
+    ISO14B_RAW = 0x8,
     ISO14B_REQUEST_TRIGGER = 0x10,
     ISO14B_APPEND_CRC = 0x20,
     ISO14B_SELECT_STD = 0x40,
     ISO14B_SELECT_SR = 0x80,
+    ISO14B_SET_TIMEOUT = 0x100,
 }
 
 local function parse14443b(data)
@@ -74,9 +75,11 @@ local function read14443b(disconnect)
             arg1 = flags
             }
 
-    local result, err = command:sendMIX()
+    info = nil
+
+    local result, err = command:sendMIX(false, TIMEOUT, true)
     if result then
-        local count,cmd,arg0,arg1,arg2 = bin.unpack('LLLL',result)
+        local count,cmd,arg0,arg1,arg2 = bin.unpack('LLLL', result)
         if arg0 == 0 then
             data = string.sub(result, count)
             info, err = parse14443b(data)
@@ -88,12 +91,10 @@ local function read14443b(disconnect)
     end
 
     if err then
-        print(err)
         return nil, err
     end
-    return info
+    return info, nil
 end
-
 ---
 -- Waits for a mifare card to be placed within the vicinity of the reader.
 -- @return if successful: an table containing card info
@@ -102,12 +103,11 @@ local function waitFor14443b()
     print('Waiting for card... press Enter to quit')
     while not core.kbd_enter_pressed() do
         res, err = read14443b(false)
-        if res then return res end
+        if res then return res, err end
         -- err means that there was no response from card
     end
     return nil, 'Aborted by user'
 end
-
 ---
 -- turns on the HF field.
 local function connect14443b()