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

Merge branch 'master' into dev_4x50_standalone

Browse source 
solved merge conflicts
This commit is contained in:
tharexde 2021-01-30 00:29:18 +01:00
commit b57a457254
67 changed files with 943 additions and 683 deletions
Download patch file Download diff file Expand all files Collapse all files

8
armsrc/em4x50.c
View file

@ -676,7 +676,7 @@ static bool brute(uint32_t start, uint32_t stop, uint32_t *pwd) {
void em4x50_login(uint32_t *password) {
em4x50_setup_read();
uint8_t status = PM3_EFAILED;
int status = PM3_EFAILED;
LED_C_ON();
if (get_signalproperties() && find_em4x50_tag()) {
LED_C_OFF();
@ -1232,7 +1232,7 @@ static int em4x50_sim_read_bit(void) {
if (timeout <= 0) {
return PM3_ETIMEOUT;
}
timeout = EM4X50_T_SIMULATION_TIMEOUT_READ;
// timeout = EM4X50_T_SIMULATION_TIMEOUT_READ;
// now we have a reference "position", from here it will take
// slightly less than 32 cycles until the end of the bit period
@ -1432,7 +1432,7 @@ static int em4x50_sim_handle_standard_read_command(uint32_t *tag) {
WDT_HIT();
command = em4x50_sim_send_listen_window(tag);
int command = em4x50_sim_send_listen_window(tag);
if (command != PM3_SUCCESS) {
return command;
}
@ -1488,7 +1488,7 @@ static int em4x50_sim_handle_selective_read_command(uint32_t *tag) {
WDT_HIT();
command = em4x50_sim_send_listen_window(tag);
int command = em4x50_sim_send_listen_window(tag);
if (command != PM3_SUCCESS) {
return command;
}