RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-03-01 02:27:21 +08:00
Code Issues Projects Releases Packages Wiki Activity
7190 commits 3 branches 15 tags 87 MiB
Commit graph

129 commits

Author SHA1 Message Date
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
5c9c38ff71 Use PrintAndLogEx in flasher 2019-04-30 20:19:29 +02:00
iceman1001
cddc25994c fix: by reference 2019-04-30 16:16:17 +02:00
Philippe Teuwen
0a4b90ac20 Simplify color & banner logic 2019-04-30 13:02:27 +02:00
iceman1001
e1063e2836 chg: reconfigure uart timeouts when compiled for FPC and connecting over USB. 2019-04-30 12:57:44 +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
Philippe Teuwen
f4d62eec09 Fix COMMS_DEBUG_RAW 2019-04-29 23:02:49 +02:00
Philippe Teuwen
32a512b13e Support break_after_ACK for MIX frames 2019-04-29 22:39:18 +02:00
Philippe Teuwen
ac9f3b29f6 better COMMS_DEBUG_RAW 2019-04-29 22:38:54 +02:00
Philippe Teuwen
fc6be9fea4 Define USB_CMD_DATA_SIZE_MIX 2019-04-29 22:38:26 +02:00
Philippe Teuwen
5e8fc73527 Debug hexdumps of comm 2019-04-29 01:20:03 +02:00
iceman1001
9779868753 style 2019-04-28 11:09:46 +02:00
iceman1001
c5c364d994 fix: compilation on mingw 2019-04-27 11:57:11 +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
7d1161d7d8 First packet is in TestProxmark, not pm3_version 2019-04-27 01:16:43 +02:00
Philippe Teuwen
12937884f6 move uart_speed to conn struct and display baudrate only for real UART 2019-04-27 01:15:52 +02:00
Philippe Teuwen
3b6a249646 move global connection flags to cnn struct 2019-04-26 23:16:24 +02:00
Philippe Teuwen
01b31c742b Use block_after_ACK in flashmem too 2019-04-26 13:53:11 +02:00
Philippe Teuwen
b12be75a5b Remove block_after_ACK mechanism on NG frames, flashing uses OLD and NG won't use ACK anymore 2019-04-26 12:02:34 +02:00
Philippe Teuwen
a14b3d8b87 Merge branch 'master' into experimental_varlen 
* master:
  missing bracket
  text
  CHG: remove WITH_EMV since its not used at all.
 2019-04-26 10:54:12 +02:00
iceman1001
4ad9f57939 missing bracket 2019-04-26 10:49:30 +02: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
iceman1001
df96b58fcc style 2019-04-25 17:06:40 +02:00
Philippe Teuwen
4b5800d78f remove name 2019-04-24 15:57:24 +02:00
Philippe Teuwen
e453aff88c First adjustments for FPC BT link 2019-04-23 23:36:36 +02:00
Philippe Teuwen
d6892136ac Add communication_delay also to dl_it timeout 2019-04-22 02:44:06 +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
eebea8c088 DbpStringEx using reply_ng 2019-04-22 01:33:32 +02:00
Philippe Teuwen
913c03d3c4 Reset WaitForResponse timeout every time we get a packet 
as cmds sending a lot of Dbprintf msgs can take ages on slow links
e.g. "hw status" on 9600 baud link takes 26.5s with "reply_old" Dbprintf
 2019-04-21 23:56:08 +02:00
Philippe Teuwen
75ee60f267 WaitForResponseTimeoutW: fix, no communication_delay when timeout=-1 2019-04-21 23:26:51 +02:00
Philippe Teuwen
4aa1b49493 fix uart_posix: bytecound must be 32b 2019-04-21 01:05:02 +02:00
Philippe Teuwen
6e744043f5 usart working... when debugged... 2019-04-21 00:44:19 +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
3bcf80bb34 Introduce SendCommandMIX, to still get some varlen on old API 2019-04-20 02:41:40 +02:00
Philippe Teuwen
95822d8360 minor 2019-04-20 01:49:37 +02:00
Philippe Teuwen
b68ccfa7b8 SendCommandOLD : comms & flash 2019-04-19 02:01:47 +02:00
Philippe Teuwen
7dbd12ad27 SendCommandOLD: cmdhw 2019-04-18 22:42:15 +02:00
Philippe Teuwen
9bd59a8d40 Add SendCommandOLD 2019-04-18 22:19:28 +02:00
Philippe Teuwen
b860cc6eaf Rename MAGIC defines 2019-04-18 21:49:37 +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
Philippe Teuwen
482db05741 Rename few stuff for consistency 2019-04-18 12:49:51 +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
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
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
iceman1001
436910605b unified Proxmark3 text 2019-04-16 20:00:25 +02:00
Philippe Teuwen
44bbb7d2c7 new frame format, smaller and with crc. Some code simplified 2019-04-16 20:00:17 +02:00
iceman1001
2639de23c6 rearranged banner output and messages 2019-04-16 17:26:15 +02:00
Philippe Teuwen
34467b7550 Variable length frames, part1: USB Host -> Pm3 2019-04-16 10:01:08 +02:00
Philippe Teuwen
62f46d6544 Use PrintAndLogEx 2019-04-14 18:51:07 +02:00
Philippe Teuwen
9a7bba2438 Move UART open msg to avoid flood in wait mode 2019-04-14 18:49:19 +02:00
Philippe Teuwen
04c0384d3e Testing pm3 communication 2019-04-14 17:25:17 +02:00
Philippe Teuwen
e708d86306 Rework command line options 2019-04-14 12:54:37 +02:00
Philippe Teuwen
4f32655004 use more static and fix [-Wmissing-prototypes], ongoing... 2019-04-13 00:25:43 +02:00
Philippe Teuwen
0ab6de64d4 structs: initializes explicitely all fields, so we can detect when we really forgot one [-Wmissing-field-initializers] 2019-04-10 13:59:00 +02:00
iceman1001
7f0b1eacd1 unshadow 2019-04-08 10:13:15 +02:00
Philippe Teuwen
21be6d4400 FPC: got RX working, got client over usart somehow working..., see detailed commit msg 
* using WITH_FPC:
  * activate basic usart
  * no double buffer for now, no interrupt
  * usart_dataavailable/usart_readbuffer/usart_writebuffer, to demo it:
    * pm3 client over USB, minicom over usart
    * analyse a d 414243
* using WITH_FPC_HOST:
  * it implies WITH_FPC as it's based on it
  * control pm3 with client over usart
  * EXPERIMENTAL! still some frame desync issues
  * you can connect both from usart & USB with two pm3 clients
    * actually you *have* to connect USB for the moment because
      it's used to send debug messages about buggy usart... See Dbprintf_usb below
  * "sessions": msgs are directed to the latest client to have sent a cmd
  * Dbprintf_usb macro to send msgs to USB client to help debugging usart...
  * We now have an option to run client at different speed as usart is 115200:
    client/proxmark3 /dev/ttyUSB0 -b 115200
  * Consequently, argc,argv handling is a bit revamped, it was so messy...
  * USB and flashing are still at 460800, don't try flashing over usart yet ^^
 2019-04-02 22:06:10 +02:00
Philippe Teuwen
961d929f4d changing {} style to match majority of previous style 2019-03-10 11:20:22 +01:00
Philippe Teuwen
da6cdf014b Keep string syntax in color macros 2019-03-10 00:56:00 +01:00
Philippe Teuwen
0373696662 make style 2019-03-10 00:00:59 +01:00
Philippe Teuwen
0d9223a547 client: fix mix of spaces & tabs 2019-03-09 23:35:06 +01:00
Philippe Teuwen
60f292b18e remove spurious spaces & tabs at end of lines 2019-03-09 08:59:13 +01:00
Philippe Teuwen
4160e32b0a Replace isNoise by computeSignalProperties and removeSignalOffset 2019-03-08 19:06:55 +01:00
Chris
5a34550ac5 CHG: printing 2019-01-07 17:49:09 +01:00
iceman1001
0dee369a58 FIX: 'hf tune' - now works... 2019-01-06 20:28:23 +01:00
Chris
f8c33af1da CHG: FPC connector tests. Device -> Client communications works. 
Adjust  armsrc/Makefile   and client/Makefile  to include  the  -DWITH_FPC  flag to compile with FPC enabled.
 2018-11-20 10:58:32 +01:00
Chris
d30454fc5a fix: fflush(stdout), should sort out the blocking pipe problem 
add:  line length (@merlokk)
 2018-11-02 18:27:42 +01:00
Chris
7d09a466fb FIX: OSX disable app-nap during serial comm (@anticat) 
https://github.com/Proxmark/proxmark3/pull/687
 2018-10-06 13:29:20 +02:00
Chris
9d1c3a3538 FIX: crash on Bionic libc if CloseProxmark is called twice. (@micolous) 
https://github.com/Proxmark/proxmark3/pull/672
 2018-09-15 12:00:53 +02:00
Chris
c4b3edef89 fix: double free bug on MacOS (thanks @drandreas) 2018-09-09 18:03:49 +02:00
Chris
24eaac8681 CHG: the thread comms refactoring from offical pm3 repo 
chg: FPC com speed limited to 115200 when compiled with FPC
chg: USART remake (@drandreas)
 2018-09-06 21:43:20 +02:00