Merge branch 'master' into collin_cunningham_changes

Author: CollinCunningham

FeatherCAN_CircuitPython/listener-ack.py

@@ -14,7 +14,10 @@
     boost_enable = digitalio.DigitalInOut(board.BOOST_ENABLE)
     boost_enable.switch_to_output(True)
 
+# Use this line if your board has dedicated CAN pins. (Feather M4 CAN and Feather STM32F405)
 can = canio.CAN(rx=board.CAN_RX, tx=board.CAN_TX, baudrate=250_000, auto_restart=True)
+# On ESP32S2 most pins can be used for CAN.  Uncomment the following line to use IO5 and IO6
+#can = canio.CAN(rx=board.IO6, tx=board.IO5, baudrate=250_000, auto_restart=True)
 listener = can.listen(matches=[canio.Match(0x408)], timeout=.9)
 
 old_bus_state = None

FeatherCAN_CircuitPython/listener.py

@@ -14,7 +14,10 @@
     boost_enable = digitalio.DigitalInOut(board.BOOST_ENABLE)
     boost_enable.switch_to_output(True)
 
+# Use this line if your board has dedicated CAN pins. (Feather M4 CAN and Feather STM32F405)
 can = canio.CAN(rx=board.CAN_RX, tx=board.CAN_TX, baudrate=250_000, auto_restart=True)
+# On ESP32S2 most pins can be used for CAN.  Uncomment the following line to use IO5 and IO6
+#can = canio.CAN(rx=board.IO6, tx=board.IO5, baudrate=250_000, auto_restart=True)
 listener = can.listen(matches=[canio.Match(0x408)], timeout=.9)
 
 old_bus_state = None

FeatherCAN_CircuitPython/sender-ack.py

@@ -15,7 +15,10 @@
     boost_enable = digitalio.DigitalInOut(board.BOOST_ENABLE)
     boost_enable.switch_to_output(True)
 
+# Use this line if your board has dedicated CAN pins. (Feather M4 CAN and Feather STM32F405)
 can = canio.CAN(rx=board.CAN_RX, tx=board.CAN_TX, baudrate=250_000, auto_restart=True)
+# On ESP32S2 most pins can be used for CAN.  Uncomment the following line to use IO5 and IO6
+#can = canio.CAN(rx=board.IO6, tx=board.IO5, baudrate=250_000, auto_restart=True)
 listener = can.listen(matches=[canio.Match(0x409)], timeout=.1)
 
 old_bus_state = None

FeatherCAN_CircuitPython/sender.py

@@ -15,7 +15,10 @@
     boost_enable = digitalio.DigitalInOut(board.BOOST_ENABLE)
     boost_enable.switch_to_output(True)
 
+# Use this line if your board has dedicated CAN pins. (Feather M4 CAN and Feather STM32F405)
 can = canio.CAN(rx=board.CAN_RX, tx=board.CAN_TX, baudrate=250_000, auto_restart=True)
+# On ESP32S2 most pins can be used for CAN.  Uncomment the following line to use IO5 and IO6
+#can = canio.CAN(rx=board.IO6, tx=board.IO5, baudrate=250_000, auto_restart=True)
 
 old_bus_state = None
 count = 0

IoT_NeoPixel_Sign/code.py

@@ -0,0 +1,81 @@
+import ssl
+import board
+import neopixel
+import adafruit_requests
+import socketpool
+import wifi
+from adafruit_io.adafruit_io import IO_HTTP
+from adafruit_pixel_framebuf import PixelFramebuffer
+# adafruit_circuitpython_adafruitio usage with native wifi networking
+
+# Neopixel matrix configuration
+PIXEL_PIN = board.IO6
+PIXEL_WIDTH = 12
+PIXEL_HEIGHT = 12
+
+# secrets.py has SSID/password and adafruit.io
+try:
+    from secrets import secrets
+except ImportError:
+    print("WiFi secrets are kept in secrets.py, please add them there!")
+    raise
+AIO_USERNAME = secrets["aio_username"]
+AIO_KEY = secrets["aio_key"]
+
+# LED matrix creation
+PIXELS = neopixel.NeoPixel(
+    PIXEL_PIN, PIXEL_WIDTH * PIXEL_HEIGHT, brightness=0.5, auto_write=False,
+)
+
+PIXEL_FRAMEBUF = PixelFramebuffer(
+    PIXELS,
+    PIXEL_WIDTH,
+    PIXEL_HEIGHT,
+    alternating=True,
+    rotation=1,
+    reverse_x=True
+    )
+
+# Adafruit.io feeds setup
+QUOTE_FEED = "sign-quotes.signtext"
+COLOR_FEED = "sign-quotes.signcolor"
+CURRENT_TEXT = "Merry Christmas!"
+CURRENT_COLOR = 0xFFFFFF
+
+# Helper function to get updated data from Adafruit.io
+def update_data():
+    global CURRENT_TEXT, CURRENT_COLOR
+    print("Updating data from Adafruit IO")
+    try:
+        quote_feed = IO.get_feed(QUOTE_FEED)
+        quotes_data = IO.receive_data(quote_feed["key"])
+        CURRENT_TEXT = quotes_data["value"]
+        color_feed = IO.get_feed(COLOR_FEED)
+        color_data = IO.receive_data(color_feed["key"])
+        CURRENT_COLOR = int(color_data["value"][1:], 16)
+    # pylint: disable=broad-except
+    except Exception as error:
+        print(error)
+
+
+# Connect to WiFi
+print("Connecting to %s" % secrets["ssid"])
+wifi.radio.connect(secrets["ssid"], secrets["password"])
+print("Connected to %s!" % secrets["ssid"])
+
+# Setup Adafruit IO connection
+POOL = socketpool.SocketPool(wifi.radio)
+REQUESTS = adafruit_requests.Session(POOL, ssl.create_default_context())
+# Initialize an Adafruit IO HTTP API object
+IO = IO_HTTP(AIO_USERNAME, AIO_KEY, REQUESTS)
+
+
+while True:
+    update_data()
+    print("Displaying", CURRENT_TEXT, "in", hex(CURRENT_COLOR))
+
+    for i in range(12 * len(CURRENT_TEXT) + PIXEL_WIDTH):
+        PIXEL_FRAMEBUF.fill(0x000000)
+        PIXEL_FRAMEBUF.pixel(0, 0, 0x000000)
+        PIXEL_FRAMEBUF.text(CURRENT_TEXT, PIXEL_WIDTH - i, 3, CURRENT_COLOR)
+        PIXEL_FRAMEBUF.display()

MagTag_Christmas_Countdown/code.py

@@ -4,8 +4,15 @@
 from adafruit_display_shapes.circle import Circle
 
 #  create MagTag and connect to network
-magtag = MagTag()
-magtag.network.connect()
+try:
+    magtag = MagTag()
+    magtag.network.connect()
+except (ConnectionError, ValueError, RuntimeError) as e:
+    print("*** MagTag(), Some error occured, retrying! -", e)
+    # Exit program and restart in 1 seconds.
+    magtag.exit_and_deep_sleep(1)
+
+
 
 #  displayio groups
 group = displayio.Group(max_size=30)
@@ -53,11 +60,15 @@
 
 #  circles to cover-up bitmap's number ornaments
 
+ball_color = [0x555555, 0xaaaaaa, 0xFFFFFF] # All colors except black (0x000000)
+ball_index = 0
+
 #  creating the circles & pulling in positions from spots
 for spot in spots:
-    circle = Circle(x0=spot[0], y0=spot[1],
-                    r=11,
-                    fill=0xFF00FF)
+    circle = Circle(x0=spot[0], y0=spot[1], r=11, fill=ball_color[ball_index]) # Each ball has a color
+    ball_index += 1
+    ball_index %= len(ball_color)
+
 	#  adding circles to their display group
     circle_group.append(circle)
 
@@ -70,7 +81,10 @@
 now = time.localtime()
 month = now[1]
 day = now[2]
-print("day is", day)
+(hour, minutes, seconds) = now[3:6]
+seconds_since_midnight = 60 * (hour*60 + minutes)+seconds
+print( f"day is {day}, ({seconds_since_midnight} seconds since midnight)")
+
 
 #  sets colors of circles to transparent to reveal dates that have passed & current date
 for i in range(day):
@@ -82,9 +96,11 @@
 magtag.display.refresh()
 time.sleep(5)
 
-#  goes into deep sleep for 12 hours
+#  goes into deep sleep till a 'stroke' past midnight
 print("entering deep sleep")
-magtag.exit_and_deep_sleep(43200)
+seconds_to_sleep = 24*60*60 - seconds_since_midnight + 10
+print( f"sleeping for {seconds_to_sleep} seconds")
+magtag.exit_and_deep_sleep(seconds_to_sleep)
 
 #  entire code will run again after deep sleep cycle
 #  similar to hitting the reset button