Commit graph

44 commits

Author SHA1 Message Date
Chris
24eaac8681 CHG: the thread comms refactoring from offical pm3 repo
chg: FPC com speed limited to 115200 when compiled with FPC
chg: USART remake (@drandreas)
2018-09-06 21:43:20 +02:00
Chris
9d91856811 chg: from official 2018-06-17 12:55:32 +02:00
iceman1001
99d7546ca4 @micolous changes
CHG: - Make all examples platform-specific
CHG: - Remove ModemManager rant on non-Linux platforms

Ref:  e2aa5eb47c
2018-05-06 22:43:46 +02:00
iceman1001
24482211ad chg: the dot progress is not logged anymore. Force fflush afterwards. 2018-03-05 20:07:29 +01:00
iceman1001
b10dca061a fix: too many arguments to function 2018-01-25 18:01:40 +01:00
iceman1001
f6d2d508b4 rem: removed old references to google code. 2017-10-29 19:25:34 +01:00
iceman1001
2cf3a0adb7 chg: helptext 2017-10-20 18:00:58 +02:00
iceman1001
b99b2dd30f FIX: stderr -> stdout 2017-10-19 13:41:55 +02:00
iceman1001
16028f7d33 CHG: appmain now calls cmd_recieve as it should
CHG: flasher -  removed unneeded parameter to function
CHG: flasher - increased limit to fpga-files that can be loaded
FIX: main client,  wrong windows define fixed.
CHG: device side - recieve usb command does not always get 544 bytes.  usb packages can be incomplete.
CHG: usb_cdc.c also got piwi's changes.
CHG: uart_posix.c removed a debug value
CHG: uart_win32.c clean up.
2017-10-17 20:58:17 +02:00
iceman1001
7f544803e7 CHG: shorter sleep from 1000 -> 500 2017-10-10 15:00:37 +02:00
iceman1001
b18920b9f9 CHG: enables proxmark3 client to reconnect to serial port without exiting / restarting. 2017-09-26 17:04:25 +02:00
iceman1001
19a2c05de0 FIX: ubuntu complains about sleep... 2017-07-30 09:30:42 +02:00
iceman1001
f28da2da6e monster merge...
all those changes marshmellow did..  and more...
2017-07-30 09:17:48 +02:00
iceman1001
83adc96d81 some missing include inttypes.. 2017-07-28 01:37:55 +02:00
iceman1001
5222785d69 some dummy files in order to keep folder structure ok when compiling..
removed some comments
2017-07-27 21:19:39 +02:00
iceman1001
5f18400cbe FIX: 'hf iclass reader' marshmellows fixes.
CHG:  removing some #define TRUE
2017-07-07 12:38:49 +02:00
iceman1001
9c624f67b3 chg: @piwi's code cleanup and some more.
ref: 43534cbad2
2017-02-23 00:03:10 +01:00
iceman1001
5774b2b44d ADD: added a WIN sample. 2016-04-05 04:48:05 +02:00
iceman1001
93048e8b8b CHG: Added the urls to the new Wiki on github inside the flasher.c usuage text.
CHG:  Syntax suger
2016-01-21 08:02:41 +01:00
iceman1001
7838f4beba MERGED: @holimans changes
MERGED: @piwi changes
MERGED: @marshmellows changes.

I'm not even gonna try write up all that stuff..

ADD: changed some commands inside the "Hf 14a sim" on deviceside.
ADD: @mobeius "two nonce" version for mfkey32.   It is also inside the "hf 14a sim" with the "x" parameter.
2015-07-22 23:00:52 +02:00
iceman1001
225ccb910e ADD: new defines: iso14443_CMD_AUTH_KEYA, iso14443_CMD_AUTH_KEYB, iso14443_CMD_AUTH_RESPONSE, iso14443_CMD_AUTH_STEP1, iso14443_CMD_AUTH_STEP2, CHINESE_BACKDOOR_INIT, CHINESE_BACKDOOR_STEP2,
REM: removed old comments in bootrom.c
CHG: mifare ultralight & desfire commands inside arm has been cleaned up. Next step is to refactor it into armsrc/mifaredesfire.c
2015-01-07 17:42:57 +01:00
iceman1001
f38a152863 First check in. 2014-09-11 23:23:46 +02:00
fnargwibble@gmail.com
e654346b79 i'm a retard. no idea why i did it that way! get rid of compile warnings, and print string properly. duh. 2013-10-05 16:55:53 +00:00
fnargwibble@gmail.com
e12b82d362 show device name during flashing and change advice on hanging 2013-10-05 16:44:48 +00:00
martin.holst@gmail.com
5b59cfb7b1 Added some information about flashing (linux) 2013-05-11 12:43:44 +00:00
roel@libnfc.org
4890730a5f fixed crash, when proxmark was claimed by other process 2013-03-26 16:01:52 +00:00
roel@libnfc.org
4a049b7847 avoid rolling dots over the screen when proxmark is not available (yet) 2013-03-21 16:06:09 +00:00
roel@libnfc.org
d8193fa5ac flasher updated again, should work more solid now 2013-03-21 12:44:21 +00:00
roel@libnfc.org
13dbdd6bb1 (dirty) fix for linux to clean up the /dev/ttyACM* quicker 2013-03-21 10:59:56 +00:00
roel@libnfc.org
c1e745e465 optimized 2013-03-04 15:15:30 +00:00
thijsbreman@gmail.com
a7b4bf1eb4 polling per second in OpenProxmark 2013-03-04 13:07:15 +00:00
roel@libnfc.org
125a98a110 fixed stupid 64-bit formatting for x86/amd64 and unix/windows 2013-02-28 22:22:24 +00:00
roel@libnfc.org
28fdb04fd8 Finally, rewrote bootrom and flasher program, much faster now 2013-02-28 15:11:52 +00:00
marcansoft
8fe1a992c7 New flasher, much more paranoid and much more correct.
Knows how to merge segments to solve the "data overwrites last text
block" issue.

Removed "partition" stuff. Now it just flashes any elf file you pass,
though there's still a -b option required to explicitly enable flashing
the bootloader.
2010-02-26 14:03:43 +00:00
izsh@fail0verflow.com
a553f26748 Add License/Copyright headers/notices. Please add your own copyright notice if you have made any nontrivial changes or additions to the code. There are several files without any attribution, currently. 2010-02-21 00:47:22 +00:00
izsh@fail0verflow.com
4cd41f34ea Removing windows specific code. Everything now compile and work the same for the three OS 2010-02-20 23:35:09 +00:00
adam@algroup.co.uk
83a9b236fe fix warning: implicit declaration of function ‘exit’ 2010-02-06 09:33:17 +00:00
izsh.f0f
7fe9b0b742 Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.

The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P

The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.

Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)

client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.

client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.

client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.

client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.

include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.

common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.

armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.

common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 01:27:07 +00:00
bushing
2cab856f9f removed support for s19 files in the flasher and replaced it
with elf parsing.  can we stop specifying the "partition" yet?
2010-01-05 00:02:12 +00:00
bushing
6e4d4ee609 refactor flashing code into flash.h, so we can share it between platforms 2010-01-04 05:11:08 +00:00
bushing
9b25560889 lean up event model so that this will work under OS X (and hopefully Linux)
still need to refactor some stuff -- lots of code duplication here that
we can get rid of
2009-12-22 12:46:04 +00:00
bushing
a146075d74 remove most of the references to translate.h 2009-12-22 12:35:36 +00:00
bushing
3a8464f067 change usb_cmd struct to be more sane
wean ourselves off translate.h
2009-12-22 12:34:24 +00:00
bushing
cd00aa3043 merge linux and windows clients into one directory... will consolidate makefiles shortly 2009-12-22 12:11:15 +00:00
Renamed from linux/flasher.c (Browse further)