Skip to content

Commit 81a2417

Browse files
author
brentru
committed
fix copyrightlicense
1 parent ee4f29a commit 81a2417

13 files changed

+20
-48
lines changed

examples/cellular/minimqtt_adafruitio_cellular.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
1-
<<<<<<< HEAD:examples/cellular/minimqtt_adafruitio_cellular.py
2-
# SPDX-FileCopyrightText: Tony DiCola for Adafruit Industries
3-
# SPDX-FileCopyrightText: 2020 Brent Rubell for Adafruit Industries
4-
#
5-
# SPDX-License-Identifier: Unlicense
6-
=======
71
# SPDX-FileCopyrightText: 2021 ladyada for Adafruit Industries
82
# SPDX-License-Identifier: MIT
93

10-
>>>>>>> master:examples/minimqtt_adafruitio_cellular.py
114
import time
125
import board
136
import busio

examples/cpython/minimqtt_adafruitio_cpython.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
# SPDX-FileCopyrightText: Tony DiCola for Adafruit Industries
2-
# SPDX-FileCopyrightText: 2020 Brent Rubell for Adafruit Industries
3-
#
4-
# SPDX-License-Identifier: Unlicense
1+
# SPDX-FileCopyrightText: 2021 ladyada for Adafruit Industries
2+
# SPDX-License-Identifier: MIT
3+
54
import time
65
import socket
76
import adafruit_minimqtt.adafruit_minimqtt as MQTT

examples/cpython/minimqtt_simpletest_cpython.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# SPDX-FileCopyrightText: 2020 Brent Rubell for Adafruit Industries
2-
#
3-
# SPDX-License-Identifier: Unlicense
1+
# SPDX-FileCopyrightText: 2021 ladyada for Adafruit Industries
2+
# SPDX-License-Identifier: MIT
3+
44
import socket
55
import adafruit_minimqtt.adafruit_minimqtt as MQTT
66

examples/esp32spi/minimqtt_adafruitio_esp32spi.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
# SPDX-FileCopyrightText: 2021 ladyada for Adafruit Industries
22
# SPDX-License-Identifier: MIT
33

4-
# Adafruit MiniMQTT Pub/Sub Example
5-
# Written by Tony DiCola for Adafruit Industries
6-
# Modified by Brent Rubell for Adafruit Industries
74
import time
85
import board
96
import busio

examples/esp32spi/minimqtt_certificate_esp32spi.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,28 +67,23 @@ def connect(client, userdata, flags, rc):
6767
print("Connected to MQTT Broker!")
6868
print("Flags: {0}\n RC: {1}".format(flags, rc))
6969

70-
7170
def disconnect(client, userdata, rc):
7271
# This method is called when the client disconnects
7372
# from the broker.
7473
print("Disconnected from MQTT Broker!")
7574

76-
7775
def subscribe(client, userdata, topic, granted_qos):
7876
# This method is called when the client subscribes to a new feed.
7977
print("Subscribed to {0} with QOS level {1}".format(topic, granted_qos))
8078

81-
8279
def unsubscribe(client, userdata, topic, pid):
8380
# This method is called when the client unsubscribes from a feed.
8481
print("Unsubscribed from {0} with PID {1}".format(topic, pid))
8582

86-
8783
def publish(client, userdata, topic, pid):
8884
# This method is called when the client publishes data to a feed.
8985
print("Published to {0} with PID {1}".format(topic, pid))
9086

91-
9287
# Get certificate and private key from a certificates.py file
9388
try:
9489
from certificates import DEVICE_CERT, DEVICE_KEY

examples/esp32spi/minimqtt_pub_sub_blocking_esp32spi.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# SPDX-FileCopyrightText: 2021 ladyada for Adafruit Industries
22
# SPDX-License-Identifier: MIT
33

4-
# CircuitPython MiniMQTT Library
5-
# Adafruit IO SSL/TLS Example for WiFi
64
import time
75
import board
86
import busio

examples/esp32spi/minimqtt_simpletest_esp32spi.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
# adafruit_minimqtt usage with esp32spi wifi
1+
# SPDX-FileCopyrightText: 2021 ladyada for Adafruit Industries
2+
# SPDX-License-Identifier: MIT
23
import board
34
import busio
45
from digitalio import DigitalInOut

examples/ethernet/minimqtt_adafruitio_eth.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
# SPDX-FileCopyrightText: 2021 ladyada for Adafruit Industries
22
# SPDX-License-Identifier: MIT
33

4-
# Adafruit MiniMQTT Pub/Sub Example
5-
# Written by Tony DiCola for Adafruit Industries
6-
# Modified by Brent Rubell for Adafruit Industries
74
import time
85
import board
96
import busio

examples/ethernet/minimqtt_simpletest_eth.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
1-
<<<<<<< HEAD:examples/ethernet/minimqtt_simpletest_eth.py
2-
# SPDX-FileCopyrightText: 2020 Brent Rubell for Adafruit Industries
3-
#
4-
# SPDX-License-Identifier: Unlicense
5-
=======
61
# SPDX-FileCopyrightText: 2021 ladyada for Adafruit Industries
72
# SPDX-License-Identifier: MIT
83

9-
>>>>>>> master:examples/minimqtt_simpletest_eth.py
104
import board
115
import busio
126
from digitalio import DigitalInOut

examples/minimqtt_simpletest.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
# SPDX-FileCopyrightText: 2021 Brent Rubell, written for Adafruit Industries
2-
#
3-
# SPDX-License-Identifier: Unlicense
4-
# adafruit_minimqtt usage with native networking
1+
# SPDX-FileCopyrightText: 2021 ladyada for Adafruit Industries
2+
# SPDX-License-Identifier: MIT
3+
54
import ssl
65
import socketpool
76
import wifi

0 commit comments

Comments
 (0)