github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 05:43:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix: lf cmdread. skip WaitMS(100) when keep signal field ON.

Browse source 
4 extra symbol.
avoid include SOF in crc-hitag
This commit is contained in:
douniwan5788 2024-08-19 17:50:12 +08:00
commit eca9830050
2 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
armsrc/lfops.c
View file

@ -426,7 +426,10 @@ void ModThenAcquireRawAdcSamples125k(uint32_t delay_off, uint16_t period_0, uint
// start timer // start timer
StartTicks(); StartTicks();
WaitMS(100); if (!prev_keep) {
WaitMS(100);
}
// clear read buffer // clear read buffer
BigBuf_Clear_keep_EM(); BigBuf_Clear_keep_EM();

15
client/src/cmdlf.c
View file

@ -324,6 +324,10 @@ int CmdLFCommandRead(const char *Cmd) {
uint8_t i; uint8_t i;
for (i = 0; i < cmd_len; i++) { for (i = 0; i < cmd_len; i++) {
if ((cmd[i] != '0') && (cmd[i] != '1')) { if ((cmd[i] != '0') && (cmd[i] != '1')) {
// avoid include 'W0S' in crc
crc_init_ref(&crc, 8, 0x1d, 0xff, 0, false, false);
n = 0;
data = 0;
continue; continue;
} }
data <<= 1; data <<= 1;
@ -345,14 +349,14 @@ int CmdLFCommandRead(const char *Cmd) {
} }
} }
memcpy(payload.data, cmd, cmd_len); memcpy(payload.data, cmd, cmd_len + 1);
// extra symbol definition // extra symbol definition
uint8_t index_extra = 0; uint8_t index_extra = 0;
int i = 0; int i = 0;
for (; i < extra_arg_len;) { for (; i < extra_arg_len;) {
if (index_extra < LF_CMDREAD_MAX_EXTRA_SYMBOLS - 1) { if (index_extra < LF_CMDREAD_MAX_EXTRA_SYMBOLS) {
payload.symbol_extra[index_extra] = extra_arg[i]; payload.symbol_extra[index_extra] = extra_arg[i];
int tmp = atoi(extra_arg + (i + 1)); int tmp = atoi(extra_arg + (i + 1));
payload.period_extra[index_extra] = tmp; payload.period_extra[index_extra] = tmp;
@ -362,14 +366,15 @@ int CmdLFCommandRead(const char *Cmd) {
i++; i++;
} else { } else {
PrintAndLogEx(WARNING, "Too many extra symbols, please define up to %i symbols", LF_CMDREAD_MAX_EXTRA_SYMBOLS); PrintAndLogEx(ERR, "Too many extra symbols, please define up to %i symbols", LF_CMDREAD_MAX_EXTRA_SYMBOLS);
return PM3_EINVARG;
} }
} }
// bitbang mode // bitbang mode
if (payload.delay == 0) { if (payload.delay == 0) {
if (payload.period_0 < 7 || payload.period_1 < 7) { if (payload.period_0 < 7 || payload.period_1 < 7) {
PrintAndLogEx(WARNING, "periods cannot be less than 7us in bit bang mode"); PrintAndLogEx(ERR, "periods cannot be less than 7us in bit bang mode");
return PM3_EINVARG; return PM3_EINVARG;
} }
} }
@ -403,7 +408,7 @@ int CmdLFCommandRead(const char *Cmd) {
int ret = PM3_SUCCESS; int ret = PM3_SUCCESS;
do { do {
clearCommandBuffer(); clearCommandBuffer();
SendCommandNG(CMD_LF_MOD_THEN_ACQ_RAW_ADC, (uint8_t *)&payload, PAYLOAD_HEADER_SIZE + cmd_len); SendCommandNG(CMD_LF_MOD_THEN_ACQ_RAW_ADC, (uint8_t *)&payload, PAYLOAD_HEADER_SIZE + cmd_len + 1);
PacketResponseNG resp; PacketResponseNG resp;
// init to ZERO // init to ZERO