From 86f66b9887f88f83d4a4d742695c8b485feb9e12 Mon Sep 17 00:00:00 2001 From: omer Date: Sat, 5 Aug 2017 22:01:15 +0300 Subject: [PATCH 1/4] Added docker file --- .gitignore | 1 + Dockerfile | 18 ++++++++++++++++++ requirements.txt | 2 ++ 3 files changed, 21 insertions(+) create mode 100644 .gitignore create mode 100644 Dockerfile create mode 100644 requirements.txt diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9c95fc0 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +MFRC522.pyc diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..34aa050 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,18 @@ +FROM armv7/armhf-ubuntu +RUN apt-get update && apt-get install -y \ + python \ + python-dev \ + python-pip \ + python-virtualenv \ + python-setuptools \ + gcc-multilib \ + git \ + ssh \ + --no-install-recommends \ + && pip install --upgrade pip \ + && pip install wheel +WORKDIR /usr/app +COPY requirements.txt /usr/app +RUN pip install -r requirements.txt +COPY . /usr/app +CMD python Read.py diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..7d616f4 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,2 @@ +RPi.GPIO==0.6.3 +-e git+https://github.com/lthiery/SPI-Py.git#egg=spi-pi From 68963702c1cc9718c0fc3a6c666cd3e1d65adaa5 Mon Sep 17 00:00:00 2001 From: Marek2k17 Date: Tue, 20 Mar 2018 10:55:12 +0100 Subject: [PATCH 2/4] replace number with variable i googled for changing the pin 22, i only found a hint to line 10 so i changed line 113 to use the variable from line 10 instead of the number --- MFRC522.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MFRC522.py b/MFRC522.py index 6f157c2..ade1620 100644 --- a/MFRC522.py +++ b/MFRC522.py @@ -110,7 +110,7 @@ class MFRC522: def __init__(self, dev='/dev/spidev0.0', spd=1000000): spi.openSPI(device=dev,speed=spd) GPIO.setmode(GPIO.BOARD) - GPIO.setup(22, GPIO.OUT) + GPIO.setup(NRSTPD, GPIO.OUT) GPIO.output(self.NRSTPD, 1) self.MFRC522_Init() From 05360ac73b93fcb04e74035154057e05109b7233 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mario=20G=C3=B3mez?= Date: Tue, 20 Mar 2018 08:38:16 -0600 Subject: [PATCH 3/4] Added missing License information (LGPL v3) --- Dump.py | 20 +++++++ LICENSE.txt | 166 ++++++++++++++++++++++++++++++++++++++++++++++++++++ MFRC522.py | 20 +++++++ Read.py | 20 +++++++ Write.py | 20 +++++++ 5 files changed, 246 insertions(+) create mode 100644 LICENSE.txt diff --git a/Dump.py b/Dump.py index ba7333a..be825b1 100644 --- a/Dump.py +++ b/Dump.py @@ -1,5 +1,25 @@ #!/usr/bin/env python # -*- coding: utf8 -*- +# +# Copyright 2014,2018 Mario Gomez +# +# This file is part of MFRC522-Python +# MFRC522-Python is a simple Python implementation for +# the MFRC522 NFC Card Reader for the Raspberry Pi. +# +# MFRC522-Python is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# MFRC522-Python is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with MFRC522-Python. If not, see . +# import RPi.GPIO as GPIO import MFRC522 diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..5357f69 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,166 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. + diff --git a/MFRC522.py b/MFRC522.py index 6f157c2..209e92d 100644 --- a/MFRC522.py +++ b/MFRC522.py @@ -1,5 +1,25 @@ #!/usr/bin/env python # -*- coding: utf8 -*- +# +# Copyright 2014,2018 Mario Gomez +# +# This file is part of MFRC522-Python +# MFRC522-Python is a simple Python implementation for +# the MFRC522 NFC Card Reader for the Raspberry Pi. +# +# MFRC522-Python is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# MFRC522-Python is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with MFRC522-Python. If not, see . +# import RPi.GPIO as GPIO import spi diff --git a/Read.py b/Read.py index 964cd47..e91d49e 100644 --- a/Read.py +++ b/Read.py @@ -1,5 +1,25 @@ #!/usr/bin/env python # -*- coding: utf8 -*- +# +# Copyright 2014,2018 Mario Gomez +# +# This file is part of MFRC522-Python +# MFRC522-Python is a simple Python implementation for +# the MFRC522 NFC Card Reader for the Raspberry Pi. +# +# MFRC522-Python is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# MFRC522-Python is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with MFRC522-Python. If not, see . +# import RPi.GPIO as GPIO import MFRC522 diff --git a/Write.py b/Write.py index d754463..e378897 100644 --- a/Write.py +++ b/Write.py @@ -1,5 +1,25 @@ #!/usr/bin/env python # -*- coding: utf8 -*- +# +# Copyright 2014,2018 Mario Gomez +# +# This file is part of MFRC522-Python +# MFRC522-Python is a simple Python implementation for +# the MFRC522 NFC Card Reader for the Raspberry Pi. +# +# MFRC522-Python is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# MFRC522-Python is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with MFRC522-Python. If not, see . +# import RPi.GPIO as GPIO import MFRC522 From f8a3b661dc9d81b11d52a345cd5ba451dc6645c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mario=20G=C3=B3mez?= Date: Tue, 20 Mar 2018 08:47:53 -0600 Subject: [PATCH 4/4] Added status of development on README.md --- README.md | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 699a45d..a99d869 100644 --- a/README.md +++ b/README.md @@ -5,14 +5,18 @@ A small class to interface with the NFC reader Module MFRC522 on the Raspberry P This is a Python port of the example code for the NFC module MF522-AN. -##Requirements +**Important notice:** This library has not being actively updated in almost four years. +It might not work as intended on more recent Raspberry Pi devices. You might want to +take a look to the open pull-requests and forks to see other implementations and bug-fixes. + +# Requirements This code requires you to have SPI-Py installed from the following repository: https://github.com/lthiery/SPI-Py -##Examples +# Examples This repository includes a couple of examples showing how to read, write, and dump data from a chip. They are thoroughly commented, and should be easy to understand. -## Pins +# Pins You can use [this](http://i.imgur.com/y7Fnvhq.png) image for reference. | Name | Pin # | Pin name | @@ -26,5 +30,8 @@ You can use [this](http://i.imgur.com/y7Fnvhq.png) image for reference. | RST | 22 | GPIO25 | | 3.3V | 1 | 3V3 | -##Usage +# Usage Import the class by importing MFRC522 in the top of your script. For more info see the examples. + +# License +This code and examples are licensed under the GNU Lesser General Public License 3.0.