dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,731 Commits 7 Branches 1 Tag
e9bfc3eb7a59a16f3adbff4c72ce0e939dff74e9
Commit Graph

401 Commits

Author SHA1 Message Date
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
iceman1001
87eee0cf5c text 2019-04-26 13:07:45 +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
Philippe Teuwen
9e39d6ffc3 new light scheme for detectreader 2019-04-26 01:37:17 +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
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
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
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
b0eef756c1 return PM3_SUCCESS on usart_writebuffer_sync, usb_write 2019-04-22 23:03:01 +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
Philippe Teuwen
6e744043f5 usart working... when debugged... 2019-04-21 00:44:19 +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
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
be15ad7fec Viva la revolucion 2019-04-17 21:30:01 +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
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
64c7ee117e revert 2019-04-16 17:00:18 +02:00
iceman1001
aaedeafbb1 style spaces 2019-04-16 16:56:56 +02:00
Philippe Teuwen
34467b7550 Variable length frames, part1: USB Host -> Pm3 2019-04-16 10:01:08 +02:00
Philippe Teuwen
04c0384d3e Testing pm3 communication 2019-04-14 17:25:17 +02:00
iceman1001
d28fac3ef0 style 2019-04-14 11:43:05 +02:00
iceman1001
664434dfba Fix: USART calls rx/tx 2019-04-14 11:10:16 +02:00
iceman1001
1e35130fbe missing include 2019-04-07 11:41:43 +02:00
iceman1001
49a0fda10b styles 2019-04-07 11:36:24 +02:00
Philippe Teuwen
07cc0d0a29 make style helped revealing my bug :) 2019-04-02 22:34: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