Commit Graph

386 Commits

Author SHA1 Message Date
Miki Balboa
55feec4399 Merge pull request #190 from Rotzbua/patch-collision
fix #182 , extend travis
2016-02-18 09:23:15 -08:00
Rotzbua
7f78c5cffe Merge branch 'new-travis' into patch-collision 2016-02-15 17:33:17 +01:00
Rotzbua
4bf0cb872f Merge branch 'master' into new-travis 2016-02-15 17:27:58 +01:00
Rotzbua
e090099081 Merge branch 'upstream/master' 2016-02-15 17:25:41 +01:00
Rotzbua
7d4cf94e38 extend travis test for different boards
- add notice to readme for compatible boards
2016-02-15 17:24:42 +01:00
Rotzbua
fda5380a7a add output SAK to dump functions 2016-02-15 16:25:48 +01:00
Miguel Balboa
24ca93a642 Bump Version to 1.1.8 2016-02-11 09:34:54 -08:00
Miki Balboa
074d42a34a Merge pull request #187 from lmmeng/master
Interrupt example. 
Thank you @lmmeng , very helpful.
2016-02-11 09:15:53 -08:00
Rotzbua
543d08f5d8 make some fct static
save some bytes flash
2016-02-10 14:28:43 +01:00
Rotzbua
4f311b60f4 upd README
smal table change -> leonardo took too much space -> break
2016-02-08 18:35:39 +01:00
liviu
2bfb6481c0 Interrupt example. 2016-02-03 19:14:06 +01:00
Miki Balboa
7f6c9ebad2 Merge pull request #185 from BenWiederhake/master
Add gitignore
Thank you @BenWiederhake
2016-02-03 10:00:59 -08:00
Miki Balboa
86fc3e5c61 Merge pull request #183 from jkutianski/patch-1
Update README.rst
Thank you @jkutianski
2016-02-03 09:59:25 -08:00
Ben Wiederhake
7fcc353411 Add gitignore
This allows the project to be more easily used as a subproject.
2016-02-01 22:42:03 +01:00
Rotzbua
8ecb98cfd5 tweak enum
save flash
2016-01-31 23:48:24 +01:00
Rotzbua
8bcfef72ab fix #182 PICC_Select - collision 2016-01-29 14:40:46 +01:00
Juan Pablo Kutianski
4af4db6b4a Update README.rst
Added Teensy 2.0 & Tensy++ 2.0 pinouts
2016-01-26 21:07:49 -03:00
Miguel Balboa
fc40e78a79 Bump Version to 1.1.7 2016-01-19 09:55:24 -08:00
Miki Balboa
e9ea8b9335 Merge pull request #176 from Rotzbua/master
fix compile error
Thank you @Rotzbua
2016-01-19 09:38:50 -08:00
Rotzbua
7014f3dc71 fix old return type
byte -> MFRC522:::PICC_Type
2016-01-19 18:03:05 +01:00
Miguel Balboa
9f6a078290 Merge branch 'stefanblommaert-master' 2016-01-19 08:51:51 -08:00
Miguel Balboa
7c9f07cd74 Merged github.com/stefanblommaert/rfid.git 2016-01-19 08:51:36 -08:00
Miki Balboa
b6c7a8b153 Merge pull request #174 from techied/master
Rename servo.ino
Perfect! Thank you @techied
2016-01-19 08:43:23 -08:00
techied
032d806a8c Renamed files
Renamed the servo.ino file to servo_motor.ino file as per request and
updated the .travis.yml
2016-01-18 21:52:48 -08:00
techied
f799de3354 Merge remote-tracking branch 'refs/remotes/miguelbalboa/master' 2016-01-18 21:51:04 -08:00
stefanblommaert
42a6f1b06c Update .travis.yml 2016-01-16 12:05:06 +01:00
Miki Balboa
f5535c2d1a Merge pull request #171 from cuthbertnibbles/master
README.rst Spelling and Grammar Tweak
Looks good, Thank you @cuthbertnibbles .
2016-01-15 17:42:04 -08:00
Cuthbert Nibbles
5aacf801ee Merge branch 'refs/heads/master-README-tweak' 2016-01-15 18:09:20 -05:00
Cuthbert Nibbles
3e80ecea0a Various Spelling and Punctuation Tweaks to README.rst
This is my first co
2016-01-15 18:08:06 -05:00
Miki Balboa
2d67517399 Merge pull request #167 from techied/master
Add servo.ino file
Thank you for the example @techied , Looks Great and passed Travis,
@Rotzbua Let me standardize the naming in another pull request, Thanks for the suggestion.
2016-01-15 09:04:23 -08:00
stefanblommaert
4b7c52f9d6 Copy from rfid cards with standard authentication 2016-01-15 12:17:26 +01:00
techied
356130f58d Update .travis.yml 2016-01-14 19:09:41 -08:00
techied
5710e45251 servo folder
Made servo.ino it's own folder
2016-01-14 19:05:52 -08:00
techied
dc17429af0 Update .travis.yml 2016-01-14 19:03:14 -08:00
Miguel Balboa
73d86f0304 Bump Version to 1.1.6 2016-01-14 10:14:47 -08:00
Miguel Balboa
4c3efeb1cd Bump Version to 1.1.6 2016-01-06 01:34:40 -08:00
techied
77b6581bfe Add servo.ino file
This file will control a servo instead of a relay.
2016-01-05 16:55:31 -08:00
Miki Balboa
c9becf47cb Merge pull request #164 from Rotzbua/master
fix compile error #163
You are the one, thank you again @Rotzbua
2016-01-05 09:11:28 -08:00
Rotzbua
29cc669a68 code format
use 2 space for 1 tab like arduino ide
2016-01-05 11:57:36 +01:00
Rotzbua
f9da64e844 fix compile error #163 2016-01-05 11:40:37 +01:00
Miguel Balboa
04d8300727 Added examples/ReadNUID/ReadNUID.ino to .travis.yml 2016-01-04 23:17:53 -08:00
Miguel Balboa
4bdeebf4f9 Bump Version to 1.1.5 2016-01-04 23:02:54 -08:00
Miki Balboa
fa913d07fc Merge pull request #163 from sophiekovalevsky/kn-features
Add new example. store NUID of a different PICC.
Perfecto! Gracias @sophiekovalevsky
2016-01-04 22:50:15 -08:00
Miki Balboa
efc81dfb43 Merge pull request #152 from sophiekovalevsky/spi
Use settings functions on SPI libraries.
Looks great,
Thank you @sophiekovalevsky for you work, and thank you @lmmeng for testing it.
2016-01-04 22:47:54 -08:00
Kiara Navarro
e1a7948560 Change comments to english. 2016-01-04 13:29:10 -05:00
Kiara Navarro
14f00d518a Add comment to the NUIDRead. 2016-01-04 13:05:29 -05:00
Miguel Balboa
35ab8d0420 Bump Version to 1.1.4 2016-01-03 23:53:38 -08:00
Miki Balboa
373041478b Merge pull request #162 from Rotzbua/example-codestyle
Upd some examples codestyle
Everything looks good, thank you @Rotzbua
2016-01-03 23:40:07 -08:00
Miki Balboa
82a53bf041 Merge pull request #161 from Rotzbua/master
change byte -> PICC_Type & add firmware version print to serial
2016-01-03 23:37:45 -08:00
Rotzbua
b73457cad1 upd codestyle example
- make examples more equal
2016-01-04 07:03:24 +01:00