Merge pull request #2 from adafruit/master

merge from adafruit

Author: FoamyGuy

Adafruit_IO_Air_Quality/code.py

@@ -6,12 +6,11 @@
 from adafruit_esp32spi import adafruit_esp32spi, adafruit_esp32spi_wifimanager
 from adafruit_io.adafruit_io import IO_HTTP
 from simpleio import map_range
-
 import adafruit_pm25
 import adafruit_bme280
 
 ### Configure Sensor ###
-# Return BME280 environmental sensor readings in degrees Celsius
+# Return environmental sensor readings in degrees Celsius
 USE_CELSIUS = False
 # Interval the sensor publishes to Adafruit IO, in minutes
 PUBLISH_INTERVAL = 10
@@ -36,12 +35,22 @@
 wifi = adafruit_esp32spi_wifimanager.ESPSPI_WiFiManager(esp, secrets, status_light)
 
 # Connect to a PM2.5 sensor over UART
+reset_pin = None
 uart = busio.UART(board.TX, board.RX, baudrate=9600)
-pm25 = adafruit_pm25.PM25_UART(uart)
+pm25 = adafruit_pm25.PM25_UART(uart, reset_pin)
+
+# Create i2c object
+i2c = busio.I2C(board.SCL, board.SDA, frequency=100000)
+
+# Connect to a BME280 over I2C
+bme_sensor = adafruit_bme280.Adafruit_BME280_I2C(i2c)
+
+# Uncomment below for PMSA003I Air Quality Breakout
+# pm25 = adafruit_pm25.PM25_I2C(i2c, reset_pin)
 
-# Connect to a BME280 sensor over I2C
-i2c = busio.I2C(board.SCL, board.SDA)
-bme280 = adafruit_bme280.Adafruit_BME280_I2C(i2c)
+# Uncomment below for BME680
+# import adafruit_bme680
+# bme_sensor = adafruit_bme680.Adafruit_BME680_I2C(i2c)
 
 ### Sensor Functions ###
 def calculate_aqi(pm_sensor_reading):
@@ -111,18 +120,18 @@ def sample_aq_sensor():
     return aq_reading
 
 
-def read_bme280(is_celsius=False):
+def read_bme(is_celsius=False):
     """Returns temperature and humidity
-    from BME280 environmental sensor, as a tuple.
+    from BME280/BME680 environmental sensor, as a tuple.
 
     :param bool is_celsius: Returns temperature in degrees celsius
                             if True, otherwise fahrenheit.
     """
-    humid = bme280.humidity
-    temp = bme280.temperature
+    humid = bme_sensor.humidity
+    temp = bme_sensor.temperature
     if not is_celsius:
         temp = temp * 1.8 + 32
-    return temperature, humid
+    return temp, humid
 
 
 # Create an instance of the Adafruit IO HTTP client
@@ -168,7 +177,7 @@ def read_bme280(is_celsius=False):
 
         # temp and humidity
         print("Sampling environmental sensor...")
-        temperature, humidity = read_bme280(USE_CELSIUS)
+        temperature, humidity = read_bme(USE_CELSIUS)
         print("Temperature: %0.1f F" % temperature)
         print("Humidity: %0.1f %%" % humidity)
 

FeatherCAN_CircuitPython/listener-ack.py

@@ -0,0 +1,47 @@
+import struct
+
+import board
+import canio
+import digitalio
+
+# If the CAN transceiver has a standby pin, bring it out of standby mode
+if hasattr(board, 'CAN_STANDBY'):
+    standby = digitalio.DigitalInOut(board.CAN_STANDBY)
+    standby.switch_to_output(False)
+
+# If the CAN transceiver is powered by a boost converter, turn on its supply
+if hasattr(board, 'BOOST_ENABLE'):
+    boost_enable = digitalio.DigitalInOut(board.BOOST_ENABLE)
+    boost_enable.switch_to_output(True)
+
+can = canio.CAN(rx=board.CAN_RX, tx=board.CAN_TX, baudrate=250_000, auto_restart=True)
+listener = can.listen(matches=[canio.Match(0x408)], timeout=.9)
+
+old_bus_state = None
+old_count = -1
+
+while True:
+    bus_state = can.state
+    if bus_state != old_bus_state:
+        print(f"Bus state changed to {bus_state}")
+        old_bus_state = bus_state
+
+    message = listener.receive()
+    if message is None:
+        print("No messsage received within timeout")
+        continue
+
+    data = message.data
+    if len(data) != 8:
+        print(f"Unusual message length {len(data)}")
+        continue
+
+    count, now_ms = struct.unpack("<II", data)
+    gap = count - old_count
+    old_count = count
+    print(f"received message: id={message.id:x} count={count} now_ms={now_ms}")
+    if gap != 1:
+        print(f"gap: {gap}")
+
+    print("Sending ACK")
+    can.send(canio.Message(id=0x409, data=struct.pack("<I", count)))

FeatherCAN_CircuitPython/listener.py

@@ -0,0 +1,44 @@
+import struct
+
+import board
+import canio
+import digitalio
+
+# If the CAN transceiver has a standby pin, bring it out of standby mode
+if hasattr(board, 'CAN_STANDBY'):
+    standby = digitalio.DigitalInOut(board.CAN_STANDBY)
+    standby.switch_to_output(False)
+
+# If the CAN transceiver is powered by a boost converter, turn on its supply
+if hasattr(board, 'BOOST_ENABLE'):
+    boost_enable = digitalio.DigitalInOut(board.BOOST_ENABLE)
+    boost_enable.switch_to_output(True)
+
+can = canio.CAN(rx=board.CAN_RX, tx=board.CAN_TX, baudrate=250_000, auto_restart=True)
+listener = can.listen(matches=[canio.Match(0x408)], timeout=.9)
+
+old_bus_state = None
+old_count = -1
+
+while True:
+    bus_state = can.state
+    if bus_state != old_bus_state:
+        print(f"Bus state changed to {bus_state}")
+        old_bus_state = bus_state
+
+    message = listener.receive()
+    if message is None:
+        print("No messsage received within timeout")
+        continue
+
+    data = message.data
+    if len(data) != 8:
+        print(f"Unusual message length {len(data)}")
+        continue
+
+    count, now_ms = struct.unpack("<II", data)
+    gap = count - old_count
+    old_count = count
+    print(f"received message: count={count} now_ms={now_ms}")
+    if gap != 1:
+        print(f"gap: {gap}")

FeatherCAN_CircuitPython/sender-ack.py

@@ -0,0 +1,55 @@
+import struct
+import time
+
+import board
+import canio
+import digitalio
+
+# If the CAN transceiver has a standby pin, bring it out of standby mode
+if hasattr(board, 'CAN_STANDBY'):
+    standby = digitalio.DigitalInOut(board.CAN_STANDBY)
+    standby.switch_to_output(False)
+
+# If the CAN transceiver is powered by a boost converter, turn on its supply
+if hasattr(board, 'BOOST_ENABLE'):
+    boost_enable = digitalio.DigitalInOut(board.BOOST_ENABLE)
+    boost_enable.switch_to_output(True)
+
+can = canio.CAN(rx=board.CAN_RX, tx=board.CAN_TX, baudrate=250_000, auto_restart=True)
+listener = can.listen(matches=[canio.Match(0x409)], timeout=.1)
+
+old_bus_state = None
+count = 0
+
+while True:
+    bus_state = can.state
+    if bus_state != old_bus_state:
+        print(f"Bus state changed to {bus_state}")
+        old_bus_state = bus_state
+
+    now_ms = (time.monotonic_ns() // 1_000_000) & 0xffffffff
+    print(f"Sending message: count={count} now_ms={now_ms}")
+
+    message = canio.Message(id=0x408, data=struct.pack("<II", count, now_ms))
+    while True:
+        can.send(message)
+
+        message_in = listener.receive()
+        if message_in is None:
+            print("No ACK received within timeout")
+            continue
+
+        data = message_in.data
+        if len(data) != 4:
+            print(f"Unusual message length {len(data)}")
+            continue
+
+        ack_count = struct.unpack("<I", data)[0]
+        if ack_count == count:
+            print(f"Received ACK")
+            break
+        else:
+            print(f"Received incorrect ACK: {ack_count} should be {count}")
+
+    time.sleep(.5)
+    count += 1

FeatherCAN_CircuitPython/sender.py

@@ -0,0 +1,36 @@
+import struct
+import time
+
+import board
+import canio
+import digitalio
+
+# If the CAN transceiver has a standby pin, bring it out of standby mode
+if hasattr(board, 'CAN_STANDBY'):
+    standby = digitalio.DigitalInOut(board.CAN_STANDBY)
+    standby.switch_to_output(False)
+
+# If the CAN transceiver is powered by a boost converter, turn on its supply
+if hasattr(board, 'BOOST_ENABLE'):
+    boost_enable = digitalio.DigitalInOut(board.BOOST_ENABLE)
+    boost_enable.switch_to_output(True)
+
+can = canio.CAN(rx=board.CAN_RX, tx=board.CAN_TX, baudrate=250_000, auto_restart=True)
+
+old_bus_state = None
+count = 0
+
+while True:
+    bus_state = can.state
+    if bus_state != old_bus_state:
+        print(f"Bus state changed to {bus_state}")
+        old_bus_state = bus_state
+
+    now_ms = (time.monotonic_ns() // 1_000_000) & 0xffffffff
+    print(f"Sending message: count={count} now_ms={now_ms}")
+
+    message = canio.Message(id=0x408, data=struct.pack("<II", count, now_ms))
+    can.send(message)
+
+    time.sleep(.5)
+    count += 1

PyRuler_Video_Panic/code.py

@@ -12,7 +12,8 @@
     from adafruit_hid.keyboard import Keyboard
     from adafruit_hid.keycode import Keycode
     from adafruit_hid.keyboard_layout_us import KeyboardLayoutUS
-    kbd = Keyboard()
+    import usb_hid
+    kbd = Keyboard(usb_hid.devices)
     layout = KeyboardLayoutUS(kbd)
 
 #print(dir(board), os.uname()) # Print a little about ourselves