From 7c756d68925891ec3d3aa0bec89ec215fd449bd1 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 27 Oct 2014 21:42:41 +0100
Subject: [PATCH 1/1] FIX: Another try to see if the "lf em4x 410xsim"
becomes better, added the clock in the calls since the auto detection of the
clock seems to be wrong. I get 67, instead of 64...
FIX: changes the transfersize from sim -> pm3, was 48, now USB_CMD_DATA_SIZE (512) Much faster!
---
armsrc/appmain.c | 2 +-
client/.history | 3 +++
client/cmdlf.c | 9 +++++----
client/cmdlfem4x.c | 7 ++++---
4 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index d239ceb0..6d18561a 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -948,7 +948,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
case CMD_DOWNLOADED_SIM_SAMPLES_125K: {
uint8_t *b = (uint8_t *)BigBuf;
- memcpy(b+c->arg[0], c->d.asBytes, 48);
+ memcpy(b+c->arg[0], c->d.asBytes, USB_CMD_DATA_SIZE);
cmd_send(CMD_ACK,0,0,0,0,0);
break;
}
diff --git a/client/.history b/client/.history
index 176dec98..e20a63e0 100644
--- a/client/.history
+++ b/client/.history
@@ -6,3 +6,6 @@ lf t55xx rd 0
lf t55xx trac
lf t55xx rd 1
lf t55xx rd 2
+lf em4x 410xsim 124s
+lf em4x 410xsim 0F0368568B
+da pl
diff --git a/client/cmdlf.c b/client/cmdlf.c
index a198e1e1..1ce0ac81 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -398,17 +398,18 @@ int CmdLFSim(const char *Cmd)
/* convert to bitstream if necessary */
ChkBitstream(Cmd);
- PrintAndLog("Sending data, please wait...");
- for (i = 0; i < GraphTraceLen; i += 48) {
+ PrintAndLog("Sending [%d bytes]", GraphTraceLen);
+ for (i = 0; i < GraphTraceLen; i += USB_CMD_DATA_SIZE) {
UsbCommand c={CMD_DOWNLOADED_SIM_SAMPLES_125K, {i, 0, 0}};
int j;
- for (j = 0; j < 48; j++) {
+ for (j = 0; j < USB_CMD_DATA_SIZE; j++) {
c.d.asBytes[j] = GraphBuffer[i+j];
}
SendCommand(&c);
WaitForResponse(CMD_ACK,NULL);
+ printf(".");
}
-
+ printf("\n");
PrintAndLog("Starting simulator...");
UsbCommand c = {CMD_SIMULATE_TAG_125K, {GraphTraceLen, gap, 0}};
SendCommand(&c);
diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index aa87132e..45a95f02 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -221,7 +221,8 @@ int CmdEM410xSim(const char *Cmd)
/* clear our graph */
ClearGraph(0);
-
+ GraphTraceLen = 0;
+
/* write it out a few times */
for (h = 0; h < 4; h++)
{
@@ -270,7 +271,7 @@ int CmdEM410xSim(const char *Cmd)
/* booyah! */
RepaintGraphWindow();
- CmdLFSim("");
+ CmdLFSim("64");
return 0;
}
@@ -295,7 +296,7 @@ int CmdEM410xWatch(const char *Cmd)
}
CmdLFRead(read_h ? "h" : "");
- CmdSamples("16000");
+ CmdSamples("12000");
} while (
!CmdEM410xRead("64")
--
2.39.5