Merge remote-tracking branch 'adafruit/master'

Author: dastels

.gitignore

@@ -1,3 +1,5 @@
 *~
 Hue_Controller/secrets.h
 .idea
+
+CircuitPython_Logger/secrets\.py

CircuitPython_Logger/aio_handler.py

@@ -0,0 +1,78 @@
+"""
+Adafruit IO based message handler for CircuitPython logging.
+
+Adafruit invests time and resources providing this open source code.
+Please support Adafruit and open source hardware by purchasing
+products from Adafruit!
+
+Written by Dave Astels for Adafruit Industries
+Copyright (c) 2018 Adafruit Industries
+Licensed under the MIT license.
+
+All text above must be included in any redistribution.
+"""
+
+#pylint:disable=missing-super-argument
+
+# Example:
+#
+# from aio_handler import AIOHandler
+# import adafruit_logging as logging
+# l = logging.getLogger('aio')
+# l.addHandler(AIOHandler('test'))
+# l.level = logging.ERROR
+# l.error("test")
+
+import board
+import busio
+from digitalio import DigitalInOut
+import neopixel
+from adafruit_logging import LoggingHandler
+from adafruit_esp32spi import adafruit_esp32spi, adafruit_esp32spi_wifimanager
+from adafruit_io.adafruit_io import RESTClient, AdafruitIO_RequestError
+
+try:
+    from secrets import secrets
+except ImportError:
+    print("WiFi secrets are kept in secrets.py, please add them there!")
+    raise
+
+
+class AIOHandler(LoggingHandler):
+
+    def __init__(self, name):
+        """Create an instance."""
+        # PyPortal ESP32 Setup
+        esp32_cs = DigitalInOut(board.ESP_CS)
+        esp32_ready = DigitalInOut(board.ESP_BUSY)
+        esp32_reset = DigitalInOut(board.ESP_RESET)
+        spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
+        esp = adafruit_esp32spi.ESP_SPIcontrol(spi, esp32_cs, esp32_ready, esp32_reset)
+        status_light = neopixel.NeoPixel(board.NEOPIXEL, 1, brightness=0.2)
+        wifi = adafruit_esp32spi_wifimanager.ESPSPI_WiFiManager(esp, secrets, status_light)
+
+        # Set your Adafruit IO Username and Key in secrets.py
+        # (visit io.adafruit.com if you need to create an account,
+        # or if you need your Adafruit IO key.)
+        ADAFRUIT_IO_USER = secrets['adafruit_io_user']
+        ADAFRUIT_IO_KEY = secrets['adafruit_io_key']
+
+        # Create an instance of the Adafruit IO REST client
+        self._io = RESTClient(ADAFRUIT_IO_USER, ADAFRUIT_IO_KEY, wifi)
+
+        self._name = '{0}-logging'.format(name)
+        try:
+            # Get the logging feed from Adafruit IO
+            self._log_feed = self._io.get_feed(self._name)
+        except AdafruitIO_RequestError:
+            # If no logging feed exists, create one
+            self._log_feed = self._io.create_new_feed(self._name)
+
+    def emit(self, level, msg):
+        """Generate the message and write it to the UART.
+
+        :param level: The level at which to log
+        :param msg: The core message
+
+        """
+        self._io.send_data(self._log_feed['key'], self.format(level, msg))

CircuitPython_Logger/aio_test.py

@@ -0,0 +1,21 @@
+import time
+import random
+from aio_handler import AIOHandler
+import adafruit_logging as logging
+
+l = logging.getLogger('aio')
+l.addHandler(AIOHandler('test'))
+
+while True:
+    t = random.randint(1, 5)
+    if t == 1:
+        l.debug("debug message: %d", random.randint(0, 1000))
+    elif t == 2:
+        l.info("info message: %d", random.randint(0, 1000))
+    elif t == 3:
+        l.warning("warning message: %d", random.randint(0, 1000))
+    elif t == 4:
+        l.error("error message: %d", random.randint(0, 1000))
+    elif t == 5:
+        l.critical("critical message: %d", random.randint(0, 1000))
+    time.sleep(5.0 + (random.random() * 5.0))

CircuitPython_Logger/file_handler.py

@@ -16,13 +16,15 @@
 
 # Example:
 #
+#
 # from file_handler import FileHandler
-# from adafruit_logger import Logger, ERROR
-# l = Logger(FileHandler('log.txt'))
-# l.level = ERROR
+# import adafruit_logging as logging
+# l = logging.getLogger('file')
+# l.addHandler(FileHandler('log.txt'))
+# l.level = logging.ERROR
 # l.error("test")
 
-from adafruit_logger import LoggingHandler
+from adafruit_logging import LoggingHandler
 
 class FileHandler(LoggingHandler):
 

CircuitPython_Logger/uart_handler.py

@@ -19,15 +19,16 @@
 #
 # import board
 # import busio
-# from adafruit_logger.uart_handler import UartHandler
-# from adafruit_logger import *
+# from uart_handler import UartHandler
+# import adafruit_logging as logging
 #
 # uart = busio.UART(board.TX, board.RX, baudrate=115200)
-# logger = Logger(UartHandler(uart))
-# logger.level = INFO
+# logger = logging.getLogger('uart')
+# logger.addHandler(UartHandler(uart))
+# logger.level = logging.INFO
 # logger.info('testing')
 
-from adafruit_logger import LoggingHandler
+from adafruit_logging import LoggingHandler
 
 class UartHandler(LoggingHandler):
     """Send logging output to a serial port."""

PyPortal_Youtube/youtube.py

@@ -18,7 +18,9 @@
 
 # Set up where we'll be fetching data from
 CHANNEL_ID = "UCpOlOeQjj7EsVnDh3zuCgsA" # this isn't a secret but you have to look it up
+#CHANNEL_ID = "UC6p-tjZN8s9GBSbiN4K-bwg"
 CAPTION = "www.youtube.com/adafruit"
+#CAPTION = "www.youtube.com/c/JohnParkMakes"
 
 # pylint: disable=line-too-long
 DATA_SOURCE = "https://www.googleapis.com/youtube/v3/channels/?part=statistics&id="+CHANNEL_ID+"&key="+secrets['youtube_token']
@@ -33,11 +35,11 @@
                     status_neopixel=board.NEOPIXEL,
                     default_bg=cwd+"/youtube_background.bmp",
                     text_font=cwd+"/fonts/Collegiate-50.bdf",
-                    text_position=((100, 85+44), (155, 140+40)),
+                    text_position=((100, 129), (155, 180)),
                     text_color=(0xFFFFFF, 0xFFFFFF),
                     caption_text=CAPTION,
                     caption_font=cwd+"/fonts/Collegiate-24.bdf",
-                    caption_position=(40, 200+20),
+                    caption_position=(40, 220),
                     caption_color=0xFFFFFF)
 
 # track the last value so we can play a sound when it updates