jarjar/libnfc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,195 Commits 3 Branches 26 Tags
master
Commit Graph
43 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Romuald Conty ddfe2e648a Merge pull request #517 from manu0401/timeout1 
Add missing timeout
 2018-11-13 11:31:54 +01:00
Romuald Conty 8e5ec4acf3 Merge pull request #383 from centromere/patch-2 
Fix typo in nfc.c
 2016-12-11 16:46:36 +01:00
Romuald Conty e0c72b782f Merge pull request #382 from centromere/patch-1 
Fix typo in nfc.h
 2016-12-11 16:46:04 +01:00
Romuald Conty 3592a60c1d Merge pull request #381 from llorephie/patch-1 
Update Makefile.am
 2016-12-11 16:45:22 +01:00
Romuald Conty e9a750fc00 Merge pull request #379 from oliv3r/Errata_on_i2c_timing 
drivers: pn532_i2c: Errata on i2c timing
 2016-12-06 17:58:30 +01:00
Romuald Conty b2a9cce037 Merge pull request #367 from oliv3r/respect_pn532_i2c_timing 
Respect pn532 i2c timing
 2016-12-05 22:12:52 +01:00
Romuald Conty c3b3f64224 Merge pull request #372 from timzi/fix-cmakelists 
Fixed file name "README" in cmakelists.txt
 2016-12-05 22:10:33 +01:00
Romuald Conty a07a496234 Merge pull request #378 from BourgeoisLab/patch-1 
Match nfc.h
 2016-12-05 19:50:49 +01:00
Romuald Conty 659f5f407f Merge pull request #357 from yerzhanm/patch-1 
added support for ACR1222U-C1
 2016-06-24 02:49:29 +02:00
Romuald Conty 403650a0fc Merge pull request #350 from oliv3r/master 
Allow mfultralight and mfc tools to work also with specific UID's
 2016-05-15 11:48:39 +02:00
Romuald Conty 83b70d6326 Merge pull request #349 from frankmorgner/foreign 
tell Automake that we will not follow GNU Standards
 2016-05-03 11:15:47 +02:00
Romuald Conty e23f8a9f9c Merge pull request #345 from quantum-x/ultralight-gen-2 
Adding support for UL Gen 2 Badges
 2016-04-09 11:25:11 +02:00
Romuald Conty e8e1826eeb Merge pull request #344 from hiddewie/markdown2 
Actual Markdown for the README and HACKING files
 2016-04-08 18:53:05 +02:00
Romuald Conty d63e624b09 Merge pull request #341 from hiddewie/markdown 
Changed a few README Markdown files to the .md extension so GitHub interprets it as Markdown
 2016-04-07 20:09:46 +02:00
Romuald Conty bc8bb8de89 Merge pull request #315 from xantares/travis 
Add travis config file
 2016-03-19 12:44:59 +01:00
Romuald Conty c228396c2d Merge pull request #337 from surr/typo 
Fix improper pnd->name initialization
 2016-03-19 12:43:32 +01:00
Romuald Conty 24979c65cc Merge pull request #327 from paulmenzel/fix-typo-in-readme 
README: Fix typo in *is a registered*
 2015-12-04 14:12:42 +01:00
Romuald Conty 42d455c4e7 Merge pull request #325 from quantum-x/master 
Extends nfc-mfultralight functionality (Magic cards, unattended mode)
 2015-11-19 00:02:04 +01:00
Romuald Conty 73c2ef8582 Merge pull request #323 from bhack/SCL3712 
Add SCM_SCL3712 support
 2015-11-04 20:34:21 +01:00
Romuald Conty 2046fb9461 Merge pull request #322 from quantum-x/quantum-x-unlockbehavior 
Unlock read/write magic card fallback
 2015-11-04 02:03:02 +01:00
Romuald Conty 48c271e49d Merge pull request #314 from xantares/patch-3 
CMake: use options() to disable examples and utils
 2015-09-01 09:13:45 +02:00
Romuald Conty 53edc32a21 Merge pull request #313 from xantares/patch-2 
CMake: use options() function
 2015-09-01 09:13:13 +02:00
Romuald Conty 4193bb4873 Merge pull request #312 from xantares/patch-1 
set default cmake build type
 2015-09-01 09:12:43 +02:00
Romuald Conty 555f9ce4cf Fixes #286: udev rule was executed to early 2015-08-19 11:50:52 +02:00
Romuald Conty 792e3d9cbd Do not include extra header in nfc.h 
Fixes #310
 2015-08-19 11:47:22 +02:00
Romuald Conty 13fee61e87 Fix typo 
Closes #309
 2015-08-19 11:44:23 +02:00
Romuald Conty 738970c135 Merge pull request #304 from xaqq/drop_pcre 
Drop PCRE dependency.
 2015-08-04 10:14:01 +02:00
Romuald Conty c55bbec50d Merge pull request #306 from Mincka/master 
Fix nfc-poll card removing check
 2015-08-03 17:43:54 +02:00
Romuald Conty 6be73720fa Merge pull request #301 from xantares/patch-1 
CMake: fix drivers include
 2015-06-23 06:43:26 +02:00
Romuald Conty 7f23f1f84d Merge pull request #297 from mativait/master 
export iso14443b* symbols
 2015-06-09 14:39:07 +02:00
Romuald Conty fecc19de4c Merge pull request #296 from cyberbobs/master 
Fix nfc_initiator_poll_target without tag on PN532
 2015-05-26 11:17:28 +02:00
Romuald Conty af8fe86b0d Git: ignore generated files 2015-05-18 20:43:32 +02:00
Romuald Conty d028bc725d Fix comparison when nfc_initiator_target_is_present() with a specified target 2015-05-18 20:43:10 +02:00
Romuald Conty 22078a8509 Documentation: fix str_nfc_target() explanation 2015-05-18 20:08:33 +02:00
Romuald Conty 33ce39ff71 nfc-relay-picc: fix wrong open mode for file descriptor 
Fixes #280
 2015-04-30 14:33:59 +02:00
Romuald Conty 8fbedb87f5 Update links from googlecode to github. 2015-04-30 14:19:03 +02:00
Romuald Conty c31f8bd9be Doc: minor documentation fixes 2015-04-28 19:22:16 +02:00
Romuald Conty 0f77565a3c Fix cmake soversion (doesn't match autotools) 
Thanks to Julien Schueller
 2015-04-15 17:19:42 +02:00
Romuald Conty 1fe7c00e48 Git: ignore utils/nfc-jewel 2015-04-15 17:13:54 +02:00
Romuald Conty fce491c829 README: add a section to help to configure libnfc 2015-04-15 17:11:11 +02:00
Romuald Conty f82aa75072 Merge remote-tracking branch 'socram8888/cygfix' 2015-04-14 17:16:20 +02:00
Romuald Conty eeb226aceb Merge pull request #290 from neffs/master 
Use more serial devices on Mac OS X
 2015-04-07 11:01:07 +02:00
Romuald Conty a7fc1bddaf Fix nfc_target_init() timeout return 
This patch prevent from returning a successfull error code while timeout occurred.

Thanks to blck on forum:
http://www.libnfc.org/community/post/4913/#p4913
 2013-12-06 16:03:00 +01:00