Merge branch 'adafruit:main' into main

Author: ladyada

2020_shake/.metro_m4.test.only renamed to 2020_shake/.feather_esp32s3.test.only

@@ -27,11 +27,19 @@ bool show_new_year = true;
 #define SHAKE_PERIOD    2000                                // Period (in ms) when SHAKE_EVENTS must happen
 #define SAND_TIME       6000                                // Time (in ms) to run simulation before restarting
 
+#if defined(_VARIANT_MATRIXPORTAL_M4_) // MatrixPortal M4
 uint8_t rgbPins[]  = {7, 8, 9, 10, 11, 12};
-uint8_t addrPins[] = {17, 18, 19, 20};
+uint8_t addrPins[] = {17, 18, 19, 20, 21};
 uint8_t clockPin   = 14;
 uint8_t latchPin   = 15;
 uint8_t oePin      = 16;
+#else // MatrixPortal ESP32-S3
+uint8_t rgbPins[]  = {42, 41, 40, 38, 39, 37};
+uint8_t addrPins[] = {35, 36, 48, 45, 21};
+uint8_t clockPin   = 2;
+uint8_t latchPin   = 47;
+uint8_t oePin      = 14;
+#endif
 
 // 64x32 pixel matrix, 6-bit depth
 Adafruit_Protomatter matrix(

2020_shake/.matrixportal.test.only

@@ -0,0 +1,72 @@
+// SPDX-FileCopyrightText: 2023 Ladyada for Adafruit Industries
+//
+// SPDX-License-Identifier: MIT
+
+/*
+  This example plays a 'raw' PCM file from memory to I2S
+*/
+
+#include <I2S.h>
+
+#include "startup.h" // audio file in flash
+
+// Create the I2S port using a PIO state machine
+I2S i2s(OUTPUT);
+
+// GPIO pin numbers
+#define pBCLK A2 // QT Py BFF default BITCLOCK
+#define pWS   A1 // QT Py BFF default LRCLOCK
+#define pDOUT A0 // QT Py BFF default DATA
+
+#define USERBUTTON 21 // QT Py RP2040 built in button
+
+// variable shared between cores
+volatile bool playaudio = false;
+
+void setup() {
+  Serial.begin(115200);
+  //while (!Serial) delay(10);
+  Serial.println("I2S playback demo");
+
+  pinMode(USERBUTTON, INPUT_PULLUP);
+}
+
+void loop() {
+  // on button press tell the other core to play audio clip!
+  if (!digitalRead(USERBUTTON)) {
+     playaudio = true;
+  } else {
+     playaudio = false;
+  }
+}
+
+void setup1() {
+  i2s.setBCLK(pBCLK);
+  i2s.setDATA(pDOUT);
+  i2s.setBitsPerSample(16);
+}
+
+void loop1() {
+  // the main loop will tell us when it wants us to play!
+  if (playaudio) {
+    play_i2s(startupAudioData, sizeof(startupAudioData), startupSampleRate);
+  }
+}
+
+void play_i2s(const uint8_t *data, uint32_t len, uint32_t rate) {
+  // start I2S at the sample rate with 16-bits per sample
+  if (!i2s.begin(rate)) {
+    Serial.println("Failed to initialize I2S!");
+    delay(500);
+    i2s.end();
+    return;
+  }
+  
+  for(uint32_t i=0; i<len; i++) {
+    uint16_t sample = (uint16_t)data[i] << 6; // our data is 10 bit but we want 16 bit so we add some gain
+    // write the same sample twice, once for left and once for the right channel
+    i2s.write(sample);
+    i2s.write(sample);
+  }
+  i2s.end();
+}

2020_shake/2020_shake.ino

@@ -0,0 +1,74 @@
+// SPDX-FileCopyrightText: 2016 Sandeep Mistry
+// SPDX-FileCopyrightText: 2022 Earle F. Philhower, III
+// SPDX-FileCopyrightText: 2023 Ladyada for Adafruit Industries
+//
+// SPDX-License-Identifier: MIT
+
+/*
+  This example generates a square wave based tone at a specified frequency
+  and sample rate. Then outputs the data using the I2S interface to a
+  MAX08357 I2S Amp Breakout board.
+
+  created 17 November 2016
+  by Sandeep Mistry
+  modified for RP2040 by Earle F. Philhower, III <earlephilhower@yahoo.com>
+
+
+    bool setBCLK(pin_size_t pin);
+    - This assigns two adjacent pins - the pin after this one (one greater)
+      is the WS (word select) signal, which toggles before the sample for
+      each channel is sent
+
+    bool setDATA(pin_size_t pin);
+    - Sets the DOUT pin, can be any valid GPIO pin
+*/
+
+#include <I2S.h>
+
+// Create the I2S port using a PIO state machine
+I2S i2s(OUTPUT);
+
+// GPIO pin numbers
+#define pBCLK A2 // QT Py BFF default BITCLOCK
+#define pWS   A1 // QT Py BFF default LRCLOCK
+#define pDOUT A0 // QT Py BFF default DATA
+
+const int frequency = 440; // frequency of square wave in Hz
+const int amplitude = 500; // amplitude of square wave
+const int sampleRate = 16000; // 16 KHz is a good quality
+
+const int halfWavelength = (sampleRate / frequency); // half wavelength of square wave
+
+int16_t sample = amplitude; // current sample value
+int count = 0;
+
+void setup() {
+  Serial.begin(115200);
+  while (!Serial) delay(10);
+  Serial.println("I2S simple tone");
+
+  i2s.setBCLK(pBCLK);
+  i2s.setDATA(pDOUT);
+  i2s.setBitsPerSample(16);
+
+  // start I2S at the sample rate with 16-bits per sample
+  if (!i2s.begin(sampleRate)) {
+    Serial.println("Failed to initialize I2S!");
+    while (1); // do nothing
+  }
+
+}
+
+void loop() {
+  if (count % halfWavelength == 0) {
+    // invert the sample every half wavelength count multiple to generate square wave
+    sample = -1 * sample;
+  }
+
+  // write the same sample twice, once for left and once for the right channel
+  i2s.write(sample);
+  i2s.write(sample);
+
+  // increment the counter for the next sample
+  count++;
+}

Adafruit_I2S_BFF/Arduino/I2S_BFF_QT_Py_RP2040_Audio_Playback/.qt_py_rp2040.test.only

@@ -0,0 +1,28 @@
+# SPDX-FileCopyrightText: 2023 Kattni Rembor for Adafruit Industries
+# SPDX-License-Identifier: MIT
+"""
+CircuitPython I2S Tone playback example.
+"""
+import time
+import array
+import math
+import audiocore
+import board
+import audiobusio
+
+TONE_VOLUME = 0.1  # Increase this to increase the volume of the tone.
+FREQUENCY = 440  # Set this to the Hz of the tone you want to generate.
+
+audio = audiobusio.I2SOut(board.A2, board.A1, board.A0)
+
+length = 8000 // FREQUENCY
+sine_wave = array.array("h", [0] * length)
+for i in range(length):
+    sine_wave[i] = int((math.sin(math.pi * 2 * i / length)) * TONE_VOLUME * (2 ** 15 - 1))
+sine_wave_sample = audiocore.RawSample(sine_wave)
+
+while True:
+    audio.play(sine_wave_sample, loop=True)
+    time.sleep(1)
+    audio.stop()
+    time.sleep(1)

Adafruit_I2S_BFF/Arduino/I2S_BFF_QT_Py_RP2040_Audio_Playback/I2S_BFF_QT_Py_RP2040_Audio_Playback.ino

@@ -0,0 +1,22 @@
+# SPDX-FileCopyrightText: 2023 Kattni Rembor for Adafruit Industries
+# SPDX-License-Identifier: MIT
+"""
+CircuitPython I2S WAV file playback.
+"""
+import audiocore
+import board
+import audiobusio
+
+LOOP = False  # Update to True loop WAV playback. False plays once.
+
+audio = audiobusio.I2SOut(board.A2, board.A1, board.A0)
+
+with open("chikken.wav", "rb") as wave_file:
+    wav = audiocore.WaveFile(wave_file)
+
+    print("Playing wav file!")
+    audio.play(wav, loop=LOOP)
+    while audio.playing:
+        pass
+
+print("Done!")

Adafruit_I2S_BFF/Arduino/I2S_BFF_QT_Py_RP2040_Audio_Playback/startup.h

@@ -26,19 +26,22 @@
 reset_pin = None
 
 pm25 = PM25_I2C(i2c, reset_pin)
-aqdata = pm25.read()
 
 scd4x = adafruit_scd4x.SCD4X(i2c)
 scd4x.start_periodic_measurement()
 
 time.sleep(5)
 
+try:
+    aqdata = pm25.read()
+    pm2 = int(aqdata["pm25 standard"])
+except RuntimeError:
+    pm2 = 0
+
 co2 = scd4x.CO2
 temp = scd4x.temperature
 humidity = scd4x.relative_humidity
 
-pm2 = int(aqdata["pm25 standard"])
-
 def rate_pm25(pm25_data):
     if pm25_data <= 12:
         pm25_outline = 94
@@ -98,8 +101,12 @@ def c_to_f(temp_data):
         co2 = scd4x.CO2
         temp = c_to_f(scd4x.temperature)
         humidity = scd4x.relative_humidity
-        aqdata = pm25.read()
-        pm2 = int(aqdata["pm25 standard"])
+        try:
+            aqdata = pm25.read()
+            pm2 = int(aqdata["pm25 standard"])
+        except RuntimeError:
+            print("Unable to read from PM2.5 sensor, no new data..")
+            continue
         pm2_color, pm2_outline.x = rate_pm25(pm2)
         sensor_data = [pm2, co2, temp, humidity]
         pixels.fill(pm2_color)

Adafruit_I2S_BFF/Arduino/I2S_BFF_QT_Py_RP2040_Tone/.qt_py_rp2040.test.only

@@ -0,0 +1,94 @@
+# SPDX-FileCopyrightText: 2023 Trevor Beaton for Adafruit Industries
+#
+# SPDX-License-Identifier: MIT
+import os
+import ssl
+import time
+import wifi
+import board
+import displayio
+import terminalio
+import socketpool
+import adafruit_requests
+from adafruit_display_text import bitmap_label
+
+# Initialize Wi-Fi connection
+try:
+    wifi.radio.connect(
+        os.getenv("CIRCUITPY_WIFI_SSID"), os.getenv("CIRCUITPY_WIFI_PASSWORD")
+    )
+    print("Connected to %s!" % os.getenv("CIRCUITPY_WIFI_SSID"))
+except Exception as e:  # pylint: disable=broad-except
+    print(
+        "Failed to connect to WiFi. Error:", e, "\nBoard will hard reset in 30 seconds."
+    )
+
+pool = socketpool.SocketPool(wifi.radio)
+requests = adafruit_requests.Session(pool, ssl.create_default_context())
+
+# Set up the URL for fetching time data
+DATA_SOURCE = "http://worldtimeapi.org/api/timezone/" + os.getenv("TIMEZONE")
+
+# Set up display a default image
+display = board.DISPLAY
+default_bitmap = displayio.OnDiskBitmap("/images/blanka-chan.bmp")
+default_tile_grid = displayio.TileGrid(default_bitmap, pixel_shader=default_bitmap.pixel_shader)
+
+group = displayio.Group()
+group.append(default_tile_grid)
+
+# Create label for displaying time
+time_label = bitmap_label.Label(terminalio.FONT, scale=5)
+time_label.anchor_point = (0.2, 0.5)
+time_label.anchored_position = (display.width // 2, display.height // 2)
+
+# Create main group to hold all display groups
+main_group = displayio.Group()
+main_group.append(group)
+main_group.append(time_label)
+# Show the main group on the display
+display.show(main_group)
+
+current_background_image = "/images/blanka-chan.bmp"
+
+def set_background_image(filename):
+    global current_background_image  # pylint: disable=global-statement
+    tile_bitmap = displayio.OnDiskBitmap(filename)
+    new_tile_grid = displayio.TileGrid(tile_bitmap, pixel_shader=tile_bitmap.pixel_shader)
+    group[0] = new_tile_grid
+    current_background_image = filename
+
+def parse_time(datetime_str):
+    # Extract the time part from the datetime string
+    time_str = datetime_str.split("T")[1].split(".")[0]
+    hour, minute, _ = map(int, time_str.split(":"))
+
+    # Convert 24-hour format to 12-hour format and determine AM/PM
+    period = "AM"
+    if hour >= 12:
+        period = "PM"
+        if hour > 12:
+            hour -= 12
+    elif hour == 0:
+        hour = 12
+
+    return hour, minute, period
+
+while True:
+    # Fetch time data from WorldTimeAPI
+    response = requests.get(DATA_SOURCE)
+    data = response.json()
+
+    # Parse the time from the datetime string
+    current_hour, current_minute, current_period = parse_time(data["datetime"])
+
+    # Display the time
+    time_label.text = " {:2}{}\n  :{:02}".format(current_hour, current_period, current_minute)
+
+    # Switch between two images
+    if current_background_image == "/images/blanka-chan.bmp":
+        set_background_image("/images/blanka-chan-charged.bmp")
+    else:
+        set_background_image("/images/blanka-chan.bmp")
+
+    time.sleep(5)