RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-21 15:56:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
5594 commits 3 branches 14 tags 86 MiB
Commit graph

5594 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 43608589e3 reduce crc size, change magic 2019-04-16 20:06: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 33b4a32dfd removed 2019-04-16 19:06:18 +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 74ece72b26 textual 2019-04-16 17:21:42 +02:00
Oleg Moiseenko c905676851
Merge pull request #162 from merlokk/appve2 
fix fake com port
 2019-04-16 18:06:42 +03:00
iceman1001 e04e2d6fa7 revert 2019-04-16 17:02:21 +02:00
iceman1001 597019b98a revert 2019-04-16 17:01:00 +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
merlokk d3b6cf7209 fix fake com port 2019-04-16 17:49:52 +03:00
iceman1001 d17191d0a4 style 2019-04-16 16:11:46 +02:00
iceman1001 c6aa14efb7 style 2019-04-16 16:07:25 +02:00
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
Philippe Teuwen 34467b7550 Variable length frames, part1: USB Host -> Pm3 2019-04-16 10:01:08 +02: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