dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,687 Commits 7 Branches 1 Tag
eababdd3ef84fca7840f041a76dd81f81e1d854d
Commit Graph

1531 Commits

Author SHA1 Message Date
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
iceman1001
df96b58fcc style 2019-04-25 17:06:40 +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
Philippe Teuwen
4b5800d78f remove name 2019-04-24 15:57:24 +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
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
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
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
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
f29facd15a Harmonize usb_write & usart_writebuffer_sync return values 2019-04-22 02:28:58 +02:00
Philippe Teuwen
a9bb465271 reply_xx return val is int16_t, not bool 2019-04-22 02:10:31 +02:00
Philippe Teuwen
eebea8c088 DbpStringEx using reply_ng 2019-04-22 01:33:32 +02:00
Philippe Teuwen
cdd4177968 usart_writebuffer_sync simplified as we're always sending in blocking mode anyway 2019-04-22 00:30:01 +02:00
Philippe Teuwen
81780e5c98 DbpStringEx using now reply_mix. hw status at 9600: from 26.5s to 7s 2019-04-21 23:58:53 +02:00
Philippe Teuwen
a2e55be468 new format doc 2019-04-21 17:34:56 +02:00
Eloff
db3103b531 UL/NTAG new dump file format. Added counters support, simulation 2019-04-21 03:18:00 +03:00
Philippe Teuwen
6e744043f5 usart working... when debugged... 2019-04-21 00:44:19 +02:00
Philippe Teuwen
7ca1e98776 Protect SetAdcMuxFor with FPC 2019-04-20 11:17:14 +02:00
Philippe Teuwen
e4006a7563 doc errors 2019-04-20 10:34:54 +02:00
Philippe Teuwen
a7773b3395 Introduce reply_mix, to still get some varlen on old API 2019-04-20 03:17:19 +02:00
Philippe Teuwen
a45238236d armsrc: put new frame parsing in common for usart (still usart_read_ng to do) 2019-04-20 01:47:50 +02:00
Philippe Teuwen
7331b7d6d2 Merge branch 'master' into experimental_varlen 
* master:
  Add ref to new mifaresim.h in standalone modes
  fix: Standalone/hf_colin now compiles
  Update readme.md
  chg: hitag compile flag optional
  fix: standalonemode matty_run now compiles
  typo
  smallfix
  chg: fpga lf simulation
  chg: 'fpga lf sim' - 25% both on sides.
 2019-04-19 23:17:36 +02:00
Philippe Teuwen
c7a4d7af3a Add ref to new mifaresim.h in standalone modes 2019-04-19 23:15:02 +02:00
Philippe Teuwen
c4766b2649 Semi-Automated SendCommand -> SendCommandOLD 2019-04-19 23:01:13 +02:00
iceman1001
a82fd7da34 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-04-19 10:00:09 +02:00
iceman1001
b495f4bc44 fix: Standalone/hf_colin now compiles 2019-04-19 09:59:34 +02:00
Iceman
05674dc559 Update readme.md 2019-04-19 09:29:50 +02:00
iceman1001
b29b07c8ad chg: hitag compile flag optional 2019-04-19 09:23:24 +02:00
iceman1001
9c776c8935 fix: standalonemode matty_run now compiles 2019-04-19 09:23:02 +02:00
Philippe Teuwen
9b4896225c SendCommandOLD for hf_young 2019-04-19 01:14:33 +02:00
Philippe Teuwen
8c89b35f1e style 2019-04-18 21:41:48 +02:00
Philippe Teuwen
9ff841efb2 CRC optional, replaced by magic on USB 2019-04-18 21:39:35 +02:00
Eloff
960b21793c 'hf mf sim' full-byte anti-collision frame support 2019-04-18 21:02:48 +03:00
Philippe Teuwen
482db05741 Rename few stuff for consistency 2019-04-18 12:49:51 +02:00
Philippe Teuwen
15558070ad Fix receive_ng returned val test 2019-04-18 10:41:11 +02:00
Philippe Teuwen
cb411ffab4 receive_ng in common/ 2019-04-18 00:50:31 +02:00
Philippe Teuwen
4e31c6110b Better Command structs 2019-04-18 00:12:52 +02:00
Philippe Teuwen
533667ea6d Better Reply structs 2019-04-17 23:44:48 +02:00
Philippe Teuwen
64eb93c9c4 style 2019-04-17 22:08:10 +02:00
Philippe Teuwen
7cbcf8163c Merge branch 'master' into experimental_varlen 
* master: (27 commits)
  textual
  style redundant assignment
  timeout fix
  small fix
  add termcap
  add readline and small fix
  rdp
  textual
  null term?
  fix: https://github.com/RfidResearchGroup/proxmark3/issues/166
  add dlls to release
  style
  style
  test fix
  test fixes
  another fix
  fix memleak
  fix
  textual
  use printandlogex
  ...
 2019-04-17 22:06:39 +02:00
Philippe Teuwen
be15ad7fec Viva la revolucion 2019-04-17 21:30:01 +02:00
iceman1001
1ee3679a98 style 2019-04-17 14:54:42 +02:00
Philippe Teuwen
8bfc5c1b47 New reply frames reception 2019-04-17 01:06:26 +02:00
Philippe Teuwen
96843c3f47 New reply frames transmission (reception still to be done) 2019-04-16 23:15:23 +02:00
Philippe Teuwen
4eaa2fc5aa move common util fcts to /common to avoid common files (e.g. crc) to depend on non-common files 2019-04-16 23:02:40 +02:00
Eloff
63f9f11066 'hf mf sim' bugs fix, RATS support, etc 2019-04-16 23:52:05 +03:00
Philippe Teuwen
8b99df9074 Merge branch 'master' into experimental_varlen2 
* master: (33 commits)
  unified Proxmark3 text
  removed
  more colors
  rearranged banner output and messages
  textual
  revert
  revert
  revert
  style spaces
  fix fake com port
  style
  style
  styles
  not null?
  style
  style
  style
  style
  style
  style
  ...
 2019-04-16 20:58:58 +02:00