Commit graph

226 commits

Author SHA1 Message Date
iceman1001
b91e21edde better output from setting prompt, cursor is still inside ... 2019-05-07 12:29:26 +02:00
Philippe Teuwen
a20392edf3 change offline prompt asap 2019-05-07 12:18:51 +02:00
Philippe Teuwen
de54d35d5f unplug detection 2019-05-07 12:11:36 +02:00
iceman1001
f68a398e42 rename 2019-05-07 11:46:12 +02:00
iceman1001
61d250a7f8 add: 'hw connect' - lets you connect to a specified serial port. If already connected, it disconnects current port before. 2019-05-07 11:05:05 +02:00
Philippe Teuwen
1c70163605 reconnect fast 2019-05-07 01:06:01 +02:00
iceman1001
29a160c905 reconnect version2 yolo 2019-05-06 22:41:00 +02:00
iceman1001
cffd14a96b chg: reconnect to a disconnected proxmark3 device without restarting the client. Old functionality restored :)
chg: renamed thread
chg: easier if-statements for USART
2019-05-06 14:11:23 +02:00
Philippe Teuwen
65bd945b54 style 2019-05-05 22:04:35 +02:00
iceman1001
a49ae2d0ce FIX: slow reconfigure on mingw of serial port 2019-05-03 21:33:00 +02:00
Philippe Teuwen
ca43afa19b begin of dynamic capabilities handling in client 2019-05-01 20:48:15 +02:00
Philippe Teuwen
820a6d99a9 better offline mode 2019-04-30 23:52:40 +02:00
iceman1001
f8f39d6196 fix: passing a struct. 2019-04-30 22:03:20 +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
Philippe Teuwen
69f8d81f4e style 2019-04-28 22:54:00 +02:00
Philippe Teuwen
f1deb865db Merge branch 'master' into experimental_varlen
* master:
  ltrim cmd before display
  hf mf eload: fix absence of filename
  detect wrong numOfBlocks / numOfSectors arguments
  safeFile*: accept when suffix is already provided
  loadFile*: accept when suffix is already provided
  textual,  to reflect which repo.
  LoadEML: don't complain on the last \n
2019-04-28 22:53:12 +02:00
Philippe Teuwen
5bc9118a19 baudrate only for physical uart 2019-04-28 22:51:40 +02:00
Philippe Teuwen
281cdead26 ltrim cmd before display 2019-04-28 22:38:44 +02:00
Philippe Teuwen
fbec3f3125 Merge branch 'master' into experimental_varlen
* master:
  fix segfault
  rework shell scripts for easy client or flasher
  Stop poking Internet when compiling
  doc multiple commands with -c
  Add support for: proxmark3 -c "hw ping;hw version;hw ping"
  update.sh flash boot only if option -b
2019-04-27 16:55:28 +02:00
Philippe Teuwen
8ebc44ee81 fix segfault 2019-04-27 16:52:23 +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
200290bc56 doc multiple commands with -c 2019-04-27 00:33:14 +02:00
Philippe Teuwen
d3cc0bb71c Add support for: proxmark3 -c "hw ping;hw version;hw ping" 2019-04-27 00:31:05 +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
897632a717 rename usb_present 2019-04-26 23:30:03 +02:00
Philippe Teuwen
4a576efc44 TestProxmark only if OpenProxmark returned pm3 present 2019-04-26 23:26:51 +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
70995f0f1e use color macros 2019-04-26 08:29:48 +02:00
Philippe Teuwen
6e744043f5 usart working... when debugged... 2019-04-21 00:44:19 +02:00
Philippe Teuwen
38fc6e2290 errors: cmdmain 2019-04-19 00:42:25 +02:00
iceman1001
436910605b unified Proxmark3 text 2019-04-16 20:00:25 +02:00
iceman1001
8657e17a0b more colors 2019-04-16 17:29:19 +02:00
iceman1001
2639de23c6 rearranged banner output and messages 2019-04-16 17:26:15 +02:00
iceman1001
aaedeafbb1 style spaces 2019-04-16 16:56:56 +02:00
Philippe Teuwen
ba926a91e5 more yellow 2019-04-14 18:38:06 +02:00
Philippe Teuwen
04c0384d3e Testing pm3 communication 2019-04-14 17:25:17 +02:00
Philippe Teuwen
3cba736841 baudrate for usart: use define and limit to 115200 only for WITH_FPC_HOST 2019-04-14 14:42:03 +02:00
Philippe Teuwen
9676d788e0 style 2019-04-14 13:37:53 +02:00
Philippe Teuwen
681c8fd22a main: use proper executable name, especially for mingw 2019-04-14 13:35:52 +02:00
Philippe Teuwen
e708d86306 Rework command line options 2019-04-14 12:54:37 +02:00
iceman1001
d28fac3ef0 style 2019-04-14 11:43:05 +02:00
iceman1001
dd404a67a1 Fix: USART - default speeds is lower (@ryan) 2019-04-14 11:09:31 +02:00
Philippe Teuwen
97676d3210 comparison of integers of different signs [-Wsign-compare] 2019-04-13 23:38:34 +02:00
Philippe Teuwen
5c55664fc5 use more static and fix [-Wmissing-prototypes] 2019-04-13 21:57:13 +02:00
iceman1001
4572acc1eb cleaning out the helptext
mingw got some bad asciiarts
2019-04-13 13:34:02 +02:00
Philippe Teuwen
cbf81cf5c3 remove compilation warning 2019-04-02 22:43:00 +02:00
Philippe Teuwen
64ce30c06c make style 2019-04-02 22:32:45 +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