Commit Graph

  • 176645b9fc REM: removed unused define iceman1001 2019-04-25 21:16:11 +02:00
  • 0fc79824dd Merge branch 'master' into experimental_varlen Philippe Teuwen 2019-04-25 20:59:27 +02:00
  • 27e94f5669 remove redundant def Philippe Teuwen 2019-04-25 20:59:11 +02:00
  • c84cf10d86 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 iceman1001 2019-04-25 20:52:24 +02:00
  • a6278ff8cd chg: forgot to readd hitag support :) iceman1001 2019-04-25 20:51:20 +02:00
  • a844afc273 Guard Hitag code Philippe Teuwen 2019-04-25 20:42:41 +02:00
  • eababdd3ef Merge branch 'master' into experimental_varlen Philippe Teuwen 2019-04-25 20:05:04 +02:00
  • 6e8f7a7e30 more doc on bootrom Philippe Teuwen 2019-04-25 19:56:13 +02:00
  • 5c9c4637d8 doc uart timings Philippe Teuwen 2019-04-25 19:55:37 +02:00
  • b173f73c81 style iceman1001 2019-04-25 17:11:40 +02:00
  • df96b58fcc style iceman1001 2019-04-25 17:06:40 +02:00
  • 278ec017fe chg: increased client side timeout. Accoring to test with rdv4 addon ( @doegox ) iceman1001 2019-04-25 17:04:51 +02:00
  • ef95d8c742 chg: 'hf mf sim' - textual iceman1001 2019-04-25 16:57:18 +02:00
  • 5cc3a1b717 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 iceman1001 2019-04-25 16:55:48 +02:00
  • 3bfd01bffb fix: warning on mingw64. This offset is calculated, casting it to u32 should be fine. iceman1001 2019-04-25 16:55:00 +02:00
  • f227041932
    Merge pull request #172 from McEloff/hfmfu Iceman 2019-04-25 16:10:03 +02:00
  • fe35a972f5 fix: https://github.com/RfidResearchGroup/proxmark3/issues/174 remove all offending code, return 1. Will only impact the speed of hardnested execution. iceman1001 2019-04-25 16:08:08 +02:00
  • 90463cb79f fix again OSX iceman1001 2019-04-25 09:49:47 +02:00
  • 980ad29d22 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 iceman1001 2019-04-25 08:29:42 +02:00
  • ce8d5c66ab fix https://github.com/RfidResearchGroup/proxmark3/issues/173 iceman1001 2019-04-25 08:29:15 +02:00
  • 4141003b09 Merge branch 'master' into experimental_varlen Philippe Teuwen 2019-04-25 02:01:31 +02:00
  • 42a03fc9f1 Add openocd config files for JLink Philippe Teuwen 2019-04-25 02:00:23 +02:00
  • 9fca642e10 Add makefile dependencies for recovery: need bootrom & os Philippe Teuwen 2019-04-25 01:59:30 +02:00
  • 7d2d23ce50 fix bootrom using new names (but still old packets) Philippe Teuwen 2019-04-25 01:53:00 +02:00
  • 4b5800d78f remove name Philippe Teuwen 2019-04-24 15:57:24 +02:00
  • 517bf7e238 Merge branch 'master' into experimental_varlen Philippe Teuwen 2019-04-24 15:05:09 +02:00
  • 1b246cd380 Force no-ms-bitfields to ensure proper struc packing on Windows Philippe Teuwen 2019-04-24 15:04:43 +02:00
  • 79d7fb65b5 Merge branch 'master' into experimental_varlen Philippe Teuwen 2019-04-24 00:59:57 +02:00
  • 25048ccf2f Fix segfault when loading a file Philippe Teuwen 2019-04-24 00:53:25 +02:00
  • e453aff88c First adjustments for FPC BT link Philippe Teuwen 2019-04-23 23:36:36 +02:00
  • 66ee8dc09e used predefined constants, common types moved to common header files Eloff 2019-04-23 21:14:20 +03:00
  • a8c1fa7a3b backward compatibility, on load converter for old mfu dump format Eloff 2019-04-23 17:07:20 +03:00
  • dda63f9556 usart_fill_rxfifo: fetch no more than available room in FIFO Philippe Teuwen 2019-04-23 00:25:14 +02:00
  • 268ca8294e flash read tested over usart Philippe Teuwen 2019-04-22 23:17:34 +02:00
  • b0eef756c1 return PM3_SUCCESS on usart_writebuffer_sync, usb_write Philippe Teuwen 2019-04-22 22:58:45 +02:00
  • 8793a9e596 Merge commit 'e171010d' into hfmfu Eloff 2019-04-22 23:26:20 +03:00
  • 4161779083 loops for counters output Eloff 2019-04-22 23:20:35 +03:00
  • 127f5ed192 Revert c7a4d7af, remove redundant include Philippe Teuwen 2019-04-22 22:11:57 +02:00
  • 9602e641e2 Merge branch 'master' into experimental_varlen Philippe Teuwen 2019-04-22 21:39:38 +02:00
  • 04536a3564 translation iceman1001 2019-04-22 19:31:22 +02:00
  • 3bd145652b document offsets iceman1001 2019-04-22 19:29:45 +02:00
  • 458ce75073 textual iceman1001 2019-04-22 19:21:55 +02:00
  • 166da51360 textual iceman1001 2019-04-22 19:21:07 +02:00
  • e171010d32
    Merge pull request #170 from McEloff/temp Iceman 2019-04-22 19:14:34 +02:00
  • d6892136ac Add communication_delay also to dl_it timeout Philippe Teuwen 2019-04-22 02:44:06 +02:00
  • f29facd15a Harmonize usb_write & usart_writebuffer_sync return values Philippe Teuwen 2019-04-22 02:28:58 +02:00
  • 3e402797c1 dl_it uses also global start_time reset by packets reception as this can take ages (50s at 9600 baud for LF samples) Philippe Teuwen 2019-04-22 02:11:46 +02:00
  • a9bb465271 reply_xx return val is int16_t, not bool Philippe Teuwen 2019-04-22 02:10:31 +02:00
  • c4e16ebb9b update new frames doc Philippe Teuwen 2019-04-22 01:36:58 +02:00
  • 4d0875442f uart_posix rx timeouts Philippe Teuwen 2019-04-22 01:33:39 +02:00
  • eebea8c088 DbpStringEx using reply_ng Philippe Teuwen 2019-04-22 01:33:32 +02:00
  • cf68c972f0 forgot usart.h Philippe Teuwen 2019-04-22 00:30:39 +02:00
  • cdd4177968 usart_writebuffer_sync simplified as we're always sending in blocking mode anyway Philippe Teuwen 2019-04-22 00:30:01 +02:00
  • 81780e5c98 DbpStringEx using now reply_mix. hw status at 9600: from 26.5s to 7s Philippe Teuwen 2019-04-21 23:58:53 +02:00
  • 913c03d3c4 Reset WaitForResponse timeout every time we get a packet as cmds sending a lot of Dbprintf msgs can take ages on slow links e.g. "hw status" on 9600 baud link takes 26.5s with "reply_old" Dbprintf Philippe Teuwen 2019-04-21 23:56:04 +02:00
  • 75ee60f267 WaitForResponseTimeoutW: fix, no communication_delay when timeout=-1 Philippe Teuwen 2019-04-21 23:26:51 +02:00
  • a2e55be468 new format doc Philippe Teuwen 2019-04-21 17:34:56 +02:00
  • 3dd1f1c78c make style (hmm not perfect, we'll have to live with it I guess) Philippe Teuwen 2019-04-21 14:10:31 +02:00
  • f8de50f5c9 document usart RX FIFO Philippe Teuwen 2019-04-21 13:19:35 +02:00
  • 06cb40afbd doc timings Philippe Teuwen 2019-04-21 12:11:44 +02:00
  • ba0c2d7592 doc timings Philippe Teuwen 2019-04-21 12:11:25 +02:00
  • e0cd5850f9 usart: clean, doc, now uart_posix 60ms Philippe Teuwen 2019-04-21 12:02:30 +02:00
  • db3103b531 UL/NTAG new dump file format. Added counters support, simulation Eloff 2019-04-21 03:18:00 +03:00
  • 59963eb41e doc timeouts Philippe Teuwen 2019-04-21 01:44:52 +02:00
  • a77ea12b77 client uart: increase rx timeout Philippe Teuwen 2019-04-21 01:38:24 +02:00
  • 4aa1b49493 fix uart_posix: bytecound must be 32b Philippe Teuwen 2019-04-21 01:05:02 +02:00
  • 6e744043f5 usart working... when debugged... Philippe Teuwen 2019-04-20 19:17:32 +02:00
  • 7ca1e98776 Protect SetAdcMuxFor with FPC Philippe Teuwen 2019-04-20 11:17:09 +02:00
  • e4006a7563 doc errors Philippe Teuwen 2019-04-20 10:34:54 +02:00
  • c7ada019bf update new frames doc with MIX frames Philippe Teuwen 2019-04-20 03:29:44 +02:00
  • a7773b3395 Introduce reply_mix, to still get some varlen on old API Philippe Teuwen 2019-04-20 03:17:19 +02:00
  • 3bcf80bb34 Introduce SendCommandMIX, to still get some varlen on old API Philippe Teuwen 2019-04-20 02:41:40 +02:00
  • 95822d8360 minor Philippe Teuwen 2019-04-20 01:49:37 +02:00
  • a45238236d armsrc: put new frame parsing in common for usart (still usart_read_ng to do) Philippe Teuwen 2019-04-20 01:47:50 +02:00
  • 238fc10c9a style Philippe Teuwen 2019-04-20 01:08:07 +02:00
  • f500b452d9 document new frame format Philippe Teuwen 2019-04-20 00:33:31 +02:00
  • 7331b7d6d2 Merge branch 'master' into experimental_varlen Philippe Teuwen 2019-04-19 23:17:36 +02:00
  • c7a4d7af3a Add ref to new mifaresim.h in standalone modes Philippe Teuwen 2019-04-19 23:15:02 +02:00
  • c4766b2649 Semi-Automated SendCommand -> SendCommandOLD Philippe Teuwen 2019-04-19 17:03:39 +02:00
  • a82fd7da34 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 iceman1001 2019-04-19 10:00:09 +02:00
  • b495f4bc44 fix: Standalone/hf_colin now compiles iceman1001 2019-04-19 09:59:34 +02:00
  • 05674dc559
    Update readme.md Iceman 2019-04-19 09:29:50 +02:00
  • 03a1b6fac0 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 iceman1001 2019-04-19 09:23:59 +02:00
  • b29b07c8ad chg: hitag compile flag optional iceman1001 2019-04-19 09:23:24 +02:00
  • 9c776c8935 fix: standalonemode matty_run now compiles iceman1001 2019-04-19 09:23:02 +02:00
  • 52d1b7341f typo Eloff 2019-04-19 09:39:11 +03:00
  • 128d90ca3c SendCommandOLD: hid-flasher Philippe Teuwen 2019-04-19 02:10:52 +02:00
  • b68ccfa7b8 SendCommandOLD : comms & flash Philippe Teuwen 2019-04-19 02:01:47 +02:00
  • 2ac5482d9c SendCommandOLD & errors retval: mifarehost Philippe Teuwen 2019-04-19 01:45:45 +02:00
  • 45afe8dec0 errors retval for cmdemv Philippe Teuwen 2019-04-19 01:14:58 +02:00
  • 9b4896225c SendCommandOLD for hf_young Philippe Teuwen 2019-04-19 01:14:33 +02:00
  • a6f52e839f fix bug Philippe Teuwen 2019-04-19 01:14:04 +02:00
  • 1b6a45ac17 propagate CmdsParse return value Philippe Teuwen 2019-04-19 00:47:51 +02:00
  • 38fc6e2290 errors: cmdmain Philippe Teuwen 2019-04-19 00:42:25 +02:00
  • dcfee8963b SendCommandOLD & errors: cmdflashmem Philippe Teuwen 2019-04-18 23:26:12 +02:00
  • 7dbd12ad27 SendCommandOLD: cmdhw Philippe Teuwen 2019-04-18 22:42:15 +02:00
  • 9bd59a8d40 Add SendCommandOLD Philippe Teuwen 2019-04-18 22:19:28 +02:00
  • b860cc6eaf Rename MAGIC defines Philippe Teuwen 2019-04-18 21:49:32 +02:00
  • 8c89b35f1e style Philippe Teuwen 2019-04-18 21:41:48 +02:00
  • 9ff841efb2 CRC optional, replaced by magic on USB Philippe Teuwen 2019-04-18 21:39:35 +02:00