proxmark3-svn
5 years agomore fixes to USB communication 287/head
pwpiwi [Mon, 24 Apr 2017 16:16:47 +0000 (18:16 +0200)]
more fixes to USB communication
- use modified UDP_GET/UDP_SET_EP_FLAGS macros from @iceman1001's branch

5 years agofix USB descriptors
pwpiwi [Mon, 24 Apr 2017 12:19:39 +0000 (14:19 +0200)]
fix USB descriptors
- indicate compliance with USB release 2.0
- set correct vendor and product IDs
- indicate power consumption (500mA)
- add String Descriptor 0 indicating supported languages
- add String Descriptors for Manufacturer and Product

5 years agoMerge pull request #281 from brianredbeard/lf-script
marshmellow42 [Thu, 20 Apr 2017 17:17:29 +0000 (13:17 -0400)]
Merge pull request #281 from brianredbeard/lf-script

contrib: LF Programming script

5 years agoMerge pull request #277 from pwpiwi/clang_warnings
pwpiwi [Wed, 19 Apr 2017 16:11:46 +0000 (18:11 +0200)]
Merge pull request #277 from pwpiwi/clang_warnings

fix clang compiler warnings (including fixing a bug revealed in cmdhftopaz.c)

5 years agoMerge pull request #282 from Proxmark/graphwork2
pwpiwi [Wed, 19 Apr 2017 16:11:07 +0000 (18:11 +0200)]
Merge pull request #282 from Proxmark/graphwork2

Implement graph improvements

5 years agoRemove built file 282/head
marshmellow42 [Wed, 19 Apr 2017 03:59:40 +0000 (23:59 -0400)]
Remove built file

5 years agofix .gitignore changes
marshmellow42 [Wed, 19 Apr 2017 03:43:42 +0000 (23:43 -0400)]
fix .gitignore changes

5 years agofix makefile to allow make of overlays.ui
marshmellow42 [Wed, 19 Apr 2017 03:41:38 +0000 (23:41 -0400)]
fix makefile to allow make of overlays.ui

to ui_overlays.h
add ui_overlays.h to .gitignore
should now compile to whatever qt version you have. (as long as it is
compatible with the overlays.ui file...)

5 years agocontrib: LF Programming script 281/head
Brian 'Redbeard' Harrington [Tue, 18 Apr 2017 15:24:42 +0000 (08:24 -0700)]
contrib: LF Programming script

Submitting a well documented Lua script whose purpose is to do
bulk, repeated, sequential programming of RFID tags.  Could be useful
for users of the ACCX Open Access 4.0 or other simple RFID systems.

Tags programmed with this would potentially be vulnerabile to bisection
attacks, etc... But honestly, they likely would have been anyway.

To use run from within the proxmark3 client:

```
proxmark3> script run lf_bulk_program.lua  -b 1000 -c 5 -f 23
--- Executing: lf_bulk_program.lua, args '-b 1000 -c 5 -f 23'
Press enter to program card 1000:23 (hex: 0020042e07d1)

Cloning tag with ID 20042e07d1
Press enter to program card 1001:23 (hex: 0020042e07d2)

Cloning tag with ID 20042e07d2
Press enter to program card 1002:23 (hex: 0020042e07d4)

Cloning tag with ID 20042e07d4
Press enter to program card 1003:23 (hex: 0020042e07d7)

Cloning tag with ID 20042e07d7
Press enter to program card 1004:23 (hex: 0020042e07d8)

Cloning tag with ID 20042e07d8

-----Finished
```

5 years agonew grid X offset calcs to fix some issues graphwork2
marshmellow42 [Mon, 17 Apr 2017 22:37:23 +0000 (18:37 -0400)]
new grid X offset calcs to fix some issues

also fixed a save_restore issue with grid alignments
now save_restoreGB() saves/restores offset values
added macro enumeration of SAVE vs RESTORE for save_restore commands.

5 years agofix y grid +
marshmellow42 [Sun, 16 Apr 2017 04:26:26 +0000 (00:26 -0400)]
fix y grid +

and move em4x50 saveGB to allow graph restore after lf search
clean up plotgraph unused code.
should be done for a bit...

5 years agoadjust lf search to not use save/restore if...
marshmellow42 [Sun, 16 Apr 2017 01:40:05 +0000 (21:40 -0400)]
adjust lf search to not use save/restore if...

offline or '1' entered
this allows the graph restore button to continue functioning after a `lf
search 1`

5 years agofinish FSK graph index changes
marshmellow42 [Sat, 15 Apr 2017 20:18:54 +0000 (16:18 -0400)]
finish FSK graph index changes

5 years agocannot seem to get uic to work for ...
marshmellow42 [Sat, 15 Apr 2017 17:40:49 +0000 (13:40 -0400)]
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...

5 years agoattempt ui_overlays.h qt4 version
marshmellow42 [Sat, 15 Apr 2017 17:12:56 +0000 (13:12 -0400)]
attempt ui_overlays.h qt4 version

5 years agoadd uic make ui_overlays.h
marshmellow42 [Fri, 14 Apr 2017 14:31:00 +0000 (10:31 -0400)]
add uic make ui_overlays.h

to makefile

5 years agomaybe fixed loading/unloading bug.
marshmellow42 [Fri, 14 Apr 2017 13:53:36 +0000 (09:53 -0400)]
maybe fixed loading/unloading bug.

5 years agoMerge pull request #278 from marshmellow42/graphwork
marshmellow42 [Thu, 13 Apr 2017 21:25:24 +0000 (17:25 -0400)]
Merge pull request #278 from marshmellow42/graphwork

Update Graphing Part1

5 years agoMerge branch 'graphwork2' into graphwork 278/head
marshmellow42 [Thu, 13 Apr 2017 21:24:33 +0000 (17:24 -0400)]
Merge branch 'graphwork2' into graphwork

5 years agoa few notation fixes
marshmellow42 [Thu, 13 Apr 2017 21:16:34 +0000 (17:16 -0400)]
a few notation fixes

5 years agocombine autocorr, dirth functions
marshmellow42 [Thu, 13 Apr 2017 14:33:18 +0000 (10:33 -0400)]
combine autocorr, dirth functions

fix lfdemod bug
add askedge to overlays (remove askdemod)

5 years agoupdate more demods for graphing
marshmellow42 [Wed, 12 Apr 2017 21:55:31 +0000 (17:55 -0400)]
update more demods for graphing

still todo fsk based tag demods (like HID, AWID, IO, Pyramid...)

5 years agoapply @holiman s graph changes +
marshmellow42 [Wed, 12 Apr 2017 18:35:07 +0000 (14:35 -0400)]
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...

5 years agoalign clock grid with demods on graph (#276)
marshmellow42 [Wed, 12 Apr 2017 03:48:49 +0000 (23:48 -0400)]
align clock grid with demods on graph (#276)

* align clock grid with demods on graph

* proper initialized values

5 years agoproper initialized values 276/head
marshmellow42 [Wed, 12 Apr 2017 01:51:31 +0000 (21:51 -0400)]
proper initialized values

5 years agofix clang compiler warnings (including fixing a bug revealed in cmdhftopaz.c) 277/head
pwpiwi [Tue, 11 Apr 2017 16:55:33 +0000 (18:55 +0200)]
fix clang compiler warnings (including fixing a bug revealed in cmdhftopaz.c)

5 years agoalign clock grid with demods on graph
marshmellow42 [Tue, 11 Apr 2017 14:34:43 +0000 (10:34 -0400)]
align clock grid with demods on graph

5 years agoavoid vast number of warnings with clang compiler
pwpiwi [Tue, 11 Apr 2017 05:05:22 +0000 (07:05 +0200)]
avoid vast number of warnings with clang compiler

5 years agoCompatibility fixes for Qt5 (#271)
pwpiwi [Tue, 11 Apr 2017 04:58:20 +0000 (06:58 +0200)]
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)

5 years agoMerge branch 'master' of https://github.com/Proxmark/proxmark3
pwpiwi [Mon, 10 Apr 2017 17:37:05 +0000 (19:37 +0200)]
Merge branch 'master' of https://github.com/Proxmark/proxmark3

5 years agofix missing terminating 0 in my_executable_directory (thanks @iceman1001).
pwpiwi [Mon, 10 Apr 2017 16:39:33 +0000 (18:39 +0200)]
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().

5 years agoMerge pull request #274 from marshmellow42/master
pwpiwi [Mon, 10 Apr 2017 16:01:04 +0000 (18:01 +0200)]
Merge pull request #274 from marshmellow42/master

lf read adjustments

5 years agofix length test 274/head
marshmellow42 [Mon, 10 Apr 2017 15:38:11 +0000 (11:38 -0400)]
fix length test

thanks @pwpiwi for catching what i missed.

5 years agofix silent option for getSamples
marshmellow42 [Fri, 7 Apr 2017 22:10:01 +0000 (18:10 -0400)]
fix silent option for getSamples

5 years agoupdate changelog
marshmellow42 [Fri, 7 Apr 2017 22:05:23 +0000 (18:05 -0400)]
update changelog

5 years agofix buffer length bugs
marshmellow42 [Fri, 7 Apr 2017 22:00:55 +0000 (18:00 -0400)]
fix buffer length bugs

adjust lf search a little as to when the chiptype check happens

5 years agofix pskclockdetect bug
marshmellow42 [Fri, 7 Apr 2017 21:41:22 +0000 (17:41 -0400)]
fix pskclockdetect bug

5 years agolf read adjustments
marshmellow42 [Fri, 7 Apr 2017 21:28:12 +0000 (17:28 -0400)]
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

5 years agono longer need doT55x7Acquisition...
marshmellow42 [Thu, 6 Apr 2017 01:37:04 +0000 (21:37 -0400)]
no longer need doT55x7Acquisition...

5 years agoadjust t55x7 testmode write timing
marshmellow42 [Thu, 6 Apr 2017 01:19:48 +0000 (21:19 -0400)]
adjust t55x7 testmode write timing

5 years agoMerge pull request #268 from marshmellow42/master
Iceman [Wed, 5 Apr 2017 13:41:16 +0000 (15:41 +0200)]
Merge pull request #268 from marshmellow42/master

various lf bug fixes and improvements

5 years agofix command help 268/head
marshmellow42 [Tue, 4 Apr 2017 21:34:15 +0000 (17:34 -0400)]
fix command help

add comments in changelog

5 years agofix bug in st detect +
marshmellow42 [Tue, 4 Apr 2017 21:22:21 +0000 (17:22 -0400)]
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.

5 years agolf improvements
marshmellow42 [Tue, 4 Apr 2017 15:52:10 +0000 (11:52 -0400)]
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

5 years agoMerge pull request #266 from marshmellow42/master
pwpiwi [Sat, 1 Apr 2017 07:44:17 +0000 (09:44 +0200)]
Merge pull request #266 from marshmellow42/master

a few more tools for em4x05 writing

5 years agoadd verification data was entered-lf em 4x05 write 266/head
marshmellow42 [Fri, 31 Mar 2017 16:52:30 +0000 (12:52 -0400)]
add verification data was entered-lf em 4x05 write

5 years agofix return value for error.
marshmellow42 [Fri, 31 Mar 2017 16:22:30 +0000 (12:22 -0400)]
fix return value for error.

5 years agoMerge remote-tracking branch 'upstream/master'
marshmellow42 [Fri, 31 Mar 2017 16:18:50 +0000 (12:18 -0400)]
Merge remote-tracking branch 'upstream/master'

5 years agoa few more tools for em4x05 writing.
marshmellow42 [Fri, 31 Mar 2017 16:14:28 +0000 (12:14 -0400)]
a few more tools for em4x05 writing.

ready to begin coding cloning cmds to em4x05.

5 years agoUpdate/cleanup Makefiles (#265)
pwpiwi [Fri, 31 Mar 2017 14:04:04 +0000 (16:04 +0200)]
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.

5 years agoMerge pull request #264 from qweenwasabi/master
marshmellow42 [Fri, 31 Mar 2017 03:12:22 +0000 (23:12 -0400)]
Merge pull request #264 from qweenwasabi/master

Update README.txt

5 years agoFix data mtrim (#262)
marshmellow42 [Thu, 30 Mar 2017 20:23:02 +0000 (16:23 -0400)]
Fix data mtrim (#262)

I don't even know what happened there...

5 years agoUpdate README.txt 264/head
Jacky [Thu, 30 Mar 2017 19:51:49 +0000 (12:51 -0700)]
Update README.txt

5 years agoFix data mtrim 262/head
marshmellow42 [Thu, 30 Mar 2017 16:05:03 +0000 (12:05 -0400)]
Fix data mtrim

I don't even know what happened there...

5 years agoFixed compile error in MinGW (#260)
m2otech [Thu, 30 Mar 2017 01:39:39 +0000 (03:39 +0200)]
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

5 years agoMerge pull request #256 from pwpiwi/fast_select
Iceman [Wed, 29 Mar 2017 15:36:37 +0000 (17:36 +0200)]
Merge pull request #256 from pwpiwi/fast_select

add: iceman1001's idea to reuse @pwpiwi's fast select without anticol…

5 years agoMerge pull request #259 from marshmellow42/master
Iceman [Wed, 29 Mar 2017 15:12:55 +0000 (17:12 +0200)]
Merge pull request #259 from marshmellow42/master

fix/update removeParity & fix securakey detection

5 years agofix/update removeParity & fix securakey detection 259/head
marshmellow42 [Wed, 29 Mar 2017 14:02:29 +0000 (10:02 -0400)]
fix/update removeParity & fix securakey detection

5 years agoMerge pull request #258 from marshmellow42/master
Iceman [Wed, 29 Mar 2017 05:39:40 +0000 (07:39 +0200)]
Merge pull request #258 from marshmellow42/master

Add lf jablotron & lf noralsy tag definitions/cmds

5 years agoadd lf securakey 258/head
marshmellow42 [Wed, 29 Mar 2017 04:37:16 +0000 (00:37 -0400)]
add lf securakey

still unknown - checksum and how FC relates to printed FC/Code

also removed noralsy extra ST check (i was tired...)

5 years agofix build error on kali in new noralsy
marshmellow42 [Tue, 28 Mar 2017 22:15:43 +0000 (18:15 -0400)]
fix build error on kali in new noralsy

5 years agoadd jablotron+noralsy lf tag definitions/cmds
marshmellow42 [Tue, 28 Mar 2017 22:01:45 +0000 (18:01 -0400)]
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.

5 years agoMerge pull request #257 from marshmellow42/master
Iceman [Tue, 28 Mar 2017 14:04:27 +0000 (16:04 +0200)]
Merge pull request #257 from marshmellow42/master

split lf paradox/nexwatch into own files

5 years agofix copy paste header issue 257/head
marshmellow42 [Tue, 28 Mar 2017 13:11:29 +0000 (09:11 -0400)]
fix copy paste header issue

thanks @iceman101 for noticing.
since i forgot to remove it from cmddata.h it didn't show during
compile.

5 years agosplit lf paradox/nexwatch into own files
marshmellow42 [Mon, 27 Mar 2017 22:04:20 +0000 (18:04 -0400)]
split lf paradox/nexwatch into own files

see changelog.md for cli changes!

5 years agoadd: iceman1001's idea to reuse @pwpiwi's fast select without anticollision to speedu... 256/head
pwpiwi [Mon, 27 Mar 2017 08:28:06 +0000 (10:28 +0200)]
add: iceman1001's idea to reuse @pwpiwi's fast select without anticollision to speedup hf mf chk
(see http://www.proxmark.org/forum/viewtopic.php?id=2920)

5 years agoMerge pull request #254 from marshmellow42/master
Iceman [Sun, 26 Mar 2017 21:39:37 +0000 (23:39 +0200)]
Merge pull request #254 from marshmellow42/master

fix indentation warning

5 years agofix indentation warning 254/head
marshmellow42 [Sun, 26 Mar 2017 21:35:16 +0000 (17:35 -0400)]
fix indentation warning

thanks to piwi for finding.

5 years agoMerge pull request #253 from marshmellow42/master
marshmellow42 [Sun, 26 Mar 2017 17:35:32 +0000 (13:35 -0400)]
Merge pull request #253 from marshmellow42/master

fix missing header

5 years agofix missing header 253/head
marshmellow42 [Sun, 26 Mar 2017 17:34:38 +0000 (13:34 -0400)]
fix missing header

http://www.proxmark.org/forum/viewtopic.php?pid=26786#p26786

5 years agoMerge pull request #252 from marshmellow42/master
Iceman [Sun, 26 Mar 2017 13:24:07 +0000 (15:24 +0200)]
Merge pull request #252 from marshmellow42/master

adjust lf menu descriptions

5 years agoadjust lf menu descriptions 252/head
marshmellow42 [Sun, 26 Mar 2017 12:46:45 +0000 (08:46 -0400)]
adjust lf menu descriptions

RFIDs for tag formats that can be emulated by many chips
CHIPs for chip specific commands

5 years agoMerge pull request #251 from marshmellow42/master
Iceman [Sun, 26 Mar 2017 12:35:42 +0000 (14:35 +0200)]
Merge pull request #251 from marshmellow42/master

split fdx-b demod to its own file

5 years agosplit fdx-b demod to its own file 251/head
marshmellow42 [Sun, 26 Mar 2017 12:09:40 +0000 (08:09 -0400)]
split fdx-b demod to its own file

added @iceman1001 s read/sim/clone commands for fdx--b
check changelog.md for cli changes!

5 years agoMerge pull request #250 from pwpiwi/fix_mfkey
Iceman [Sun, 26 Mar 2017 11:05:26 +0000 (13:05 +0200)]
Merge pull request #250 from pwpiwi/fix_mfkey

fix mfkey tools (issue #247)

5 years agofix mfkey tools (issue #247) 250/head
pwpiwi [Sun, 26 Mar 2017 10:28:07 +0000 (12:28 +0200)]
fix mfkey tools (issue #247)
- add -std=c99 -D_ISOC99_SOURCE to compiler flags
- fix: include <string.h> instead of <strings.h> in mfkey64.c

5 years agoMerge pull request #249 from pwpiwi/parity
Iceman [Sun, 26 Mar 2017 06:28:43 +0000 (08:28 +0200)]
Merge pull request #249 from pwpiwi/parity

Refactor parity functions

5 years agoMerge pull request #248 from marshmellow42/master
Iceman [Sun, 26 Mar 2017 06:26:30 +0000 (08:26 +0200)]
Merge pull request #248 from marshmellow42/master

Split data askgproxiidemod to own file

5 years agoRefactor parity functions 249/head
pwpiwi [Fri, 24 Mar 2017 22:50:50 +0000 (23:50 +0100)]
Refactor parity functions
- get rid of __asm function in crapto1.h, use gcc builtin function instead
- make parity functions available in common directory

5 years agoSplit data askgproxiidemod to own file 248/head
marshmellow42 [Sat, 25 Mar 2017 19:51:31 +0000 (15:51 -0400)]
Split data askgproxiidemod to own file

added lf gproxii read (from antenna)
fixed a few copy paste issues in the comments of some lf files

5 years agoMerge pull request #246 from marshmellow42/master
Iceman [Sat, 25 Mar 2017 12:12:05 +0000 (13:12 +0100)]
Merge pull request #246 from marshmellow42/master

hitag sim fix

mea culpa.

5 years agohitag sim fix 246/head
marshmellow42 [Sat, 25 Mar 2017 11:49:53 +0000 (07:49 -0400)]
hitag sim fix

from
https://github.com/iceman1001/proxmark3/commit/e1778858ddc53a6a82e8ee24f02e6b673687f69a
and http://www.proxmark.org/forum/viewtopic.php?pid=26733#p26733
sim mode should not have the reader field on.

5 years agoMerge pull request #245 from marshmellow42/master
Iceman [Sat, 25 Mar 2017 06:28:53 +0000 (07:28 +0100)]
Merge pull request #245 from marshmellow42/master

split lf indala[cmd] to lf indala [cmd]

5 years agosplit lf indala[cmd] to lf indala [cmd] 245/head
marshmellow42 [Fri, 24 Mar 2017 23:18:33 +0000 (19:18 -0400)]
split lf indala[cmd] to lf indala [cmd]

see changelog.md for cli changes!

5 years agoMerge pull request #243 from pwpiwi/cleanup
Iceman [Fri, 24 Mar 2017 07:19:23 +0000 (08:19 +0100)]
Merge pull request #243 from pwpiwi/cleanup

Deduplicate mfkey32 and mfkey64

5 years agoRemove duplicate #include stdio.h 243/head
pwpiwi [Fri, 24 Mar 2017 06:53:52 +0000 (07:53 +0100)]
Remove duplicate #include stdio.h

5 years agoMerge pull request #244 from marshmellow42/master
Iceman [Fri, 24 Mar 2017 06:46:34 +0000 (07:46 +0100)]
Merge pull request #244 from marshmellow42/master

fix lf file includes to include own .h

5 years agofix lf file includes to include own .h 244/head
marshmellow42 [Fri, 24 Mar 2017 02:32:38 +0000 (22:32 -0400)]
fix lf file includes to include own .h

thanks @iceman1001 for noticing.

5 years agoDeduplicate mfkey32 and mfkey64
pwpiwi [Thu, 23 Mar 2017 17:06:14 +0000 (18:06 +0100)]
Deduplicate mfkey32 and mfkey64
- rename client/nonce2key.[ch] to mfkey.[ch]
- leave only main() wrapper in tools/mfkey
- add mfkey32 and mfkey64 to .gitignore

5 years agofix: compile issue on RasPi (http://www.proxmark.org/forum/viewtopic.php?id=4678)
pwpiwi [Thu, 23 Mar 2017 05:42:56 +0000 (06:42 +0100)]
fix: compile issue on RasPi (proxmark.org/forum/viewtopic.php?id=4678)

5 years agoMerge pull request #242 from marshmellow42/master
pwpiwi [Thu, 23 Mar 2017 05:38:22 +0000 (06:38 +0100)]
Merge pull request #242 from marshmellow42/master

move viking demod to respective file

5 years agomove viking demod to respective file 242/head
marshmellow42 [Thu, 23 Mar 2017 02:59:55 +0000 (22:59 -0400)]
move viking demod to respective file

see changelog.md for cli changes!

5 years agoMerge pull request #241 from pwpiwi/ukbhit_fix
Iceman [Wed, 22 Mar 2017 21:39:28 +0000 (22:39 +0100)]
Merge pull request #241 from pwpiwi/ukbhit_fix

fix: ukbhit() for OS X

5 years agoMerge pull request #240 from marshmellow42/master
pwpiwi [Wed, 22 Mar 2017 21:27:02 +0000 (22:27 +0100)]
Merge pull request #240 from marshmellow42/master

split io demod/pyramid demod to respective files

5 years agosplit io demod/pyramid demod to respective files 240/head
marshmellow42 [Wed, 22 Mar 2017 21:16:43 +0000 (17:16 -0400)]
split io demod/pyramid demod to respective files

out of cmddata.c / data cmds
see changelog.md for cli changes as options have changed!

5 years agofix: ukbhit() for OS X 241/head
pwpiwi [Wed, 22 Mar 2017 21:15:24 +0000 (22:15 +0100)]
fix: ukbhit() for OS X
- don't use CMIN and CTIME
- corrected comments

5 years agoMerge pull request #239 from marshmellow42/master
Iceman [Wed, 22 Mar 2017 20:02:52 +0000 (21:02 +0100)]
Merge pull request #239 from marshmellow42/master

split hid demod/awid demod to respective files

5 years agofix headers 239/head
marshmellow42 [Wed, 22 Mar 2017 19:54:32 +0000 (15:54 -0400)]
fix headers

5 years agosplit hid demod/awid demod to respective files
marshmellow42 [Wed, 22 Mar 2017 19:49:01 +0000 (15:49 -0400)]
split hid demod/awid demod to respective files

NOTE: see changelog.md for cli changes

5 years agoMerge pull request #237 from marshmellow42/master
Iceman [Wed, 22 Mar 2017 14:51:00 +0000 (15:51 +0100)]
Merge pull request #237 from marshmellow42/master

move em410x demods to cmdlfem4x.c from cmddata.c

Impressum, Datenschutz