Skip to content

Commit

Permalink
Merge pull request #19 from oddstr13/pr-dual-license-1
Browse files Browse the repository at this point in the history
  • Loading branch information
Strooom authored Oct 20, 2024
2 parents 16bb8b3 + bfe2422 commit cd8197a
Show file tree
Hide file tree
Showing 10 changed files with 1,141 additions and 7 deletions.
1 change: 0 additions & 1 deletion LICENSE

This file was deleted.

438 changes: 438 additions & 0 deletions LICENSE-CC-BY-NC-SA-40.txt

Large diffs are not rendered by default.

674 changes: 674 additions & 0 deletions LICENSE-GPL-30.txt

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
SPDX-License-Identifier: CC-BY-NC-SA-4.0 OR GPL-3.0-or-later

This library is dual-licensed under the GNU General Public License v3.0 (or later)
OR Creative Commons Attribution Non Commercial Share Alike 4.0 International.
You may choose either license at your option.

See LICENSE-CC-BY-NC-SA-40.txt and LICENSE-GPL-30.txt for the full license texts.
11 changes: 11 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,14 @@ Library/Driver for NXP PN7150 NFC device
All documentation is in the Repository Wiki : https://github.com/Strooom/PN7150/wiki

I need help : the NFC-Forum specifications are only free of charge for members. In order to improve and extend this driver, I need more and more recent specs. Please contact me if you are willing to share a copy with me. Thanks!


## License

This library is dual-licensed under the GNU General Public License v3.0 (or later)
OR Creative Commons Attribution Non Commercial Share Alike 4.0 International.
You may choose either license at your option.

See `LICENSE-CC-BY-NC-SA-40.txt` and `LICENSE-GPL-30.txt` for the full license texts.

SPDX-License-Identifier: CC-BY-NC-SA-4.0 OR GPL-3.0-or-later
3 changes: 2 additions & 1 deletion src/NCI.h
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
#pragma once

// SPDX-License-Identifier: CC-BY-NC-SA-4.0 OR GPL-3.0-or-later
// #############################################################################
// ### ###
// ### NXP PN7150 Driver ###
// ### ###
// ### https://github.com/Strooom/PN7150 ###
// ### Author(s) : Pascal Roobrouck - @strooom ###
// ### License : https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode ###
// ### License : CC-BY-NC-SA-4.0 OR GPL-3.0-or-later ###
// ### ###
// ### Credits : Thomas Buhot, for his PN7120 library, the predecessor of ###
// ### the PN7150. Due to the NFC Specs not being available for free, I used ###
Expand Down
5 changes: 3 additions & 2 deletions src/PN7150Interface.cpp
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
// SPDX-License-Identifier: CC-BY-NC-SA-4.0 OR GPL-3.0-or-later
// #############################################################################
// ### ###
// ### NXP PN7150 Driver ###
// ### ###
// ### https://github.com/Strooom/PN7150 ###
// ### Author(s) : Pascal Roobrouck - @strooom ###
// ### License : https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode ###
// ### License : CC-BY-NC-SA-4.0 OR GPL-3.0-or-later ###
// ### ###
// #############################################################################

Expand All @@ -27,7 +28,7 @@ void PN7150Interface::initialize(void)
pinMode(VEN, OUTPUT); // VEN controls the PN7150's mode, so is an output

// PN7150 Reset procedure : see PN7150 datasheet 12.6.1, 12.6.2.2, Fig 18 and 16.2.2
digitalWrite(VEN, LOW); // drive VEN LOW...
digitalWrite(VEN, LOW); // drive VEN LOW...
delay(1); // ...for at least 10us
digitalWrite(VEN, HIGH); // then VEN HIGH again, and wait for 2.5 ms for the device to boot and allow communication
delay(3);
Expand Down
3 changes: 2 additions & 1 deletion src/PN7150Interface.h
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
#pragma once

// SPDX-License-Identifier: CC-BY-NC-SA-4.0 OR GPL-3.0-or-later
// #############################################################################
// ### ###
// ### NXP PN7150 Driver ###
// ### ###
// ### https://github.com/Strooom/PN7150 ###
// ### Author(s) : Pascal Roobrouck - @strooom ###
// ### License : https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode ###
// ### License : CC-BY-NC-SA-4.0 OR GPL-3.0-or-later ###
// ### ###
// #############################################################################

Expand Down
3 changes: 2 additions & 1 deletion src/Tag.cpp
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
// SPDX-License-Identifier: CC-BY-NC-SA-4.0 OR GPL-3.0-or-later
// #############################################################################
// ### ###
// ### NXP PN7150 Driver ###
// ### ###
// ### https://github.com/Strooom/PN7150 ###
// ### Author(s) : Pascal Roobrouck - @strooom ###
// ### License : https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode ###
// ### License : CC-BY-NC-SA-4.0 OR GPL-3.0-or-later ###
// ### ###
// #############################################################################

Expand Down
3 changes: 2 additions & 1 deletion src/Tag.h
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
#pragma once

// SPDX-License-Identifier: CC-BY-NC-SA-4.0 OR GPL-3.0-or-later
// #############################################################################
// ### ###
// ### NXP PN7150 Driver ###
// ### ###
// ### https://github.com/Strooom/PN7150 ###
// ### Author(s) : Pascal Roobrouck - @strooom ###
// ### License : https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode ###
// ### License : CC-BY-NC-SA-4.0 OR GPL-3.0-or-later ###
// ### ###
// ### Credits : Thomas Buhot, for his PN7120 library, the predecessor of ###
// ### the PN7150. Due to the NFC Specs not being available for free, I used ###
Expand Down

0 comments on commit cd8197a

Please sign in to comment.