1499 commits

Author	SHA1	Message	Date
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	27e94f5669	remove redundant def	2019-04-25 20:59:11 +02:00
iceman1001	a6278ff8cd	chg: forgot to readd hitag support :)	2019-04-25 20:51:20 +02:00
Iceman	f227041932	Merge pull request #172 from McEloff/hfmfu ... UL/NTAG new dump file format. Added counters support, simulation	2019-04-25 16:10:03 +02:00
Eloff	66ee8dc09e	used predefined constants, common types moved to common header files	2019-04-23 21:14:20 +03:00
Eloff	a8c1fa7a3b	backward compatibility, on load converter for old mfu dump format	2019-04-23 17:07:20 +03:00
Eloff	8793a9e596	Merge commit 'e171010d' into hfmfu ... # Conflicts: # CHANGELOG.md	2019-04-22 23:26:20 +03:00
Philippe Teuwen	127f5ed192	Revert c7a4d7af, remove redundant include	2019-04-22 22:11:57 +02:00
Iceman	e171010d32	Merge pull request #170 from McEloff/temp ... 'hf mf sim' full-byte anti-collision frame support	2019-04-22 19:14:34 +02:00
Eloff	db3103b531	UL/NTAG new dump file format. Added counters support, simulation	2019-04-21 03:18:00 +03:00
Philippe Teuwen	c7a4d7af3a	Add ref to new mifaresim.h in standalone modes	2019-04-19 23:15:02 +02:00
iceman1001	a82fd7da34	Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3	2019-04-19 10:00:09 +02:00
iceman1001	b495f4bc44	fix: Standalone/hf_colin now compiles	2019-04-19 09:59:34 +02:00
Iceman	05674dc559	Update readme.md	2019-04-19 09:29:50 +02:00
iceman1001	b29b07c8ad	chg: hitag compile flag optional	2019-04-19 09:23:24 +02:00
iceman1001	9c776c8935	fix: standalonemode matty_run now compiles	2019-04-19 09:23:02 +02:00
Eloff	960b21793c	'hf mf sim' full-byte anti-collision frame support	2019-04-18 21:02:48 +03:00
iceman1001	1ee3679a98	style	2019-04-17 14:54:42 +02:00
Eloff	63f9f11066	'hf mf sim' bugs fix, RATS support, etc	2019-04-16 23:52:05 +03:00
iceman1001	e04e2d6fa7	revert	2019-04-16 17:02:21 +02:00
iceman1001	597019b98a	revert	2019-04-16 17:01:00 +02:00
iceman1001	64c7ee117e	revert	2019-04-16 17:00:18 +02:00
iceman1001	aaedeafbb1	style spaces	2019-04-16 16:56:56 +02:00
iceman1001	75524b72d1	style	2019-04-16 15:10:55 +02:00
iceman1001	144237abfd	style	2019-04-16 15:09:57 +02:00
iceman1001	e5928424b6	style	2019-04-16 15:08:51 +02:00
iceman1001	00f3c281bb	style	2019-04-16 15:06:14 +02:00
iceman1001	9a5b23428d	style	2019-04-16 15:05:01 +02:00
iceman1001	ac7bd3532f	style	2019-04-16 15:02:44 +02:00
Philippe Teuwen	04c0384d3e	Testing pm3 communication	2019-04-14 17:25:17 +02:00
Philippe Teuwen	9676d788e0	style	2019-04-14 13:37:53 +02:00
iceman1001	d28fac3ef0	style	2019-04-14 11:43:05 +02:00
iceman1001	664434dfba	Fix: USART calls rx/tx	2019-04-14 11:10:16 +02:00
iceman1001	e44fcb52d6	fix: usart needs those pins. (@ryan)	2019-04-14 11:07:35 +02:00
iceman1001	4ab2212346	style	2019-04-13 08:50:05 +02:00
iceman1001	6803e6d1c0	style	2019-04-13 01:43:22 +02:00
Eloff	15f2fb4010	duplicate method	2019-04-12 00:35:02 +03:00
Eloff	172748a82c	BugFix.'mifaresim.c' used wrong Uart reference	2019-04-12 00:10:52 +03:00
osboxes.org	ffd2c92584	style	2019-04-10 09:46:01 +02:00
osboxes.org	260ad9b7ae	style	2019-04-10 09:32:55 +02:00
osboxes.org	05648163c1	style	2019-04-10 09:32:49 +02:00
osboxes.org	98b1172098	style	2019-04-10 09:32:40 +02:00
osboxes.org	e8b75582be	style	2019-04-10 09:32:07 +02:00
iceman1001	6c1b8f809e	chg: update armside debug to fit with offical repo.	2019-04-10 08:42:00 +02:00
Eloff	249352a1e7	'hf mf sim' + 'hf 14a sim' now back to stable	2019-04-09 23:57:10 +03:00
iceman1001	8c4f8eaeca	unused	2019-04-09 20:43:09 +02:00
iceman1001	9c634ce605	unused	2019-04-09 20:41:01 +02:00
iceman1001	4d99bf7fab	unused	2019-04-09 20:39:38 +02:00