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!
This commit is contained in:
iceman1001 2014-10-27 21:42:41 +01:00
commit 7c756d6892
4 changed files with 13 additions and 8 deletions

View file

@ -948,7 +948,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
case CMD_DOWNLOADED_SIM_SAMPLES_125K: { case CMD_DOWNLOADED_SIM_SAMPLES_125K: {
uint8_t *b = (uint8_t *)BigBuf; 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); cmd_send(CMD_ACK,0,0,0,0,0);
break; break;
} }

View file

@ -6,3 +6,6 @@ lf t55xx rd 0
lf t55xx trac lf t55xx trac
lf t55xx rd 1 lf t55xx rd 1
lf t55xx rd 2 lf t55xx rd 2
lf em4x 410xsim 124s
lf em4x 410xsim 0F0368568B
da pl

View file

@ -398,17 +398,18 @@ int CmdLFSim(const char *Cmd)
/* convert to bitstream if necessary */ /* convert to bitstream if necessary */
ChkBitstream(Cmd); ChkBitstream(Cmd);
PrintAndLog("Sending data, please wait..."); PrintAndLog("Sending [%d bytes]", GraphTraceLen);
for (i = 0; i < GraphTraceLen; i += 48) { for (i = 0; i < GraphTraceLen; i += USB_CMD_DATA_SIZE) {
UsbCommand c={CMD_DOWNLOADED_SIM_SAMPLES_125K, {i, 0, 0}}; UsbCommand c={CMD_DOWNLOADED_SIM_SAMPLES_125K, {i, 0, 0}};
int j; int j;
for (j = 0; j < 48; j++) { for (j = 0; j < USB_CMD_DATA_SIZE; j++) {
c.d.asBytes[j] = GraphBuffer[i+j]; c.d.asBytes[j] = GraphBuffer[i+j];
} }
SendCommand(&c); SendCommand(&c);
WaitForResponse(CMD_ACK,NULL); WaitForResponse(CMD_ACK,NULL);
printf(".");
} }
printf("\n");
PrintAndLog("Starting simulator..."); PrintAndLog("Starting simulator...");
UsbCommand c = {CMD_SIMULATE_TAG_125K, {GraphTraceLen, gap, 0}}; UsbCommand c = {CMD_SIMULATE_TAG_125K, {GraphTraceLen, gap, 0}};
SendCommand(&c); SendCommand(&c);

View file

@ -221,7 +221,8 @@ int CmdEM410xSim(const char *Cmd)
/* clear our graph */ /* clear our graph */
ClearGraph(0); ClearGraph(0);
GraphTraceLen = 0;
/* write it out a few times */ /* write it out a few times */
for (h = 0; h < 4; h++) for (h = 0; h < 4; h++)
{ {
@ -270,7 +271,7 @@ int CmdEM410xSim(const char *Cmd)
/* booyah! */ /* booyah! */
RepaintGraphWindow(); RepaintGraphWindow();
CmdLFSim(""); CmdLFSim("64");
return 0; return 0;
} }
@ -295,7 +296,7 @@ int CmdEM410xWatch(const char *Cmd)
} }
CmdLFRead(read_h ? "h" : ""); CmdLFRead(read_h ? "h" : "");
CmdSamples("16000"); CmdSamples("12000");
} while ( } while (
!CmdEM410xRead("64") !CmdEM410xRead("64")