RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-03-20 03:48:33 +08:00
Code Issues Projects Releases Packages Wiki Activity
3155 commits 3 branches 15 tags 89 MiB
Commit graph

81 commits

Author SHA1 Message Date
iceman1001
f054f5da32 CHG: gcc7 warnings accoring to PR#401 https://github.com/Proxmark/proxmark3/pull/401/files 2017-09-26 17:02:18 +02:00
iceman1001
3384999c83 CHG: some help text edited and rearrange the commands to be in the same order 2017-08-09 18:33:30 +02:00
iceman1001
c583570a3d minor styleish 2017-08-06 16:31:01 +02:00
iceman1001
3911c0a13e Some debugstatements 2017-07-31 20:45:16 +02:00
iceman1001
1bf452e842 FIX: 'lf search' should work now again. 2017-07-31 11:46:35 +02:00
iceman1001
91898babc0 FIX: data plot AutoCorrelate slider, window too big, now limited to number of samples. 
enhanced debugstatements,
'lf em 410x_demod' vs 'lf em 410x_read'   now read does the same as all other LF,  and demod too...
 2017-07-30 21:21:02 +02:00
iceman1001
f28da2da6e monster merge... 
all those changes marshmellow did..  and more...
 2017-07-30 09:17:48 +02:00
iceman1001
46a0ec7130 CHG: removed old TRUE/FALSE defines... some left still.. 2017-07-27 09:28:43 +02:00
iceman1001
ec16d16d05 fixes: removal of TRUE/FALSE defines into bools 2017-07-14 16:20:34 +02:00
iceman1001
4eabb8ad38 CHG: minor LF adjustments. 
CHG: `lf visa2000` - removed askedgedetect, it seemed it destroyed more than enhanced.
 2017-02-28 16:55:16 +01:00
iceman1001
f24edfec54 CHG: hf 14a read - started to add a Magic tag gen2 detection. SKipping it for now. Can't decide to put in on deviceside or in client. 
FIX:  `lf read` - ophs..  it works again.
ADD: `lf em 4x05--`  - added a chipset definition
CHG: better kali fix - from @pwpivi
 2017-02-28 08:16:02 +01:00
iceman1001
41611deef9 CHG: some of @marshmellow42 's ref: 2b11c7c750 
CHG: `lf em 410x` - when demoded to all zeros, it wasn't printed so some noninitalized tags just gets a empty "found em410x tag" message. Hav'nt decided on how to go further with it.
 2017-02-27 14:04:50 +01:00
iceman1001
d216a5711b CHG: one step closer to finish merging @marshmellow42 's 4x05 changes. 2017-02-26 21:32:51 +01:00
iceman1001
6ac2301423 CHG: forgot some changes to previous commit. 2017-02-24 15:00:49 +01:00
iceman1001
5215a87442 CHG: @Marshmellow42 's fixes. ref: e88096ba25 2017-02-24 01:14:47 +01:00
iceman1001
9c624f67b3 chg: @piwi's code cleanup and some more. 
ref: 43534cbad2
 2017-02-23 00:03:10 +01:00
iceman1001
17a9ca0cdc FIX: memcpy bug... 2017-02-19 23:52:09 +01:00
iceman1001
9932c55a4a CHG: lf em - refactored @marshmellow42 's em paritycheck. 
ADD: `bootrom/Makefile` got some options.  It shouldnt change anything.
 2017-02-19 23:24:19 +01:00
iceman1001
5e9d59fe2a syntax sugar 2017-02-19 01:34:45 +01:00
iceman1001
4ac9f07840 CHG: lf em - added @marshmellow42 's changes 2017-02-19 00:12:35 +01:00
iceman1001
080e1114c8 CHG: a message.. 2017-02-16 21:59:57 +01:00
iceman1001
6f93185537 CHG: lf em - some minor psk detection changes. 2017-02-16 21:52:14 +01:00
iceman1001
1a4b907335 CHG: some minor changes from @marshmellow42 2017-02-16 21:44:25 +01:00
iceman1001
516dbac210 CHG: lf em - some minor refactoring in 4x50 commands 2017-02-16 19:48:50 +01:00
iceman1001
bd09006a8c CHG: 'lf em4x' - the em4x50 demod didn't calc ASKDemod_ext with a refenence bool. 
CHG:  'lf em4x' - refactored the code for emd4x50 demod
 2017-02-16 16:38:09 +01:00
iceman1001
62dc7d4a6f CHG: @marshmellow42 's em4x50 changes 
ADD: 'analys chksum' - added a BSD styled 4 and 8 bit shift checksum
 2017-02-16 09:53:47 +01:00
iceman1001
f9f5f45000 CHG: lf em - @marshmellow42 's latest changes 2017-02-15 16:58:29 +01:00
iceman1001
ff9c043da2 FIX: T5555/Q5 datarate when used in "Q" parameter, consequential fix in lf commands. (RF-2/2) ie: ((64-2)>>1) 
ADD: Marshmellow42 's timing fixes for em4305.
 2017-02-13 10:58:28 +01:00
iceman1001
c7ea35a9fb chg: textual changes 2017-02-07 22:29:24 +01:00
iceman1001
cb1ba30a5e FIX: first attempt to clean up EM4x50 commands. 
- `lf em4x readwordPWD` merged into `lf em4x readword` See help text
 - `lf em4x writewordPWD` merged into `lf em4x writeword` See help text

 - `lf em4x readword` now download the collected signal data after command.

On device side the lfops.c has gotten some love. Code cleaner,  increased EM_START_GAP from 55 FC to 56 FC, because of how our microsecond(us) clock works with 21.3us increments.

TODO: `lf em4x em4x50read` needs to be factored to use @marshmellow42 's  ASKdemod instead of trying to do itself.
 2017-02-07 22:26:06 +01:00
iceman1001
36d87eeff0 FIX: client crash for global id, and removing my previous fix. 2016-10-20 17:31:23 +02:00
iceman1001
3c6354e99a FIX: strange bug in "lf em em410xwatch" , which the client crasches when it reads a valid em tag. 2016-10-20 01:50:30 +02:00
iceman1001
015e3b8170 syntax suger. never mind this 2016-10-20 00:41:34 +02:00
iceman1001
60bb5ef73b FIX: "hf legic decode" the stamp_len variable was int, but its used as a uint8_t. 
FIX: cmdlfem4x.c needed ref to cmdmain.h for clearCommandBuffer
 2016-02-14 15:30:26 +01:00
iceman1001
4c36581b96 CHG: clearCommandBuffer(); before calling cmdparser. 2016-02-14 15:24:11 +01:00
iceman1001
a429510647 REM: Removed #define llx PRIx64, all these defines are located in proxmark3.h 2016-01-19 16:29:07 +01:00
iceman1001
28093ebc10 FIX: wrong format specifier syntax 2016-01-15 12:53:13 +01:00
iceman1001
43d3f76921 FIX: this should remove some warnings while compiling on linux and when running Travis-CI in a docker container. 
some format specifier for uint64_t
and getting the git history in the perl script.
 2016-01-15 12:43:29 +01:00
iceman1001
8ce3e4b4e9 add: missing two hard_nested files.. 2015-12-02 16:48:25 +01:00
iceman1001
bca7107931 ADD: @marshmellow fix for em41x clock. 
CHG: swap the int to a uint8_t to skip a compiler error
 2015-11-09 21:49:02 +01:00
iceman1001
6a09bea427 CHG: code clean up. Have some questions regarding the CopyVikingTo method. The configblock looks wrong.. 2015-10-15 11:30:37 +02:00
iceman1001
0ad1a1d492 FIX: minor variable fixes when compiling on linux. 
cmddata.c: In function ‘Cmdmandecoderaw’:
cmddata.c:420:2: warning: format ‘%i’ expects argument of type ‘int *’, but argument 4 has type ‘size_t *’ [-Wformat=]
  sscanf(Cmd, "%i %i", &invert, &maxErr);
  ^

cmdlfem4x.c: In function ‘CmdEM410xRead’:
cmdlfem4x.c:58:2: warning: format ‘%llx’ expects argument of type ‘long long unsigned int’, but argument 3 has type ‘uint64_t’ [-Wformat=]
  sprintf(id, "%010llx",lo);
  ^
 2015-06-14 23:02:52 +02:00
iceman1001
fb2d24882e Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	client/cmddata.c
	client/cmddata.h
	client/cmdhfmf.c
	client/cmdlf.c
	client/cmdlfem4x.h
	client/cmdlft55xx.c
	client/lualibs/default_toys.lua
	client/scripts/tnp3clone.lua
	client/scripts/tnp3dump.lua
	client/scripts/tnp3sim.lua
 2015-04-24 19:04:01 +02:00
marshmellow42
8e0cf02308 minor change to lf em4x menu & iceman script... 
...updates
 2015-04-10 00:06:59 -04:00
marshmellow42
fef74fdce4 lf ask consolidation 
backend:
askman and askraw demods merged into askdemod (args adjusted
accordingly)
re-arranged lfdemod.h in alphabetical order and by category

front end:
data detectclock a (ask) now also reports the selected best start
position for demod
data manrawdecode takes an invert arg now
 2015-04-08 01:07:39 -04:00
marshmellow42
49bbc60af3 lf cleaning++ 
data askedgedetect - removed unneeded code
lf em em4x50read bug fix / error checking
graph-save/restore auto repaint after restore.
 2015-04-07 00:53:06 -04:00
marshmellow42
cc15a1187b lf cleanup - fixes 
more lf em em4x50read fixes
adjust heavy clipping ask clock detection
clean up t55xx minor items
 2015-04-06 23:17:30 -04:00
marshmellow42
2767fc0291 lf cleaning 
remove unneeded code/functions
fix lfdemod askmandemod bug with maxErr=0
silence output for getting samples in lf search
 2015-04-05 00:58:57 -04:00
marshmellow42
6e98444637 lfdemod reduce duplicate code 
remove check for best start position in demods and adjust the clock
detect to always return best start position to the demods
also small bug fix in lf em em4x50read
 2015-04-02 23:55:12 -04:00
marshmellow42
23f0a7d862 lfem4x cleanup/add/fix 
changed spacing to tabs for cmdlfem4x.c
finished the partially built lf em em4x50read function
added save/restore GraphBuffer function in graph.c
adjusted some tolerances in lfdemod.c
added a maxLen argument to the askmandemod
 2015-04-02 12:48:52 -04:00