Commit graph

5626 commits

Author SHA1 Message Date
iceman1001 f50566225c styles 2019-04-16 16:02:03 +02:00
iceman1001 eae370fc3d not null? 2019-04-16 15:51:13 +02:00
iceman1001 a6f145bd1a style 2019-04-16 15:47:21 +02:00
iceman1001 d8f756fd14 style 2019-04-16 15:43:53 +02:00
iceman1001 7bc3bea230 style 2019-04-16 15:32:37 +02:00
iceman1001 7b30126371 style 2019-04-16 15:29:18 +02:00
iceman1001 1c4a7709da style 2019-04-16 15:27:25 +02:00
iceman1001 e30dbf3ecd style 2019-04-16 15:22:39 +02:00
iceman1001 87a74e98b8 style 2019-04-16 15:19:53 +02:00
iceman1001 551a9f5fc8 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-04-16 15:11:51 +02:00
iceman1001 75524b72d1 style 2019-04-16 15:10:55 +02:00
iceman1001 144237abfd style 2019-04-16 15:09:57 +02:00
iceman1001 e5928424b6 style 2019-04-16 15:08:51 +02:00
iceman1001 00f3c281bb style 2019-04-16 15:06:14 +02:00
iceman1001 9a5b23428d style 2019-04-16 15:05:01 +02:00
iceman1001 ac7bd3532f style 2019-04-16 15:02:44 +02:00
Oleg Moiseenko 5fedf86808
Merge pull request #161 from merlokk/ci_fix
appveyor fix
2019-04-16 15:44:51 +03:00
merlokk 050be575b2 fix error terminal thread 2019-04-16 15:20:58 +03:00
merlokk 92541ae0e6 small fix 2019-04-16 15:08:07 +03:00
Oleg Moiseenko 6f267c2456
small fix 2019-04-16 14:56:06 +03:00
merlokk 5dd202eeb8 small fix 2019-04-16 14:50:38 +03:00
merlokk 8d7ed5dec1 fix tests output 2019-04-16 14:13:57 +03:00
merlokk 30a1604f2f no message 2019-04-16 14:01:12 +03:00
Oleg Moiseenko 0b35dcbe0c
Merge pull request #158 from merlokk/jabl_fix
Jablotron ID length fix
2019-04-15 18:04:32 +03:00
merlokk 934fb42a95 Jablotron ID length fix 2019-04-15 18:04:12 +03:00
Philippe Teuwen 938d19ef57 proxmark3.sh: better options fwd 2019-04-15 14:02:21 +02:00
Philippe Teuwen 53a4f509d0 proxmark3.sh: pass the options 2019-04-14 23:17:53 +02:00
iceman1001 7912f7494b init array 2019-04-14 19:44:55 +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 e0b7f22db1 Comment debug msg 2019-04-14 18:45:53 +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 85f67006e4 Remove redundant define 2019-04-14 14:35:42 +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 b50fe594da chg: moved include.. 2019-04-14 11:17:59 +02:00
iceman1001 62f1c82fda Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-04-14 11:14:55 +02:00
iceman1001 e9db49be1e chg: 'data rawdemod' - enhanced command params 2019-04-14 11:13:31 +02:00
iceman1001 61a42df4f6 textual 2019-04-14 11:11:42 +02:00
iceman1001 ab6d36fc8c textual 2019-04-14 11:11:08 +02:00
iceman1001 664434dfba Fix: USART calls rx/tx 2019-04-14 11:10:16 +02:00
iceman1001 dd404a67a1 Fix: USART - default speeds is lower (@ryan) 2019-04-14 11:09:31 +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
iceman1001 c78c6e65f5 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-04-14 11:07:44 +02:00
iceman1001 e44fcb52d6 fix: usart needs those pins. (@ryan) 2019-04-14 11:07:35 +02:00
Philippe Teuwen 4763eb417a fix coverity warnings 2019-04-14 11:05:32 +02:00