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

Merge pull request #2901 from Antiklesys/master

Browse source 
Minor iclass sam comms tweaks
This commit is contained in:
Iceman 2025-06-12 13:51:57 +02:00 • committed by GitHub
commit 6ba00b7bee
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
armsrc/i2c.h
View file

@ -36,7 +36,7 @@
// 8051 speaks with smart card. // 8051 speaks with smart card.
// 1000*50*3.07 = 153.5ms // 1000*50*3.07 = 153.5ms
// 1 byte transfer == 1ms with max frame being 256 bytes // 1 byte transfer == 1ms with max frame being 256 bytes
#define SIM_WAIT_DELAY 88000 // about 270ms delay // 109773 -- about 337.7ms delay #define SIM_WAIT_DELAY 150000 // about 270ms delay // 109773 -- about 337.7ms delay
void I2C_recovery(void); void I2C_recovery(void);

4
armsrc/sam_common.c
View file

@ -279,7 +279,7 @@ int sam_get_version(bool info) {
if (g_dbglevel >= DBG_INFO || info) { if (g_dbglevel >= DBG_INFO || info) {
DbpString(_BLUE_("-- SAM Information --")); DbpString(_BLUE_("-- SAM Information --"));
Dbprintf(_YELLOW_("Firmware version: ")"%X.%X", sam_version_an[2], sam_version_an[3]); Dbprintf(_YELLOW_("Firmware version: ")"%X.%X", sam_version_an[2], sam_version_an[3]);
Dbprintf(_YELLOW_("Firmware ID : ")); Dbprintf(_YELLOW_("Firmware ID: "));
Dbhexdump(sam_build_an[1], sam_build_an + 2, false); Dbhexdump(sam_build_an[1], sam_build_an + 2, false);
} }
goto out; goto out;
@ -348,7 +348,7 @@ int sam_get_serial_number(void) {
goto error; goto error;
} }
Dbprintf(_YELLOW_("Sam Serial Number: ")); Dbprintf(_YELLOW_("Serial Number: "));
Dbhexdump(sam_response_an[1],sam_serial_an, false); Dbhexdump(sam_response_an[1],sam_serial_an, false);
goto out; goto out;

5
client/src/cmdhficlass.c
View file

@ -5961,10 +5961,7 @@ static int CmdHFiClassSAM(const char *Cmd) {
clearCommandBuffer(); clearCommandBuffer();
SendCommandNG(CMD_HF_SAM_PICOPASS, data, cmdlen + 1); SendCommandNG(CMD_HF_SAM_PICOPASS, data, cmdlen + 1);
PacketResponseNG resp; PacketResponseNG resp;
if (WaitForResponseTimeout(CMD_HF_SAM_PICOPASS, &resp, 4000) == false) { WaitForResponse(CMD_HF_SAM_PICOPASS, &resp);
PrintAndLogEx(WARNING, "SAM timeout");
return PM3_ETIMEOUT;
}
switch (resp.status) { switch (resp.status) {
case PM3_SUCCESS: case PM3_SUCCESS: