RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-03-23 05:27:40 +08:00
Code Issues Projects Releases Packages Wiki Activity
6128 commits 3 branches 15 tags 94 MiB
Commit graph

6128 commits

This branch
This branch
All branches
Author SHA1 Message Date
iceman1001
d983f49652 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-05-18 21:39:14 +02:00
iceman1001
13cd6ab61a add support for higher speeds. 2019-05-18 21:38:21 +02:00
Philippe Teuwen
f0ec37b742 fix hw connect parsing 2019-05-18 21:35:50 +02:00
iceman1001
d4ad0da335 textual, 2019-05-18 18:51:05 +02:00
Philippe Teuwen
413440fdab hw connect: detect invalid usages 2019-05-18 18:45:15 +02:00
Philippe Teuwen
e6d64df6d0 Fixing segfault 2019-05-18 18:41:24 +02:00
iceman1001
faf3a95a45 chg: 'hw connect' - new params. p <port> b <baudrate> 
a correct call is now

hw connect p com6 b 115200

This will set baudrate between Client and BT White Dongle.
 2019-05-18 18:06:14 +02:00
iceman1001
24a4d053b3 chg: prompt now shows which channel is used. 2019-05-18 18:02:30 +02:00
iceman1001
d5802ff766 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-05-18 17:59:48 +02:00
iceman1001
d3d98282ac comments about Fractional parts in the baudrate generator 2019-05-18 17:57:30 +02:00
iceman1001
fb7ac7b0ea baudrate 230400 works good on PM3 device communicating with BT add-on (Blue Shark) 2019-05-18 17:56:46 +02:00
iceman1001
687f7f3697 consistent output 2019-05-18 17:56:03 +02:00
iceman1001
cba5d18124 use MIX 2019-05-18 17:55:11 +02:00
iceman1001
a4f4104075 textual 2019-05-18 17:53:08 +02:00
Philippe Teuwen
10dc959f34 btfactory: reset role as well 2019-05-18 17:47:29 +02:00
Philippe Teuwen
e9eb764358 Fix MCK in usart, our MCK is 16*12/2/2 2019-05-16 20:12:00 +02:00
Philippe Teuwen
362d7b6956 Fix win32 uart_receive disconnected device error code (@iceman) 2019-05-16 13:16:23 +02:00
Philippe Teuwen
b5e4a60a15 timeout reconfiguration: flag was never cleared and some more changes: 
* clear newtimeout_pending flag
* fix initial newtimeout_pending flag value on win32
* remove all _atomic as anyway a load+clear wouldn't be atomic and we're not in a critical situation: just one writer seldomly called on reconnect
* move new timeout poll to uart_recv for faster deployment
* remove redundant uart_reconfigure_timeouts(UART_FPC_CLIENT_RX_TIMEOUT_MS);
 2019-05-16 12:35:40 +02:00
iceman1001
9b85f80321 chg: the reconnect now works good on ubuntu and mingw (for me :)) 
chg: increased timeout for FPC from 170 -> 200.  Mingw seems slower.
 2019-05-16 08:02:56 +02:00
iceman1001
b206ecfad3 chg: revert logic 2019-05-16 07:44:52 +02:00
iceman1001
c125b3e9fe chg: less nesting 2019-05-16 07:33:02 +02:00
iceman1001
27c556b69a fix: now compiles on mingw 2019-05-16 07:32:34 +02:00
Philippe Teuwen
b4e8be82f4 remove spMutex, use atomic test&set instead 2019-05-16 00:29:30 +02:00
iceman1001
d4c3d07701 fix: failed compilation without btaddon option (@merlokk) 2019-05-15 16:56:54 +02:00
iceman1001
088d34eb3e chg: hf mf nack - keep sync if started without card over antenna 2019-05-15 08:20:04 -04:00
iceman1001
bfe2cff383 chg: hf mf nack - now uses NG 2019-05-15 07:47:46 -04:00
iceman1001
50c59fb6b2 chg: cident - uses NG 2019-05-15 07:03:19 -04:00
iceman1001
65ff4f0e92 chg: hf mf setmod - uses NG 2019-05-15 06:52:22 -04:00
iceman1001
41acc98d87 mix 2019-05-15 12:03:00 +02:00
iceman1001
0edf5500fe mix 2019-05-15 12:02:22 +02:00
iceman1001
fae572a569 mix 2019-05-15 04:31:52 -04:00
iceman1001
46f6548d1f to send MIX,.. 2019-05-15 10:24:25 +02:00
iceman1001
0740d14faa chg: some unifiying return values 2019-05-15 10:24:06 +02:00
Philippe Teuwen
bc090857b8 text 2019-05-15 08:57:15 +02:00
iceman1001
1e31455474 textual 2019-05-15 02:18:23 -04:00
Philippe Teuwen
8401eb4e14 Add usart btfactory 2019-05-15 02:15:19 +02:00
iceman1001
63cf6be691 guarded 2019-05-14 16:20:34 -04:00
iceman1001
a988c8ffef chg: hw status - now prints number of dictionary keys loaded. Dont print if zero/default empty 0xffff 2019-05-14 14:57:56 -04:00
iceman1001
586e2ebabd textual 2019-05-14 11:42:58 -04:00
iceman1001
36ecc4be97 style 2019-05-14 11:42:17 -04:00
Iceman
eef53a853a
Merge pull request #196 from mcd1992/guikeys 
Add clamp to PageDown case in plot GUI and updated changelog as requested in #195
 2019-05-14 17:38:35 +02:00
iceman1001
ace4798c4d Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-05-14 17:13:54 +02:00
iceman1001
8bfe669430 fix: 'script run legic' - at last, it now saves in EML and BIN format. 2019-05-14 17:13:29 +02:00
Aaron McDaniel
1186753bf6 Added clamp to PageDown case in plot GUI and updated changelog 2019-05-14 10:12:46 -05:00
Philippe Teuwen
1147c9faf8 Use ARRAYLEN 2019-05-14 12:51:45 +02:00
iceman1001
da09131aa3 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-05-14 12:37:02 +02:00
iceman1001
d792f015a2 fix: 'script run legic' - bytes was in string format, 2019-05-14 12:36:37 +02:00
Philippe Teuwen
62cf4ad8a7 fancy INPLACE 2019-05-14 12:35:25 +02:00
iceman1001
48c71aeef6 fix: 'script run legic' - also save as binary. https://github.com/RfidResearchGroup/proxmark3/issues/193 
if binary file exists,  it will try to increase filename counter to find a non-existing name.
 2019-05-14 11:54:25 +02:00
iceman1001
28398222e6 chg: 'hf tune' - now with prefix :) 2019-05-14 11:18:33 +02:00