iceman1001
88744650db
Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3
2019-04-26 08:56:16 +02:00
Philippe Teuwen
70995f0f1e
use color macros
2019-04-26 08:29:48 +02:00
Philippe Teuwen
acc101ed37
doc magic
2019-04-26 08:29:21 +02:00
Philippe Teuwen
9e39d6ffc3
new light scheme for detectreader
2019-04-26 01:37:17 +02:00
iceman1001
de05d6e4d2
Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3
2019-04-26 00:30:36 +02:00
Philippe Teuwen
7d6f971db4
archive and fix hid-flasher
2019-04-26 00:11:45 +02:00
Philippe Teuwen
9a6ad6597f
update standalone readme
2019-04-25 23:40:51 +02:00
Philippe Teuwen
c22da12502
Merge branch 'master' into experimental_varlen
...
* master:
Update readme.md
Update readme.md
Update readme.md
remove redundant def
2019-04-25 23:33:52 +02:00
Iceman
839a0ef9fb
Update readme.md
2019-04-25 23:23:44 +02:00
Iceman
1e797e1720
Update readme.md
2019-04-25 23:20:54 +02:00
Iceman
f90b04d4cf
Update readme.md
2019-04-25 23:20:33 +02:00
Philippe Teuwen
3e641e217d
remove redundant def
2019-04-25 23:09:06 +02:00
Philippe Teuwen
540fecb760
Merge branch 'master' into experimental_varlen
...
* master:
adjust standalone doc
Use placeholder for standalone mode if needed
Move compile options to Makefile.hal
textual
chg: refactor standalone mode info string add: icerun - skeleton standalone mode for ppl to use as base for their new modes.
2019-04-25 23:01:49 +02:00
iceman1001
9102c37292
Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3
2019-04-25 22:51:30 +02:00
iceman1001
5c49fcbfdb
CHG: remove WITH_EMV since its not used at all.
2019-04-25 22:51:01 +02:00
Philippe Teuwen
423e6bfb32
adjust standalone doc
2019-04-25 22:43:08 +02:00
Philippe Teuwen
c616f47d6b
Use placeholder for standalone mode if needed
2019-04-25 22:40:46 +02:00
Philippe Teuwen
5d6f2c641b
Merge branch 'master' of github.com:RfidResearchGroup/proxmark3
...
* 'master' of github.com:RfidResearchGroup/proxmark3:
textual
chg: refactor standalone mode info string add: icerun - skeleton standalone mode for ppl to use as base for their new modes.
2019-04-25 22:25:10 +02:00
Philippe Teuwen
f3b3508d3e
Move compile options to Makefile.hal
2019-04-25 22:15:16 +02:00
iceman1001
505506c5dd
textual
2019-04-25 21:50:55 +02:00
iceman1001
7220653ccd
chg: refactor standalone mode info string
...
add: icerun - skeleton standalone mode for ppl to use as base for their new modes.
2019-04-25 21:44:34 +02:00
Philippe Teuwen
e7e07d9096
Merge branch 'master' into experimental_varlen
...
* master:
fix: spellingmistake
REM: removed unused define
2019-04-25 21:26:51 +02:00
iceman1001
a59f7a50ce
fix: spellingmistake
2019-04-25 21:21:53 +02:00
iceman1001
d913cacdca
Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3
2019-04-25 21:16:39 +02:00
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