RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-20 23:36:31 +08:00
Code Issues Packages Projects Releases Wiki Activity
5736 commits 3 branches 14 tags 85 MiB
Commit graph

5736 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
iceman1001 5f831ee776 chg: 'hw detectreader' - clean up 2019-04-27 11:09:20 +02:00
iceman1001 238eda8b17 chg: 'hw detectreader' cleanup 2019-04-27 11:07:59 +02:00
Philippe Teuwen e2e0b704c5 Several changes in the initial connection, see details: 
* TestProxmark uses pingng
* New command CMD_CAPABILITIES to transmit capabilities from pm3 to host
* Use TestProxmark to retrieve capabilities with that new command
* CloseProxmark if TestProxmark fails
* Hide baudrate for USB and retrieve real baudrate from pm3 for BT
 2019-04-27 02:46:20 +02:00
Philippe Teuwen 7d1161d7d8 First packet is in TestProxmark, not pm3_version 2019-04-27 01:16:43 +02:00
Philippe Teuwen 12937884f6 move uart_speed to conn struct and display baudrate only for real UART 2019-04-27 01:15:52 +02:00
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
Philippe Teuwen 897632a717 rename usb_present 2019-04-26 23:30:03 +02:00
Philippe Teuwen 4a576efc44 TestProxmark only if OpenProxmark returned pm3 present 2019-04-26 23:26:51 +02:00
Philippe Teuwen 3b6a249646 move global connection flags to cnn struct 2019-04-26 23:16:24 +02:00
Philippe Teuwen a1bb2ec106 Trying original SPI mode for 24MHz flash mem 2019-04-26 22:17:26 +02:00
Philippe Teuwen 01b31c742b Use block_after_ACK in flashmem too 2019-04-26 13:53:11 +02:00
iceman1001 87eee0cf5c text 2019-04-26 13:07:45 +02:00
Philippe Teuwen b12be75a5b Remove block_after_ACK mechanism on NG frames, flashing uses OLD and NG won't use ACK anymore 2019-04-26 12:02:34 +02:00
Philippe Teuwen a14b3d8b87 Merge branch 'master' into experimental_varlen 
* master:
  missing bracket
  text
  CHG: remove WITH_EMV since its not used at all.
 2019-04-26 10:54:12 +02:00
iceman1001 4ad9f57939 missing bracket 2019-04-26 10:49:30 +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
iceman1001 4494c3dc61 text 2019-04-26 10:46:00 +02:00
iceman1001 cf7e7d3447 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-04-26 10:36:26 +02:00
Philippe Teuwen cb452c98ba rework Dbprintf & add color support 2019-04-26 10:36:06 +02:00
iceman1001 88744650db Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-04-26 08:56:16 +02:00
Philippe Teuwen 70995f0f1e use color macros 2019-04-26 08:29:48 +02:00
Philippe Teuwen acc101ed37 doc magic 2019-04-26 08:29:21 +02:00
Philippe Teuwen 9e39d6ffc3 new light scheme for detectreader 2019-04-26 01:37:17 +02:00
iceman1001 de05d6e4d2 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-04-26 00:30:36 +02:00
Philippe Teuwen 7d6f971db4 archive and fix hid-flasher 2019-04-26 00:11:45 +02:00
Philippe Teuwen 9a6ad6597f update standalone readme 2019-04-25 23:40:51 +02:00
Philippe Teuwen c22da12502 Merge branch 'master' into experimental_varlen 
* master:
  Update readme.md
  Update readme.md
  Update readme.md
  remove redundant def
 2019-04-25 23:33:52 +02:00
Iceman 839a0ef9fb
Update readme.md 2019-04-25 23:23:44 +02:00
Iceman 1e797e1720
Update readme.md 2019-04-25 23:20:54 +02:00
Iceman f90b04d4cf
Update readme.md 2019-04-25 23:20:33 +02:00
Philippe Teuwen 3e641e217d remove redundant def 2019-04-25 23:09:06 +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
iceman1001 9102c37292 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-04-25 22:51:30 +02:00
iceman1001 5c49fcbfdb CHG: remove WITH_EMV since its not used at all. 2019-04-25 22:51:01 +02:00
Philippe Teuwen 423e6bfb32 adjust standalone doc 2019-04-25 22:43:08 +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 505506c5dd textual 2019-04-25 21:50:55 +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
Philippe Teuwen e7e07d9096 Merge branch 'master' into experimental_varlen 
* master:
  fix:  spellingmistake
  REM: removed unused define
 2019-04-25 21:26:51 +02:00
iceman1001 a59f7a50ce fix: spellingmistake 2019-04-25 21:21:53 +02:00
iceman1001 d913cacdca Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-04-25 21:16:39 +02:00
iceman1001 176645b9fc REM: removed unused define 2019-04-25 21:16:11 +02:00
Philippe Teuwen 0fc79824dd Merge branch 'master' into experimental_varlen 
* master:
  remove redundant def
  chg:  forgot to readd hitag support :)
  Guard Hitag code
 2019-04-25 20:59:27 +02:00
Philippe Teuwen 27e94f5669 remove redundant def 2019-04-25 20:59:11 +02:00
iceman1001 c84cf10d86 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-04-25 20:52:24 +02:00
iceman1001 a6278ff8cd chg: forgot to readd hitag support :) 2019-04-25 20:51:20 +02:00
Philippe Teuwen a844afc273 Guard Hitag code 2019-04-25 20:42:41 +02:00
Philippe Teuwen eababdd3ef Merge branch 'master' into experimental_varlen 
* master:
  chg: 'hf mf sim' - textual
  fix:  warning on mingw64.   This offset is calculated, casting it to u32 should be fine.
  fix: https://github.com/RfidResearchGroup/proxmark3/issues/174 remove all offending code,  return 1.   Will only impact the speed of hardnested execution.
  fix again OSX
  fix https://github.com/RfidResearchGroup/proxmark3/issues/173
  used predefined constants, common types moved to common header files
  backward compatibility, on load converter for old mfu dump format
  loops for counters output
  UL/NTAG new dump file format. Added counters support, simulation
 2019-04-25 20:05:04 +02:00