Commit graph

1700 commits

Author SHA1 Message Date
marshmellow42 b760f0ffd8 cannot seem to get uic to work for ...
... different qt versions in the make file correctly...
so, make the ui_overlays.h file version generic.  maybe...
2017-04-15 13:40:49 -04:00
marshmellow42 2c441f573c attempt ui_overlays.h qt4 version 2017-04-15 13:12:56 -04:00
marshmellow42 27882d378b add uic make ui_overlays.h
to makefile
2017-04-14 10:31:00 -04:00
marshmellow42 1a3c006469 maybe fixed loading/unloading bug. 2017-04-14 09:53:36 -04:00
marshmellow42 2deb4b6b46 Merge pull request #278 from marshmellow42/graphwork
Update Graphing Part1
2017-04-13 17:25:24 -04:00
marshmellow42 c4809fd411 Merge branch 'graphwork2' into graphwork 2017-04-13 17:24:33 -04:00
marshmellow42 f516ff0895 a few notation fixes 2017-04-13 17:16:34 -04:00
marshmellow42 c4f51073fc combine autocorr, dirth functions
fix lfdemod bug
add askedge to overlays (remove askdemod)
2017-04-13 10:33:18 -04:00
marshmellow42 9fe4507c03 update more demods for graphing
still todo fsk based tag demods (like HID, AWID, IO, Pyramid...)
2017-04-12 17:55:31 -04:00
marshmellow42 b8fdac9e6f apply @holiman s graph changes +
add demod data to graph.
some bugs are known:
if you close the graph window data plot will not bring it back.
exiting the application without closing the widget form results in
error.
autocorrect graph y labels are ugly
form has old askdemod tab.
sticky button purpose not defined/labeled well.
doesn't clear s_Buff when new graph loaded or sampled.
probably more...
2017-04-12 14:35:07 -04:00
marshmellow42 bb4e6dbd62 align clock grid with demods on graph (#276)
* align clock grid with demods on graph

* proper initialized values
2017-04-12 05:48:49 +02:00
marshmellow42 3fe7103959 proper initialized values 2017-04-11 21:51:31 -04:00
marshmellow42 0f321d631a align clock grid with demods on graph 2017-04-11 10:34:43 -04:00
pwpiwi 8aee1b8418 avoid vast number of warnings with clang compiler 2017-04-11 07:05:22 +02:00
pwpiwi 3472ebe528 Compatibility fixes for Qt5 (#271)
* Compatibility fixes for Qt5
- make Qt detection in client/Makefile independent of OS
- added -std=c++11 and -fPIC as compiler options (required by some Qt versions, breaks compiling with old ProxSpace environment)
2017-04-11 06:58:20 +02:00
pwpiwi 68541dddc2 Merge branch 'master' of https://github.com/Proxmark/proxmark3 2017-04-10 19:37:05 +02:00
pwpiwi 4a6bc37e70 fix missing terminating 0 in my_executable_directory (thanks @iceman1001).
fix warning about const used twice in get_my_executable_path() and get_my_executable_directory().
2017-04-10 18:44:27 +02:00
pwpiwi 88499d8694 Merge pull request #274 from marshmellow42/master
lf read adjustments
2017-04-10 18:01:04 +02:00
marshmellow42 90e9da2566 fix length test
thanks @pwpiwi for catching what i missed.
2017-04-10 11:38:11 -04:00
marshmellow42 e8647c5764 fix silent option for getSamples 2017-04-07 18:10:01 -04:00
marshmellow42 f9a6e84c56 update changelog 2017-04-07 18:05:23 -04:00
marshmellow42 f1004b345e fix buffer length bugs
adjust lf search a little as to when the chiptype check happens
2017-04-07 18:00:55 -04:00
marshmellow42 0aed2199a4 fix pskclockdetect bug 2017-04-07 17:41:22 -04:00
marshmellow42 b9957414a5 lf read adjustments
add parameter for # bits to read
auto get samples after lf read/snoop (don't need to do a `data samples`
anymore)
add safe function to get DemodBuffer
add some lf demod comments and apply new lf_read function instead of
read then get samples.
fixed output bug in lf t55xx config print
fixed small bug in lf t55xx detect during ST check
2017-04-07 17:28:12 -04:00
marshmellow42 bed24f53c2 no longer need doT55x7Acquisition... 2017-04-05 21:37:04 -04:00
marshmellow42 2229ee897e adjust t55x7 testmode write timing 2017-04-05 21:19:48 -04:00
Iceman ebfb4447b8 Merge pull request #268 from marshmellow42/master
various lf bug fixes and improvements
2017-04-05 15:41:16 +02:00
marshmellow42 605524b131 fix command help
add comments in changelog
2017-04-04 17:34:15 -04:00
marshmellow42 bf85d22f96 fix bug in st detect +
adjust nrz t55xx detection to reduce false positives on weak antennas
adjust t55xx read wait to get past initial startup wave.
2017-04-04 17:22:21 -04:00
marshmellow42 b97311b1bd lf improvements
fix noralsy demod bug (st should be true)
fix sprint_bin_break bug (didn't print last bit)
add a function to save/restore demodbuffer
remove redundant countFC call in PSKDemod
clean up pskclockdetect functions
fix indala26decode bug (end of data sometimes not correct)
improve PSK detection / demodulation
improve NRZ detection
improve t55xx commands & fix a few bugs
add t55xx page1 detection - added it to lf search
added experimental t55xx testmode write
2017-04-04 11:52:10 -04:00
pwpiwi b3ec0b3d4f Merge pull request #266 from marshmellow42/master
a few more tools for em4x05 writing
2017-04-01 09:44:17 +02:00
marshmellow42 6a772a1273 add verification data was entered-lf em 4x05 write 2017-03-31 12:52:30 -04:00
marshmellow42 51b614aa75 fix return value for error. 2017-03-31 12:22:30 -04:00
marshmellow42 5249ff940f Merge remote-tracking branch 'upstream/master' 2017-03-31 12:18:50 -04:00
marshmellow42 4ab135c0cd a few more tools for em4x05 writing.
ready to begin coding cloning cmds to em4x05.
2017-03-31 12:14:28 -04:00
pwpiwi fb9acd4588 Update/cleanup Makefiles (#265)
- add new target "make mfkey" to build mfkey32 and mfkey64
- include above when "make all"
- fix Qt detection for Kali Linux
- create and use dependency files when building client
- create client/lualibs/usb_cmd.lua from include/usb_cmd.h when building client
- add Windows *.exe files with "make tarbin"
- For the time being don't include Makefile.common in Makefile and client/Makefile
- set com3 as default flashing port for Windows (including mingw)
- remove static targets snooper and cli. Remove their sources as well.
2017-03-31 16:04:04 +02:00
marshmellow42 b642ce7ab5 Merge pull request #264 from qweenwasabi/master
Update README.txt
2017-03-30 23:12:22 -04:00
marshmellow42 fa2aab705b Fix data mtrim (#262)
I don't even know what happened there...
2017-03-30 22:23:02 +02:00
Jacky 425b6c0eb0 Update README.txt 2017-03-30 12:51:49 -07:00
marshmellow42 3991b2ec6a Fix data mtrim
I don't even know what happened there...
2017-03-30 12:05:03 -04:00
m2otech 1f1f1955dc Fixed compile error in MinGW (#260)
* Fixed compile error in MinGW

Some versions of MinGW miss some definitions. In order to be able to
compile I redefined a function and added an explicit include. It is only
a quick workaround, as other people also seemed to have the same
problem. It should be checked whether a better solution is possible.

* Removed _ftime_s redefine, calling _ftime directly
2017-03-30 03:39:39 +02:00
Iceman f25c62c5ec Merge pull request #256 from pwpiwi/fast_select
add: iceman1001's idea to reuse @pwpiwi's fast select without anticol…
2017-03-29 17:36:37 +02:00
Iceman 06da1c3f4b Merge pull request #259 from marshmellow42/master
fix/update removeParity & fix securakey detection
2017-03-29 17:12:55 +02:00
marshmellow42 f2ea55fb3c fix/update removeParity & fix securakey detection 2017-03-29 10:02:29 -04:00
Iceman 2938b3cb12 Merge pull request #258 from marshmellow42/master
Add lf jablotron & lf noralsy tag definitions/cmds
2017-03-29 07:39:40 +02:00
marshmellow42 c3caf0409c add lf securakey
still unknown - checksum and how FC relates to printed FC/Code

also removed noralsy extra ST check (i was tired...)
2017-03-29 00:37:16 -04:00
marshmellow42 199c74a47f fix build error on kali in new noralsy 2017-03-28 18:15:43 -04:00
marshmellow42 a9968da347 add jablotron+noralsy lf tag definitions/cmds
Thanks to @iceman1001 for most of the code.
Jablotron is complete
noralsy is mostly known - a few bits are still unknown.
2017-03-28 18:01:45 -04:00
Iceman 160dba8697 Merge pull request #257 from marshmellow42/master
split lf paradox/nexwatch into own files
2017-03-28 16:04:27 +02:00
marshmellow42 b2f565142c fix copy paste header issue
thanks @iceman101 for noticing.
since i forgot to remove it from cmddata.h it didn't show during
compile.
2017-03-28 09:11:29 -04:00