RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-22 00:06:13 +08:00
Code Issues Packages Projects Releases Wiki Activity
2292 commits 3 branches 14 tags 86 MiB
Commit graph

179 commits

Author SHA1 Message Date
marshmellow42 8e2e6c8eb0 add clock to ask rawdemod outputs 
fix biphase invert bug (correctly)
 2015-06-07 00:42:57 -04:00
marshmellow42 07b5a3c3ba Modified kermit crc to use existing crc calc code 2015-06-05 22:39:56 -04:00
marshmellow42 c2c7f6c271 fdx-b clean up 2015-06-04 13:10:33 -04:00
marshmellow42 6eaa8da9dc Add CCITT Kermit CRC check for FDX-B demod 2015-06-04 12:53:19 -04:00
iceman1001 ad6219fc91 ADD: @marshmellow42 's fixed version of the ISO11784 FDX-B 
ADD: crc16_ccitt_rev  (reverse version of crc16_ccitt 0x0000)
 2015-06-04 10:33:55 +02:00
marshmellow42 b2c330b367 bug fix - biphase invert + fdx-b adjustments 2015-06-03 23:59:22 -04:00
marshmellow42 fd1d30cb76 addition animal tags demod info 2015-06-03 18:28:56 -04:00
marshmellow42 04bb05670d Testing animal tags 2015-06-03 16:52:20 -04:00
iceman1001 22a6a62fbb ADD: removed the paritythingy, I missunderstood its purpose. 2015-06-03 22:38:59 +02:00
iceman1001 7f96433c8a CHG: trying to get the askdemod / biphasedeocde / finding startmarker / removeparity to work in ISO11784demod 2015-06-03 22:19:32 +02:00
iceman1001 0df669a298 ADD: next step ISO11784/85 2015-06-03 21:35:03 +02:00
iceman1001 615f21dde2 FIX: a minor bug fix from @marshmellow42 in "data raw" and ask/biphase. 
ADD: started witha  ISO11784/85 demod function.
 2015-06-03 21:12:24 +02:00
iceman1001 2d2f7d1948 ADD: @marshmellow42 's changes / fixes. 2015-05-31 21:47:33 +02:00
marshmellow42 185e038c7d fixed further typo in lf t5 wr help 
also fixed offset option char to uint8_t warning in the new offset
option in data printdemodbuffer
 2015-05-28 23:14:06 -04:00
marshmellow42 979bba376d add offset option to data printdemodbuffer 
easily see demod buffer's hex values at different bit offsets by using:
data printdemodbuffer x o <offset>
 2015-05-28 13:23:31 -04:00
marshmellow42 e6432f0579 @iceman1001 s coverity scan fixes 2015-05-13 11:14:17 -04:00
marshmellow42 2b3af97df2 various bug fixes 2015-05-13 11:07:47 -04:00
marshmellow42 411105e036 added nexwatch demod & iceman lua 
added nexwatch demod (also added to lf search)
added iceman's lua script adjustments
 2015-04-08 14:19:03 -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 1f918317e2 add maxErr to data manrawdecode 2015-04-05 21:59:36 -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 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
marshmellow42 f8f894a50f rawdemod param cleanup 
plus lfdemod.h cleanup
 2015-03-27 23:47:31 -04:00
marshmellow42 2eec55c8a4 lfdemods streamline & bug fixes 
removed duplicate code countPSK_FC - adjusted countFC to work.
bug fixes & streamlined code in:
lf hid fskdemod
lf em em410xdemod

cleaned up lfdemod.c some
 2015-03-27 00:02:30 -04:00
marshmellow42 e0165dcf3a Fixed indents to Tabs from Spaces 
Spacing changes ONLY - no code changes
 2015-03-25 14:24:36 -04:00
marshmellow42 c7d169ec02 clean up em410x output 2015-03-24 22:11:32 -04:00
marshmellow42 90677ad99b EM410x bug fix 2015-03-24 20:26:14 -04:00
marshmellow42 9680b11d9e remove debugging print calls 2015-03-23 20:25:54 -04:00
marshmellow42 1fbf895616 lf updates 
applies icemans full ata55x7 read/write settings
adds checksum to ioprox (thanks to iceman)
adds silent mode for lf read and getSamples
fix lf em em410xwatch and lf em410xspoof
improve data rawdemod ar -  for biphase demods
improve detectclock a for strong antennas
 2015-03-23 16:29:50 -04:00
marshmellow42 13d77ef964 lf t5 read plus lf demod adjustments 
lf t5xx commands updated from ICEMAN
lf em410x commands updated
lf search bug fix for 2 args
test scripts from iceman
lf demod:
better ask clock detection with Strong fully clipped waves
better ask raw demod with strong fully clipped waves
fsk demod add back in skipped bits during demod
nrz demod add back in skipped bits during demod
 2015-03-22 15:28:48 -04:00
marshmellow42 b41534d142 adjust ask/biphase handling - more complete 
also added XL EM410x formats
 2015-03-15 22:03:50 -04:00
marshmellow42 7a8a982bde adjust pskdemod 
add skipped bits before first phase back in
PSKDemod now returns 1 for success or 0 for fail like other demods
 2015-03-13 20:49:34 -04:00
marshmellow42 e74fc2ecba give credit where credit is due 
thanks iceman for the crc :)
 2015-03-13 14:00:11 -04:00
marshmellow42 9f7bbd24c9 data autocorr additions 2015-03-13 12:23:26 -04:00
marshmellow42 d9d41e0f3f minor g-prox-ii demod fix 
lf search was occasionally outputting false results.
 2015-03-13 11:18:55 -04:00
marshmellow42 73d04bb417 data psk demod minor fixes, pyramid demod add CS 
also adjusted autocorrelate and added a printout for lf search u
 2015-03-13 11:09:12 -04:00
marshmellow42 1302428367 finish data printdemodbuffer command 2015-03-09 16:56:00 -04:00
marshmellow42 ada339a10f biphase bug fixes 2015-03-09 15:27:20 -04:00
marshmellow42 d66d484347 fixed rawdemod help options 2015-03-08 18:07:01 -04:00
marshmellow42 78f5b1a77c lf sim fixes/creations correct now 
fixed lf simpsk
fixed lf em em410xsim
fixed lf sim  (can go right from lf search to lf sim if you have a
strong antenna - if not use a demod first)
 2015-03-06 12:28:54 -05:00
marshmellow42 e09f21fa7b Revert "lf sim fixes/creations" 
This reverts commit 293de1bad7.
 2015-03-06 12:26:33 -05:00
marshmellow42 293de1bad7 lf sim fixes/creations 
fixed lf simpsk
fixed lf em em410xsim
fixed lf sim  (can go right from lf search to lf sim if you have a
strong antenna - if not use a demod first)
 2015-03-06 12:25:36 -05:00
marshmellow42 8d960002c8 lf cmds fix, add, show 
show command to UI:
data printdemodbuffer - allow printing of demod buffer
Add:
data askgproxiidemod - demod a gproxii tag

Fix:
adjust lf simxxx commands further for testing
 2015-03-02 14:42:55 -05:00
marshmellow42 ec9882b18c PSKDemod Bug Fix 2015-02-22 21:11:25 -05:00
marshmellow42 3f41e73c7f PSK demod adjustment 
add carrier length test to weed out false positive demods
 2015-02-22 20:09:58 -05:00
marshmellow42 b4a2fcf676 Split output from nrz raw demod function 
missed this one last time
 2015-02-21 18:37:15 -05:00
marshmellow42 4ac906d1c2 split output from rawdemod functions 
now allows for non-verbose calling:
ASKmanDemod
ASKrawDemod
FSKrawDemod
PSKDemod
 2015-02-21 00:27:48 -05:00
marshmellow42 abd6112fc4 Revert "Revert "lf simask, lf simfsk and bug fixes"" 
This reverts commit e396001c47.
 2015-02-19 21:35:34 -05:00
marshmellow42 e396001c47 Revert "lf simask, lf simfsk and bug fixes" 
This reverts commit fb0c84c3df.
 2015-02-19 21:22:05 -05:00
marshmellow42 fb0c84c3df lf simask, lf simfsk and bug fixes 2015-02-19 21:21:11 -05:00
marshmellow42 cc2ea5ed82 Clean up Helps and command descriptions 2015-02-14 21:15:13 -05:00
marshmellow42 abd16c456a fix help on data rawdemod commands 2015-02-13 21:17:15 -05:00
marshmellow42 7e72f90a7f Merge remote-tracking branch 'upstream/master' 2015-02-09 16:47:24 -05:00
pwpiwi 0d0d049967 hw tune, data tune: adjusted "unusable" and "marginal" voltages. Display LF tuning graph only when LF antenna is connected. 2015-02-09 22:36:53 +01:00
marshmellow42 19ff0210fa lf data combine rawdemods & depreciate cmds 
new:
data rawdemod
replaces:
data askmandemod
data askrawdemod
data fskrawdemod
data nrzrawdemod
data psk1rawdemod
data psk2rawdemod

also commented out of the CommandTable but did not remove the commands:
data askdemod
data bitstream
data fskdemod
data mandemod
data threshold
 2015-02-09 16:25:12 -05:00
marshmellow42 f3bf15e484 lf/data combined detectclock functions to one 
cleaned up detect clock functions - now uses one main function that
takes a char argument to select which modulation to detect the clock for
REMOVED commands: pskdetectclock, nrzdetectclock, fskfcdetect.
renamed DetectClock function to DetectAskClock to be more descriptive.
 2015-02-09 11:11:04 -05:00
marshmellow42 b4fb11ba92 fix inconsistent spacing within functions 
did not convert spaces to tabs but made the functions consistent with
what it used so it can be auto converted.
(sorry for the annoying space/tab usage in the past.)
we can convert all to tabs later.
 2015-02-08 00:48:00 -05:00
marshmellow42 be2cf126bf Merge remote-tracking branch 'upstream/master' 2015-02-06 14:45:46 -05:00
marshmellow42 6de4350803 data askraw patches, data askedgedetect demod, 
data askraw patches - added amp option (for stubborn waves)
NEW data askedgedetect demod for manual demod,
adjusted detectclock (ask clock) in case of cleaned (edgedetect) waves
finish maxErr args
finish psk detect
 2015-02-06 14:36:25 -05:00
marshmellow42 e770c64824 lf psk/nrz split, add maxErr argument 
changed psk to use wave lengths instead of peaks
split out NRZ from psk demod
added maxErr argument to raw demods (except fsk)
 2015-02-05 17:01:18 -05:00
Martin Holst Swende 1f78a4d305 Merge pull request #54 from Proxmark/lf_recorder 
LF: Ability to do longer traces/snoops
 2015-02-02 19:54:07 +01:00
Martin Holst Swende 0644d5e3a3 Merged with master 2015-01-31 18:21:38 +01:00
Martin Holst Swende c856ceae8a Fixed undecimation command 2015-01-31 12:42:40 +01:00
Martin Holst Swende 698b649e0e Added undec to un-decimate data on the client side, so we can use all those sweet demodders even if the data has been decimated on the ARM side 2015-01-31 00:05:04 +01:00
Martin Holst Swende 31abe49fd3 Some more fixes to longer lf recordings. Now also supports longer snoops, and an additional command 'lf config' has been defined, instead of having to specify all params for every call 2015-01-30 23:03:44 +01:00
Iceman 0c5998c051 Update cmddata.c 
as suggested,  a bitwise bounds check in cmddata.
 2015-01-30 15:17:07 +01:00
iceman1001 33c7e2f3bc wrong letter in variable name 
Conflicts:
	client/cmddata.c
 2015-01-29 22:35:19 +01:00
Martin Holst Swende f6d9fb173f Added client-side support for recording longer samples, fixed last (?) issues on device-side 2015-01-29 00:57:22 +01:00
pwpiwi f71f4deb8f BigBuf and tracing rework: allow much longer traces in in hf commands 
- provided a BigBuf_malloc() function to dynamically allocate parts of BigBuf
  e.g. for DMA-Buffers, Frame-Buffers, Emulator-Memory
- the whole rest of BigBuf is now available for traces (instead of a small fixed amount)
- send actual traceLen together with trace data
- changed client side to cope with varying traceLen
- changed small buffers to automatic variables instead of parts of BigBuf
 2015-01-28 07:18:51 +01:00
marshmellow42 a1d17964a2 lf demod bug fix & refactor 
fixed bug in lfops.c in hid fskdemod
refactored data fskXXXDemods for specific tags to use more common code.
 2015-01-27 14:51:12 -05:00
marshmellow42 8c65b650e8 clean up some comments 2015-01-26 17:49:30 -05:00
marshmellow42 04d2721b3c lf psk demods 
clarify existing as psk1
added psk2 demod
 2015-01-26 17:23:19 -05:00
marshmellow42 9c0f13d5dd Merge remote-tracking branch 'upstream/master' 2015-01-26 17:07:49 -05:00
marshmellow42 03e6bb4aed lf FSK demod tools/fixes 
added full ability to detect FSK clocks
applied autodetect of fsk clock to data fskrawdemod
this finished data fskfcdetect (now detects field clocks and bit clock)
 2015-01-22 14:24:03 -05:00
marshmellow42 ec75f5c10a lf Bug Fixes and lf demod additions 
added data fskparadoxdemod
added data setdebugmode (for demods)
added data shiftgraphzero (to help clean weak reads)
fixed a few bugs with the data detectaskclock
added data fskfcdetect to detect FSK clocks
adjusted most of my demods to put raw tag binary to demod buffer for
future sim and clone commands (psk still needs work)
 2015-01-20 17:28:51 -05:00
iceman1001 a1557c4c2f Minor fixes: Array inits, some array bounds checks. 
ADD: some extra help text for lf snoop
ADD: HasGraphData - function in graph.c
ADD: DetectHighLowInGraph  - function in graph.c
 2015-01-20 22:14:56 +01:00
marshmellow42 1e090a61a1 lf demod additions 
data fskfcdetect (field clock and bit clock detect for FSK)
data fskdemodawid -AWID demod/decode
data fskdemodpyramid - AWID demod/decode
 2015-01-18 18:13:32 -05:00
marshmellow42 84871873a4 Small lf bug fixes and threshold adjustments 
adjusted lf demod thresholds based on additional testing
fixed bug in hid bit length calc in cmddata.c
fixed bugs in lf search
 2015-01-13 17:21:36 -05:00
marshmellow42 ae6ead3dc8 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	client/cmdlf.c
 2015-01-13 16:02:23 -05:00
marshmellow42 ac3ba7ee69 lf search use new psk, small demod adjustments 
adjust thresholds for ask, fsk, io, psk based on more sample testing
adjust indala decode to set clock to 32 if no input (autodetect not
always correct)
 2015-01-09 16:46:17 -05:00
iceman1001 952a8bb59b Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/lfops.c
	client/cmddata.c
	client/graph.c
 2015-01-08 22:23:45 +01:00
marshmellow42 d6d20c5435 cmddata.c changes by others - reapply 
i overwrote some changes in cmdsamples.  i fixed that
i also removed some comments in graph.c
 2015-01-07 19:06:29 -05:00
marshmellow42 3aa4014baa Fix Tune Samples (broken in commit 12/31 by me) 2015-01-07 18:14:28 -05:00
marshmellow42 ba1a299ce6 code cleanup. re-added psk commands. 
also fixed a bug in detect clock functions.
sync with master prep for pull request
 2015-01-07 18:14:27 -05:00
marshmellow42 4118b74dc8 added data psk* cmds for pskdemod 
fixed a couple small bugs in other lf functions as well including
detectaskclock,  stopped changes from being made to graphbuffer.
 2015-01-07 18:13:26 -05:00
iceman1001 b915fda392 FIX: a solution for the issue "hf mf esave - always saves 4K" 
FIX: a solution for the issue "hf eload, esave, cload, save - filepath variable too short"
CHG: minor code clean up.
ADD: AES / CRC16 for lua. (and tnp3xx scripts.)
ADD: tnp3dump.lua  script to dump tnp3xx tags.
ADD: tnp3sim.lua script to let PM3 imitate an tnp3xx tag. Needs to be tested live
 2015-01-07 22:00:29 +01:00
iceman1001 d91a31f935 CHG: minor code clean up. 
ADD: tunesamples in cmddata.c  pullrequest #33,  was removed by Marshmellows other commits. I returned it.
 2015-01-07 21:29:38 +01:00
iceman1001 3fe4ff4f03 CHG: generic code clean up. Removal of commented code. 
CHG: USB_CMD_DATA_SIZE is now used as maxsize for transfer of data between client and pm3device
CHG: suggested a fix for the underscore problem in ioclass\fileutils.c
ADD:  tnp3xx support
ADD:  nxp tag idents.
ADD:  identifiction of chinese backdoor commands to hf 14a reader.
 2015-01-05 15:51:27 +01:00
marshmellow42 ac914e56db minor adjustment to askmandemod for lf search 
returns false if it finds data but not an EM410x format.
 2014-12-31 14:55:58 -05:00
marshmellow42 9ec1416ad2 added data rtrim command 
enter location to trim all samples after
 2014-12-31 14:43:49 -05:00
marshmellow42 f822a063b3 lf demod code cleanup - added fskraw arguments 
merged code and added arguments to data fskrawdemod to allow other fsk
mode demodulations (FSK2a = RF/10 & RF/8) another might be (RF/8 & RF/5)
 2014-12-31 02:27:30 -05:00
marshmellow42 d5a72d2fee LF demod/cmd code cleanup + new lf search 
cleaned up and error proof code.  plus added new command    lf search
when online it will lf read - data samples 20000 - and test for EM410x,
HID, IO Prox, and indala cards.  when offline it will test current
graphbuffer.
 2014-12-30 16:08:33 -05:00
marshmellow42 6bfa18eab4 Merge pull request #1 from Proxmark/master 
Test
 2014-12-29 16:14:23 -05:00
marshmellow42 2df8c07907 minor setting adjustments/cleanup 
clean up code
 2014-12-29 15:58:59 -05:00
marshmellow42 66707a3b3c LF Demod bug fixes and add lf em em410xdemod 
fixed a few bugs in lf demod that the streamlining added.  added new lf
em em410xdemod command that loops until button pressed. (similar to lf
hid fskdemod
 2014-12-29 15:32:53 -05:00
marshmellow42 7db5f1ca25 slight adjustment to include 
removed extra unneeded path
 2014-12-28 21:29:33 -05:00
marshmellow42 eb191de615 LF Demod streamlining 
one shared location for demoding lf for arm and client.  also added a
few raw demod commands.
 2014-12-28 20:33:32 -05:00
marshmellow42 9e6dd4eb69 rename askrawdemod to askmandemod 2014-12-24 13:01:09 -05:00