iceman1001
176645b9fc
REM: removed unused define
2019-04-25 21:16:11 +02:00
Philippe Teuwen
0fc79824dd
Merge branch 'master' into experimental_varlen
...
* master:
remove redundant def
chg: forgot to readd hitag support :)
Guard Hitag code
2019-04-25 20:59:27 +02:00
Philippe Teuwen
27e94f5669
remove redundant def
2019-04-25 20:59:11 +02:00
iceman1001
c84cf10d86
Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3
2019-04-25 20:52:24 +02:00
iceman1001
a6278ff8cd
chg: forgot to readd hitag support :)
2019-04-25 20:51:20 +02:00
Philippe Teuwen
a844afc273
Guard Hitag code
2019-04-25 20:42:41 +02:00
Philippe Teuwen
eababdd3ef
Merge branch 'master' into experimental_varlen
...
* master:
chg: 'hf mf sim' - textual
fix: warning on mingw64. This offset is calculated, casting it to u32 should be fine.
fix: https://github.com/RfidResearchGroup/proxmark3/issues/174 remove all offending code, return 1. Will only impact the speed of hardnested execution.
fix again OSX
fix https://github.com/RfidResearchGroup/proxmark3/issues/173
used predefined constants, common types moved to common header files
backward compatibility, on load converter for old mfu dump format
loops for counters output
UL/NTAG new dump file format. Added counters support, simulation
2019-04-25 20:05:04 +02:00
Philippe Teuwen
6e8f7a7e30
more doc on bootrom
2019-04-25 19:56:13 +02:00
Philippe Teuwen
5c9c4637d8
doc uart timings
2019-04-25 19:55:37 +02:00
iceman1001
b173f73c81
style
2019-04-25 17:11:40 +02:00
iceman1001
df96b58fcc
style
2019-04-25 17:06:40 +02:00
iceman1001
278ec017fe
chg: increased client side timeout. Accoring to test with rdv4 addon ( @doegox )
2019-04-25 17:04:51 +02:00
iceman1001
ef95d8c742
chg: 'hf mf sim' - textual
2019-04-25 16:57:18 +02:00
iceman1001
5cc3a1b717
Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3
2019-04-25 16:55:48 +02:00
iceman1001
3bfd01bffb
fix: warning on mingw64. This offset is calculated, casting it to u32 should be fine.
2019-04-25 16:55:00 +02:00
Iceman
f227041932
Merge pull request #172 from McEloff/hfmfu
...
UL/NTAG new dump file format. Added counters support, simulation
2019-04-25 16:10:03 +02:00
iceman1001
fe35a972f5
fix: https://github.com/RfidResearchGroup/proxmark3/issues/174
...
remove all offending code, return 1. Will only impact the speed of hardnested execution.
2019-04-25 16:08:08 +02:00
iceman1001
90463cb79f
fix again OSX
2019-04-25 09:49:47 +02:00
iceman1001
980ad29d22
Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3
2019-04-25 08:29:42 +02:00
iceman1001
ce8d5c66ab
fix https://github.com/RfidResearchGroup/proxmark3/issues/173
...
this seems to work for OSX, and improved linux version with fallback.
2019-04-25 08:29:15 +02:00
Philippe Teuwen
4141003b09
Merge branch 'master' into experimental_varlen
...
* master:
Add openocd config files for JLink
Add makefile dependencies for recovery: need bootrom & os
2019-04-25 02:01:31 +02:00
Philippe Teuwen
42a03fc9f1
Add openocd config files for JLink
2019-04-25 02:00:23 +02:00
Philippe Teuwen
9fca642e10
Add makefile dependencies for recovery: need bootrom & os
2019-04-25 01:59:30 +02:00
Philippe Teuwen
7d2d23ce50
fix bootrom using new names (but still old packets)
2019-04-25 01:53:09 +02:00
Philippe Teuwen
4b5800d78f
remove name
2019-04-24 15:57:24 +02:00
Philippe Teuwen
517bf7e238
Merge branch 'master' into experimental_varlen
...
* master:
Force no-ms-bitfields to ensure proper struc packing on Windows
2019-04-24 15:05:09 +02:00
Philippe Teuwen
1b246cd380
Force no-ms-bitfields to ensure proper struc packing on Windows
2019-04-24 15:04:43 +02:00
Philippe Teuwen
79d7fb65b5
Merge branch 'master' into experimental_varlen
...
* master:
Fix segfault when loading a file
Revert c7a4d7af
, remove redundant include
2019-04-24 00:59:57 +02:00
Philippe Teuwen
25048ccf2f
Fix segfault when loading a file
2019-04-24 00:53:25 +02:00
Philippe Teuwen
e453aff88c
First adjustments for FPC BT link
2019-04-23 23:36:36 +02:00
Eloff
66ee8dc09e
used predefined constants, common types moved to common header files
2019-04-23 21:14:20 +03:00
Eloff
a8c1fa7a3b
backward compatibility, on load converter for old mfu dump format
2019-04-23 17:07:20 +03:00
Philippe Teuwen
dda63f9556
usart_fill_rxfifo: fetch no more than available room in FIFO
2019-04-23 00:25:14 +02:00
Philippe Teuwen
268ca8294e
flash read tested over usart
2019-04-22 23:17:34 +02:00
Philippe Teuwen
b0eef756c1
return PM3_SUCCESS on usart_writebuffer_sync, usb_write
2019-04-22 23:03:01 +02:00
Eloff
8793a9e596
Merge commit 'e171010d' into hfmfu
...
# Conflicts:
# CHANGELOG.md
2019-04-22 23:26:20 +03:00
Eloff
4161779083
loops for counters output
2019-04-22 23:20:35 +03:00
Philippe Teuwen
127f5ed192
Revert c7a4d7af
, remove redundant include
2019-04-22 22:11:57 +02:00
Philippe Teuwen
9602e641e2
Merge branch 'master' into experimental_varlen
...
* master:
translation
document offsets
textual
textual
typo
'hf mf sim' full-byte anti-collision frame support
2019-04-22 21:39:38 +02:00
iceman1001
04536a3564
translation
2019-04-22 19:31:22 +02:00
iceman1001
3bd145652b
document offsets
2019-04-22 19:29:45 +02:00
iceman1001
458ce75073
textual
2019-04-22 19:21:55 +02:00
iceman1001
166da51360
textual
2019-04-22 19:21:07 +02:00
Iceman
e171010d32
Merge pull request #170 from McEloff/temp
...
'hf mf sim' full-byte anti-collision frame support
2019-04-22 19:14:34 +02:00
Philippe Teuwen
d6892136ac
Add communication_delay also to dl_it timeout
2019-04-22 02:44:06 +02:00
Philippe Teuwen
f29facd15a
Harmonize usb_write & usart_writebuffer_sync return values
2019-04-22 02:28:58 +02:00
Philippe Teuwen
3e402797c1
dl_it uses also global start_time reset by packets reception as this can take ages (50s at 9600 baud for LF samples)
2019-04-22 02:11:46 +02:00
Philippe Teuwen
a9bb465271
reply_xx return val is int16_t, not bool
2019-04-22 02:10:31 +02:00
Philippe Teuwen
c4e16ebb9b
update new frames doc
2019-04-22 01:36:58 +02:00
Philippe Teuwen
4d0875442f
uart_posix rx timeouts
2019-04-22 01:33:39 +02:00