Commit graph

407 commits

Author SHA1 Message Date
Philippe Teuwen 6385ee960f searchFile for firmwares 2019-09-09 19:55:27 +02:00
Iceman 01950bd962 chg more ansi color 2019-09-05 15:46:40 +02:00
Philippe Teuwen 43055ae6a7 searchFile for cmdscripts 2019-09-04 23:29:03 +02:00
Philippe Teuwen 4d31b2399b reintroduce PREFIX and use relative paths for finding share/ when installed, independently of PREFIX 2019-08-30 21:36:10 +02:00
Philippe Teuwen 2022df1068 make style 2019-08-30 10:45:52 +02:00
Philippe Teuwen 08a5de1f0e searchFile traces 2019-08-30 08:32:34 +02:00
Philippe Teuwen ca8aee33ea move iclass_dump.bin in resources/ 2019-08-30 01:23:10 +02:00
iceman1001 94f6a402e8 chg. prep for eload.. 2019-08-28 21:12:18 +02:00
Philippe Teuwen 8c26e07ceb use searchFile to find dictionaries 2019-08-23 22:08:36 +02:00
Philippe Teuwen 34a0fdb9d6 reorganize lua script dir defs 2019-08-23 22:07:45 +02:00
Philippe Teuwen c709ee7c10 rework PREFIX for future make install 2019-08-23 20:55:50 +02:00
Philippe Teuwen 595b8a1885 introduce PREFIX for pm3 system directory and move to common.h 2019-08-22 19:36:20 +02:00
Iceman c69d599a3f
Update protocols.h
From https://github.com/Proxmark/proxmark3/pull/855  (@pwpiwi)
2019-08-21 14:49:55 +02:00
Philippe Teuwen fdcc885aa9 Use /dev/tty on OSX rather than /dev/cu
See https://stackoverflow.com/questions/8632586/macos-whats-the-difference-between-dev-tty-and-dev-cu/8632603
2019-08-20 23:21:22 +02:00
Philippe Teuwen 847b6bcc33 remove tabs 2019-08-13 17:51:11 +02:00
cjbrigato 961f98c125 SPIFFS : FIXES FS corruption against high numbero f current losses, high number of files manipulation. FIXES LOG_BLOCK erasing handlers. FIXES Garbage Collector. Overall, SPIFFS should now be WAY MORE resilient to any form of misbehavior. In case of corrupted filesystem (should still be readable !), spamming 'mem spiffs check' from the client will ensure at least 2 new free 4k blocks each tile (if number of LOG_PAGE available is enough) and in the same pass will move/reorganize the LOG_PAGES of contextual blocks. Yiha 2019-08-13 17:39:48 +02:00
Philippe Teuwen d19754567d summer restructuring:
* .h include only the strict minimum for their own parsing
  * this forces all files to include explicitment their needs and not count on far streched dependencies
  * this helps Makefile to rebuild only the minimum
  * according to this rule, most standalone .h are now gone
  * big app.h is gone
  * remove seldom __cplusplus, if c++ happens, everything will have to be done properly anyway
* all unrequired include were removed
* split common/ into common/ (client+arm) and common_arm/ (os+bootloader)
  * bring zlib to common/
  * bring stuff not really/not yet used in common back to armsrc/ or client/
  * bring liblua into client/
  * bring uart into client/
  * move some portions of code around (dbprint, protocols,...)
* rename unused files into *_disabled.[ch] to make it explicit
* rename soft Uarts between 14a, 14b and iclass, so a standalone could use several without clash
* remove PrintAndLogDevice
* move deprecated-hid-flasher from client to tools
* Makefiles
  * treat deps in armsrc/ as in client/
  * client: stop on warning (-Werror), same as for armsrc/

Tested on:

* all standalone modes
* Linux
2019-08-11 21:42:01 +02:00
Philippe Teuwen d84a316b4c fix MCK, maths... facepalm 2019-08-07 14:55:29 +02:00
Philippe Teuwen bc28eb04e4 Revert 00350db and add waiting time extension request mechanism, see issue #265 2019-08-07 13:04:34 +02:00
Philippe Teuwen 12a0540d91 mf sim: add option to pass explicitly atqa/sak and reject explicitly unknown vals for option t 2019-08-07 01:32:37 +02:00
Philippe Teuwen 8b3159c83d Use more defines when using main clock or master clock 2019-08-06 13:40:08 +02:00
iceman1001 a90e5e1858 chg: legic cmds uses return macros.
chg: hf search started to use macros
2019-08-03 23:36:55 +02:00
Philippe Teuwen 60bfc37f35 remove more dummy cmds 2019-08-03 22:52:32 +02:00
Philippe Teuwen 25f358955b make hf search robust to various HF configurations 2019-08-03 22:14:12 +02:00
Philippe Teuwen 4a3fb3ccf1 split nfcbarcode from iso14443a 2019-08-03 22:14:12 +02:00
Philippe Teuwen a0a232a985 rename few CMD_* to get some less diversity 2019-08-03 19:48:02 +02:00
Philippe Teuwen cbf5c717f7 Remove unused CMD_* 2019-08-03 19:48:02 +02:00
Philippe Teuwen 865a7c3ad4 Add thinfilm simulation 2019-08-02 00:26:07 +02:00
iceman1001 fbff51c88d Add: hf thinfilm info - support to read and decode Kovio Thinfilm NCT tags 2019-08-01 09:39:33 -04:00
iceman1001 74288ad128 chg: hf topaz - got some love 2019-07-31 15:43:00 -04:00
Philippe Teuwen c6b8e199fd fix usart cmd descriptions 2019-07-28 21:08:50 +02:00
iceman1001 283060f962 chg: renaming a struct 2019-07-27 21:15:43 +02:00
mwalker33 b222161941
Merge branch 'master' into master 2019-07-25 20:12:00 +10:00
mwalker33 77d96ff3b7 Bug Fix Timing order
Timing for backward compatibility
2019-07-25 20:01:03 +10:00
Philippe Teuwen c0eb19acb1 remove tabs 2019-07-24 00:52:24 +02:00
Philippe Teuwen ac233a346a make style 2019-07-23 23:43:30 +02:00
Philippe Teuwen 11e5131604
Merge pull request #284 from mwalker33/master
T55x7 Downlink mode support added
2019-07-23 22:42:47 +02:00
Philippe Teuwen 9beabaabf5 make style 2019-07-23 21:33:52 +02:00
mwalker33 5de04f84e9 Restored * 8
Revert back to store and use the full value (*8) for the timing.
2019-07-23 20:12:05 +10:00
mwalker33 4e0e69ed63 Added T55 downlink mode support 2019-07-23 09:50:28 +10:00
cjbrigato 5c3676ad81 ADD: Early SPIFFS implementation see #257, UPDATE HF_COLIN accordingly 2019-07-22 22:56:06 +02:00
Philippe Teuwen daae890667 Bootrom & flasher changes:
* use macros for versions
* activate UNDERSTANDS_VERSION in bootrom
* fix missing break; bug in bootrom
* force flash_load to reject images > 256k if bootloader not up to date
* move logic from flasher to flash
2019-07-20 10:48:40 +02:00
slurdge 68aa9d631d Flasher support for versionning
Only bootrom with version > 1.0.0 will allow 512K writes
2019-07-20 10:47:24 +02:00
slurdge c056e56492 Add a version command to the bootloader (not activated yet) 2019-07-20 10:47:24 +02:00
merlokk bd8824a2f3 make style 2019-07-16 16:10:11 +03:00
Philippe Teuwen ed4289d462
Merge pull request #251 from merlokk/reorg_includes
added PACKED attribute for structures and reorganize include folder
2019-07-16 14:52:14 +02:00
merlokk 20d13d5509 added PACKED attribute for structures and reorganize include folder 2019-07-16 14:50:38 +03:00
Philippe Teuwen d8763509de Add 'hw standalone' to jump to standalone mode from command line or script 2019-07-15 22:31:19 +02:00
Philippe Teuwen 0ea7fa7784 buggy 'mem read' removed, 'mem save' renamed 'mem dump', can now display too 2019-07-15 12:57:20 +02:00
Philippe Teuwen 99d2ed224a Minor changes on bootloader chip info 2019-07-10 21:49:14 +02:00
slurdge 4727ab96d7 Dynamic report of the chipID for flashing purposes 2019-07-10 21:11:20 +02:00
Victor cb45313981 Add hitag2 write password auth 2019-07-09 23:00:57 +01:00
Philippe Teuwen a55e597e36 make style 2019-06-07 21:40:33 +02:00
iceman1001 0288b452d4 comment 2019-06-06 14:57:38 +02:00
Philippe Teuwen 1a39ec3026 hf mf/mfu dbg => hw dbg 2019-06-06 11:31:47 +02:00
Philippe Teuwen 4761ea13f7 MF_DBGLEVEL => DBGLEVEL (pm3 side) 2019-06-06 10:05:09 +02:00
Philippe Teuwen d7614684f8 Make sure standalone modes can be launched when connected on USB without client 2019-06-02 23:20:02 +02:00
Philippe Teuwen 77dea32120 text 2019-05-31 23:18:17 +02:00
Philippe Teuwen 0898c0c9d1 Fix FLASH_MEM_MAX_SIZE 2019-05-31 23:17:30 +02:00
iceman1001 cee2fc7a34 hf mf rdbl - uses NG 2019-05-28 13:20:56 -04:00
iceman1001 58bed70ad0 chg: hf 14a sim - uses NG 2019-05-26 15:00:49 -04:00
Philippe Teuwen 51e4df533e New button behaviour in bootloader mode:
- Keep button pressed when powering to force entering bootloader
  - Once in bootloader more, you can release the button
- When in bootloader mode (no matter how you entered that mode)
  - One button press to quit bootloader mode and boot main image
2019-05-26 17:48:30 +02:00
iceman1001 0d1438d156 chg: lf psksim - uses NG 2019-05-24 09:11:30 -04:00
iceman1001 e727fe5818 chf: lf asksim - uses NG 2019-05-24 07:06:08 -04:00
iceman1001 d32c4d5267 chg: resized flashmem offset for dictionaries to fit 2019-05-23 18:50:24 -04:00
iceman1001 c13e2f09a1 chg: lf simfsk\nlf paradox sim\nlf awid sim\n\lf ioprox sim\nlf pyramid sim - NG 2019-05-23 17:07:12 -04:00
iceman1001 9b85f80321 chg: the reconnect now works good on ubuntu and mingw (for me :))
chg: increased timeout for FPC from 170 -> 200.  Mingw seems slower.
2019-05-16 08:02:56 +02:00
Philippe Teuwen 8401eb4e14 Add usart btfactory 2019-05-15 02:15:19 +02:00
Philippe Teuwen 42d025d01a Slight rework of hw tune 2019-05-14 08:29:24 +02:00
Philippe Teuwen c281f71f59 hf tune: group commands 2019-05-14 08:25:26 +02:00
Philippe Teuwen 7ed7a9de40 Rework hf tune to make it synchronous (needed for rdv4) 2019-05-14 00:37:03 +02:00
Philippe Teuwen d05cd5ff2b Internal packet structs don't need to be packed, only the wired structs 2019-05-13 22:32:44 +02:00
iceman1001 d2a4ade2af chg: lf t55xx write - now uses NG frames. 2019-05-13 13:23:53 +02:00
Philippe Teuwen 3412e9d8c5 Capabilities versionning, would also detect platform struct pack issues 2019-05-10 19:00:18 +02:00
Philippe Teuwen fa87266efc update new format doc 2019-05-10 08:37:52 +02:00
Philippe Teuwen 68e5b3c355 style 2019-05-08 01:35:51 +02:00
Philippe Teuwen 40480a49d8 compact capabilities 2019-05-08 00:15:39 +02:00
Philippe Teuwen 6401452eb6 remove hw_available_fpc_usart_btaddon 2019-05-08 00:06:12 +02:00
iceman1001 29a160c905 reconnect version2 yolo 2019-05-06 22:41:00 +02:00
Philippe Teuwen 6b5a0f8319 Rename and unguard CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K ans it's used more generally than LF 2019-05-04 23:56:59 +02:00
Philippe Teuwen 2497ec2eec More USB_CMD -> PM3_CMD 2019-05-04 11:36:35 +02:00
Philippe Teuwen 3176684f4a Add usart dev cmds & dynamic flash support capability 2019-05-03 22:30:17 +02:00
Philippe Teuwen 3605809073 Remove WITH_FLASH from common as it's used by client too 2019-05-01 23:43:08 +02:00
Philippe Teuwen bc6d9f4074 pm3 report compiled capabilities 2019-05-01 17:19:37 +02:00
Philippe Teuwen 27f7057961 Rename few USB -> PM3 to avoid misleading interpretations 2019-04-30 21:10:11 +02:00
iceman1001 e1063e2836 chg: reconfigure uart timeouts when compiled for FPC and connecting over USB. 2019-04-30 12:57:44 +02:00
Philippe Teuwen fc6be9fea4 Define USB_CMD_DATA_SIZE_MIX 2019-04-29 22:38:26 +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 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
Philippe Teuwen cb452c98ba rework Dbprintf & add color support 2019-04-26 10:36:06 +02:00
Philippe Teuwen acc101ed37 doc magic 2019-04-26 08:29:21 +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
Philippe Teuwen e453aff88c First adjustments for FPC BT link 2019-04-23 23:36:36 +02:00
Eloff 66ee8dc09e used predefined constants, common types moved to common header files 2019-04-23 21:14:20 +03:00
Philippe Teuwen e4006a7563 doc errors 2019-04-20 10:34:54 +02:00
Philippe Teuwen a7773b3395 Introduce reply_mix, to still get some varlen on old API 2019-04-20 03:17:19 +02:00
Philippe Teuwen 3bcf80bb34 Introduce SendCommandMIX, to still get some varlen on old API 2019-04-20 02:41:40 +02:00
Philippe Teuwen a45238236d armsrc: put new frame parsing in common for usart (still usart_read_ng to do) 2019-04-20 01:47:50 +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