Philippe Teuwen
13b2e6eed7
Fix hf mf chk
2019-05-01 12:19:51 +02:00
Philippe Teuwen
63cd4a9fbb
Merge branch 'better_color_handling'
...
* better_color_handling:
Remove cmd_debug from flasher, we've COMMS_DEBUG_RAW if needed
Use PrintAndLogEx in flasher
Simplify color & banner logic
Smart color handling:
2019-04-30 21:37:19 +02:00
Philippe Teuwen
27f7057961
Rename few USB -> PM3 to avoid misleading interpretations
2019-04-30 21:10:11 +02:00
Philippe Teuwen
0a4b90ac20
Simplify color & banner logic
2019-04-30 13:02:27 +02:00
Philippe Teuwen
a91d0a7b19
Smart color handling:
...
* if on Windows, no color, as usual
* if on Linux, color only on real term
* no color when > foo
* no color in the logfile
2019-04-30 00:41:52 +02:00
Iceman
bdf7746105
Merge pull request #175 from McEloff/hf14a
...
'hf 14a sim' more flexible init responses method
2019-04-29 22:52:05 +02:00
Philippe Teuwen
56f92348ea
style
2019-04-29 22:41:28 +02:00
iceman1001
03d6454d95
chg: 'script run mfkeys' : uses NG
...
chg: 'hf mf chk' : uses old/mix
2019-04-29 12:12:14 +02:00
iceman1001
7454a4dcf2
chg: 'hf mf chkkeys' - now uses NG
2019-04-29 02:07:40 +02:00
Philippe Teuwen
f0c0b854ac
Fix mifare_ultra_readblockEx, copy full 16b of mful block (was 14)
2019-04-29 01:08:59 +02:00
iceman1001
a5ba5a99e8
forgot FLAGS...
2019-04-28 18:48:59 +02:00
iceman1001
ab6870c573
style
2019-04-28 11:08:41 +02:00
iceman1001
d47efa8547
fix uninitialized
2019-04-27 12:01:22 +02:00
iceman1001
5f831ee776
chg: 'hw detectreader' - clean up
2019-04-27 11:09:20 +02:00
Philippe Teuwen
e2e0b704c5
Several changes in the initial connection, see details:
...
* TestProxmark uses pingng
* New command CMD_CAPABILITIES to transmit capabilities from pm3 to host
* Use TestProxmark to retrieve capabilities with that new command
* CloseProxmark if TestProxmark fails
* Hide baudrate for USB and retrieve real baudrate from pm3 for BT
2019-04-27 02:46:20 +02:00
Philippe Teuwen
e9bfc3eb7a
Merge branch 'master' into experimental_varlen
...
* master:
rename usb_present
TestProxmark only if OpenProxmark returned pm3 present
Trying original SPI mode for 24MHz flash mem
text
2019-04-26 23:30:30 +02:00
Philippe Teuwen
a1bb2ec106
Trying original SPI mode for 24MHz flash mem
2019-04-26 22:17:26 +02:00
iceman1001
87eee0cf5c
text
2019-04-26 13:07:45 +02:00
Eloff
b2d0bea05f
'hf 14a sim' more flexible init responses method
2019-04-26 13:22:57 +03:00
Philippe Teuwen
1c136c8fc6
Merge branch 'master' into experimental_varlen
...
* master:
rework Dbprintf & add color support
use color macros
doc magic
archive and fix hid-flasher
update standalone readme
2019-04-26 10:48:28 +02:00
Philippe Teuwen
cb452c98ba
rework Dbprintf & add color support
2019-04-26 10:36:06 +02:00
Philippe Teuwen
9e39d6ffc3
new light scheme for detectreader
2019-04-26 01:37:17 +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
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
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
a6278ff8cd
chg: forgot to readd hitag support :)
2019-04-25 20:51:20 +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
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
Philippe Teuwen
83571f02a0
style
2019-04-16 20:49:32 +02:00
Philippe Teuwen
44bbb7d2c7
new frame format, smaller and with crc. Some code simplified
2019-04-16 20:00:17 +02:00
iceman1001
e04e2d6fa7
revert
2019-04-16 17:02:21 +02:00
iceman1001
597019b98a
revert
2019-04-16 17:01:00 +02:00
iceman1001
64c7ee117e
revert
2019-04-16 17:00:18 +02:00
iceman1001
aaedeafbb1
style spaces
2019-04-16 16:56:56 +02:00
iceman1001
75524b72d1
style
2019-04-16 15:10:55 +02:00
iceman1001
144237abfd
style
2019-04-16 15:09:57 +02:00
iceman1001
e5928424b6
style
2019-04-16 15:08:51 +02:00