Commit Graph

3620 Commits

Author SHA1 Message Date
Philippe Teuwen
7331b7d6d2 Merge branch 'master' into experimental_varlen
* master:
  Add ref to new mifaresim.h in standalone modes
  fix: Standalone/hf_colin now compiles
  Update readme.md
  chg: hitag compile flag optional
  fix: standalonemode matty_run now compiles
  typo
  smallfix
  chg: fpga lf simulation
  chg: 'fpga lf sim' - 25% both on sides.
2019-04-19 23:17:36 +02:00
Philippe Teuwen
c4766b2649 Semi-Automated SendCommand -> SendCommandOLD 2019-04-19 23:01:13 +02:00
Philippe Teuwen
128d90ca3c SendCommandOLD: hid-flasher 2019-04-19 02:10:52 +02:00
Philippe Teuwen
b68ccfa7b8 SendCommandOLD : comms & flash 2019-04-19 02:01:47 +02:00
Philippe Teuwen
2ac5482d9c SendCommandOLD & errors retval: mifarehost 2019-04-19 01:45:45 +02:00
Philippe Teuwen
45afe8dec0 errors retval for cmdemv 2019-04-19 01:14:58 +02:00
Philippe Teuwen
a6f52e839f fix bug 2019-04-19 01:14:04 +02:00
Philippe Teuwen
1b6a45ac17 propagate CmdsParse return value 2019-04-19 00:47:51 +02:00
Philippe Teuwen
38fc6e2290 errors: cmdmain 2019-04-19 00:42:25 +02:00
Philippe Teuwen
dcfee8963b SendCommandOLD & errors: cmdflashmem 2019-04-18 23:26:12 +02:00
Philippe Teuwen
7dbd12ad27 SendCommandOLD: cmdhw 2019-04-18 22:42:15 +02:00
Philippe Teuwen
9bd59a8d40 Add SendCommandOLD 2019-04-18 22:19:28 +02:00
Philippe Teuwen
b860cc6eaf Rename MAGIC defines 2019-04-18 21:49:37 +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
Philippe Teuwen
482db05741 Rename few stuff for consistency 2019-04-18 12:49:51 +02:00
Philippe Teuwen
0e855f647a typo 2019-04-18 10:45:24 +02:00
Oleg Moiseenko
1d60cf3bd6 Merge pull request #169 from merlokk/sf
smallfix
2019-04-18 11:26:21 +03:00
merlokk
8bf8f1735e smallfix 2019-04-18 11:25:57 +03: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
7cbcf8163c Merge branch 'master' into experimental_varlen
* master: (27 commits)
  textual
  style redundant assignment
  timeout fix
  small fix
  add termcap
  add readline and small fix
  rdp
  textual
  null term?
  fix: https://github.com/RfidResearchGroup/proxmark3/issues/166
  add dlls to release
  style
  style
  test fix
  test fixes
  another fix
  fix memleak
  fix
  textual
  use printandlogex
  ...
2019-04-17 22:06:39 +02:00
Philippe Teuwen
be15ad7fec Viva la revolucion 2019-04-17 21:30:01 +02:00
iceman1001
587d826f84 textual 2019-04-17 20:36:10 +02:00
iceman1001
2783ba7583 style redundant assignment 2019-04-17 19:48:29 +02:00
iceman1001
b574db169e textual 2019-04-17 16:56:52 +02:00
iceman1001
853d2e14e6 null term? 2019-04-17 16:53:28 +02:00
iceman1001
ec7ab1a4ed fix: https://github.com/RfidResearchGroup/proxmark3/issues/166 2019-04-17 16:52:58 +02:00
iceman1001
3207aaea67 style 2019-04-17 14:57:21 +02:00
iceman1001
1ee3679a98 style 2019-04-17 14:54:42 +02:00
iceman1001
da2aa2c55f test fix 2019-04-17 14:50:07 +02:00
iceman1001
524346901a test fixes 2019-04-17 14:48:32 +02:00
iceman1001
e0bd6b2019 another fix 2019-04-17 14:39:47 +02:00
iceman1001
2044fd4130 fix memleak 2019-04-17 14:35:22 +02:00
iceman1001
f5b7371d7c fix 2019-04-17 14:33:09 +02:00
iceman1001
72f6ba712a textual 2019-04-17 14:01:05 +02:00
iceman1001
bc0e9687d7 use printandlogex 2019-04-17 13:45:55 +02:00
iceman1001
6930ca5785 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-04-17 12:01:33 +02:00
iceman1001
01b83482a7 use printandlogex 2019-04-17 11:58:44 +02:00
iceman1001
53b48ae6a9 use printandlogex 2019-04-17 11:55:52 +02:00
iceman1001
3fdac2577f use printandlogex 2019-04-17 11:54:40 +02:00
iceman1001
d89a5d0a5e use printandlongex 2019-04-17 11:48:17 +02:00
iceman1001
002e6b23fe Use printandlogex 2019-04-17 11:47:32 +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
4eaa2fc5aa move common util fcts to /common to avoid common files (e.g. crc) to depend on non-common files 2019-04-16 23:02:40 +02:00
Eloff
63f9f11066 'hf mf sim' bugs fix, RATS support, etc 2019-04-16 23:52:05 +03: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