Commit graph

571 commits

Author SHA1 Message Date
iceman1001
e30dbf3ecd style 2019-04-16 15:22:39 +02:00
iceman1001
87a74e98b8 style 2019-04-16 15:19:53 +02:00
Philippe Teuwen
e0b7f22db1 Comment debug msg 2019-04-14 18:45:53 +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
85f67006e4 Remove redundant define 2019-04-14 14:35:42 +02:00
iceman1001
d28fac3ef0 style 2019-04-14 11:43:05 +02:00
iceman1001
b50fe594da chg: moved include.. 2019-04-14 11:17:59 +02:00
iceman1001
fc0a62de18 Fix: USART - better RX/TX with one dma bank and wait loops (@ryan) 2019-04-14 11:08:44 +02:00
Philippe Teuwen
97676d3210 comparison of integers of different signs [-Wsign-compare] 2019-04-13 23:38:34 +02:00
Philippe Teuwen
ce606b51fc Handle explicitly enum vals in switch [-Wswitch-enum] 2019-04-13 22:46:08 +02:00
Philippe Teuwen
5c55664fc5 use more static and fix [-Wmissing-prototypes] 2019-04-13 21:57:13 +02:00
iceman1001
4ab2212346 style 2019-04-13 08:50:05 +02:00
Philippe Teuwen
4f32655004 use more static and fix [-Wmissing-prototypes], ongoing... 2019-04-13 00:25:43 +02:00
Philippe Teuwen
35e97ba96a static 2019-04-11 00:10:21 +02:00
Philippe Teuwen
c10e47f8a9 More void, fixing "function declaration is not a prototype" [-Wstrict-prototypes] 2019-04-10 10:35:03 +02:00
osboxes.org
ad52243981 style 2019-04-10 09:36:23 +02:00
iceman1001
39827a6d5d unused 2019-04-09 21:35:06 +02:00
iceman1001
28021ec17b chg: optimizations for ask/bi. 2019-04-09 16:23:55 +02:00
iceman1001
ac88c435f6 remove old iso14443crc.c, fully replaced by crc16.c functions. 2019-04-09 10:12:15 +02:00
iceman1001
daa7313095 unshadow 2019-04-08 08:36:07 +02:00
iceman1001
5ea649e59d style 2019-04-07 15:18:02 +02:00
Philippe Teuwen
a7448f802f make style: don't indent preprocessor directives 2019-04-07 12:10:51 +02:00
iceman1001
c4920d7179 fix crc overshadowing 2019-04-07 12:07:50 +02:00
iceman1001
a78af2bb06 rename crc -> crc_ctx. triggers overshadowing 2019-04-07 11:51:12 +02:00
iceman1001
ff74d56741 remove unused 2019-04-07 10:58:50 +02:00
Philippe Teuwen
51d6fa13eb arg names 2019-04-06 21:46:00 +02:00
Philippe Teuwen
41f36ca20b make style 2019-04-06 19:09:01 +02:00
Philippe Teuwen
b666c27f3c
Merge branch 'master' into hf_mf_sim 2019-04-06 01:22:15 +02:00
Philippe Teuwen
26eb54b965 style 2019-04-06 01:00:54 +02:00
vratiskol
2278d3372e Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-04-06 00:33:10 +02:00
Philippe Teuwen
682f23440d style 2019-04-06 00:23:01 +02:00
Philippe Teuwen
38f6fd037f style 2019-04-06 00:14:07 +02:00
Philippe Teuwen
404e92a0b1 utf8 Chinese... we might just translate it appropriately... 2019-04-05 22:37:41 +02:00
iceman1001
8c017157d4 chg: better strong wave detection for biphase 2019-04-05 20:28:58 +02:00
vratiskol
0578e19fba Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-04-05 03:48:25 +02:00
iceman1001
287a9dd204 chg: 'data raw nr' - cleanup 2019-04-04 23:42:02 +02:00
iceman1001
463661869a clean uo 2019-04-04 23:32:47 +02:00
iceman1001
2fa31d33fc style 2019-04-04 07:23:18 +02:00
Eloff
19cf50a6ff Mifare Ultralight/NTAG simulation. Add WRITE and COMPATIBLE_WRITE support 2019-04-03 22:26:18 +03:00
vratiskol
1c77185fb9 Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-04-03 01:48:46 +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
dae6eefa52 FPC experiments: use oversampling, tested FPC at 460800 ^^ 2019-04-02 01:20:02 +02:00
Philippe Teuwen
7bd95dd5c3 FPC experiments: got so far TX_only, usart=115200 + usb=460800, see full commit msg
* Add \r\n to sent strings
* remove usart_init() from UsbPacketReceive cmd, it's already init in main.
* Add PLATFORM PM3RDV4FPC to ease dev
* TX: US_TCR is len of data to send, not len of buffer
* Use only one PDC bank as we're using it in sync
* Busy loop to wait for end of TX as we'using it in sync
* Change usart speed to 115200
* Don't downgrade USB speed, keep 460800
* Attempt to detect received data, fail so far
2019-04-02 01:06:03 +02:00
Philippe Teuwen
db4aa08b78 make style 2019-03-28 14:19:41 +01:00
vratiskol
60ac8b8934 Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-26 10:08:49 +01:00
iceman1001
52be3f4fe5 chg: 'lf indala clone' - differnt input parms. '-L' gives a long UID.
chg: 'lf indala demod' - tries to descramble parts,  and detection is changed.  Still issues with PSK2..
2019-03-26 09:09:43 +01:00
vratiskol
04c14d1931 Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-25 15:51:21 +01:00
iceman1001
8ce361202c style - unused 2019-03-25 15:03:22 +01:00
iceman1001
962e58b475 style 2019-03-25 14:59:01 +01:00