Merge branch 'refs/heads/main' into displayio_api_9x

Author: FoamyGuy

.github/workflows/arduino_cron.yml

@@ -39,7 +39,8 @@ jobs:
                [[ $changedfile == *.cpp ]] ||
                [[ $changedfile == *.h ]] ||
                [[ $changedfile == *.hpp ]] ||
-               [[ $changedfile == *.ino ]]; then
+               [[ $changedfile == *.ino ]] ||
+               [[ $changedfile == *.yml ]]; then
                 ischanged=true
                 break
             fi
@@ -60,14 +61,19 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        arduino-platform: ["cpb", "cpc", "cpx_ada", "esp32", "esp8266", "feather32u4", "feather_m0_express", "feather_m4_express", "feather_rp2040", "flora", "funhouse", "gemma", "gemma_m0", "hallowing_m0", "hallowing_m4_tinyusb", "magtag", "metro_m0", "metro_m0_tinyusb", "metro_m4", "metro_m4_tinyusb", "monster_m4sk", "monster_m4sk_tinyusb", "neokeytrinkey_m0", "neotrellis_m4", "nrf52832", "nrf52840", "pycamera_s3", "protrinket_5v", "proxlighttrinkey_m0", "pybadge", "pygamer", "pyportal", "qualia_s3_rgb666", "qt2040_trinkey", "qtpy_m0", "qtpy_esp32s2", "rotarytrinkey_m0", "slidetrinkey_m0", "trinket_m0", "uno", "trinket_5v", "ledglasses_nrf52840" ]
+        arduino-platform: ["cpb", "cpc", "cpx_ada", "esp32", "esp8266", "feather32u4", "feather_esp32c6", "feather_m0_express", "feather_m4_express", "feather_rp2040", "feather_rp2040_adalogger", "flora", "funhouse", "gemma", "gemma_m0", "hallowing_m0", "hallowing_m4_tinyusb", "ledglasses_nrf52840", "magtag", "metro_m0", "metro_m0_tinyusb", "metro_m4", "metro_m4_tinyusb", "monster_m4sk", "monster_m4sk_tinyusb", "neokeytrinkey_m0", "neotrellis_m4", "nrf52832", "nrf52840", "pixeltrinkey_m0", "protrinket_5v", "proxlighttrinkey_m0", "pybadge", "pycamera_s3",  "pygamer", "pyportal", "qualia_s3_rgb666", "qt2040_trinkey", "qtpy_m0", "qtpy_esp32s2", "rotarytrinkey_m0", "sht4xtrinkey_m0", "slidetrinkey_m0", "trinket_5v", "trinket_m0", "uno"]
     runs-on: ubuntu-latest
     if: needs.check-if-needed.outputs.answer == 'true'
     needs: check-if-needed
     steps:
     - uses: actions/setup-python@v5
       with:
         python-version: "3.x"
+
+    # Checkout the learn repo itself
+    - uses: actions/checkout@v4
+
+    # Checkout the CI scripts
     - uses: actions/checkout@v4
       with:
          repository: adafruit/ci-arduino

A4988_Examples/Arduino_A4988/Arduino_A4988.ino

@@ -0,0 +1,31 @@
+// SPDX-FileCopyrightText: 2024 Liz Clark for Adafruit Industries
+//
+// SPDX-License-Identifier: MIT
+
+const int DIR = 5;
+const int STEP = 6;
+const int microMode = 16; // microstep mode, default is 1/16 so 16; ex: 1/4 would be 4
+// full rotation * microstep divider
+const int steps = 200 * microMode;
+
+void setup()
+{
+  // setup step and dir pins as outputs
+  pinMode(STEP, OUTPUT);
+  pinMode(DIR, OUTPUT);
+}
+
+void loop()
+{
+  // change direction every loop
+  digitalWrite(DIR, !digitalRead(DIR));
+  // toggle STEP to move
+  for(int x = 0; x < steps; x++)
+  {
+    digitalWrite(STEP, HIGH);
+    delay(2);
+    digitalWrite(STEP, LOW);
+    delay(2);
+  }
+  delay(1000); // 1 second delay
+}

A4988_Examples/CircuitPython_A4988/code.py

@@ -0,0 +1,32 @@
+# SPDX-FileCopyrightText: 2024 Liz Clark for Adafruit Industries
+#
+# SPDX-License-Identifier: MIT
+
+import time
+import board
+from digitalio import DigitalInOut, Direction
+
+# direction and step pins as outputs
+DIR = DigitalInOut(board.D5)
+DIR.direction = Direction.OUTPUT
+STEP = DigitalInOut(board.D6)
+STEP.direction = Direction.OUTPUT
+
+# microstep mode, default is 1/16 so 16
+# another ex: 1/4 microstep would be 4
+microMode = 16
+# full rotation multiplied by the microstep divider
+steps = 200 * microMode
+
+while True:
+    # change direction every loop
+    DIR.value = not DIR.value
+    # toggle STEP pin to move the motor
+    for i in range(steps):
+        STEP.value = True
+        time.sleep(0.001)
+        STEP.value = False
+        time.sleep(0.001)
+    print("rotated! now reverse")
+    # 1 second delay before starting again
+    time.sleep(1)

adalogger/.uno.test.only renamed to ADG72x_Examples/Arduino_ADG728_Plotter/.uno.test.only

@@ -0,0 +1,65 @@
+// SPDX-FileCopyrightText: 2024 Liz Clark for Adafruit Industries
+//
+// SPDX-License-Identifier: MIT
+
+#include <Adafruit_ADG72x.h>
+
+Adafruit_ADG72x adg72x;
+
+bool isADG728 = false; // which chip are we connected to?
+
+int analogIn = A0;
+int analogValue = 0;
+unsigned long switchTimer = 1000; // 1000 ms = 1 second for channel switch
+unsigned long readTimer = 10; // 10 ms for analog read
+unsigned long lastSwitchTime = 0; // Last time the channels were switched
+unsigned long lastReadTime = 0; // Last time the analog was read
+uint8_t currentChannel = 0; // Current channel being selected
+
+void setup() {
+  Serial.begin(115200);
+
+  // Wait for serial port to open
+  while (!Serial) {
+    delay(1);
+  }
+
+  // Try with the ADG728 default address first...
+  if (adg72x.begin(ADG728_DEFAULT_ADDR, &Wire)) {
+    Serial.println("ADG728 found!");
+    isADG728 = true;
+  }
+  // Maybe they have an ADG729?
+  else if (adg72x.begin(ADG729_DEFAULT_ADDR, &Wire)) {
+    Serial.println("ADG729 found!");
+    isADG728 = false;
+  }
+  else {
+    Serial.println("No ADG device found? Check wiring!");
+    while (1); // Stop here if no device was found
+  }
+}
+
+void loop() {
+  unsigned long currentTime = millis();
+
+  // read and print analog value every 10ms
+  if ((currentTime - lastReadTime) >= readTimer) {
+    analogValue = analogRead(analogIn);
+    Serial.println(analogValue);
+    lastReadTime = currentTime;
+  }
+
+  // switch channels every 1 second
+  if ((currentTime - lastSwitchTime) >= switchTimer) {
+    uint8_t bits = 1 << currentChannel; // Shift a '1' from LSB to MSB
+    if (!adg72x.selectChannels(bits)) {
+      Serial.println("Failed to set channels...");
+    }
+    /*Serial.print((currentChannel % 4) + 1);
+    if (currentChannel < 4) Serial.println("A");
+    else       Serial.println("B");*/
+    currentChannel = (currentChannel + 1) % 8; // Move to the next channel, wrap around at 8
+    lastSwitchTime = currentTime;
+  }
+}

ADG72x_Examples/Arduino_ADG728_Plotter/Arduino_ADG728_Plotter.ino

@@ -0,0 +1,66 @@
+// SPDX-FileCopyrightText: 2024 Liz Clark for Adafruit Industries
+//
+// SPDX-License-Identifier: MIT
+
+#include <Adafruit_ADG72x.h>
+
+Adafruit_ADG72x adg72x;
+
+int analogInA0 = A0;
+int analogInA1 = A1;
+int analogValueDA = 0;
+int analogValueDB = 0;
+unsigned long switchTimer = 1000; // 1000 ms = 1 second for channel switch
+unsigned long readTimer = 10; // 10 ms for analog read
+unsigned long lastSwitchTime = 0; // Last time the channels were switched
+unsigned long lastReadTime = 0; // Last time the analog was read
+uint8_t currentChannel = 0; // Current channel being selected
+
+void setup() {
+  Serial.begin(115200);
+
+  // Wait for serial port to open
+  while (!Serial) {
+    delay(1);
+  }
+
+  // Try with the ADG728 default address first...
+  if (adg72x.begin(ADG728_DEFAULT_ADDR, &Wire)) {
+    //Serial.println("ADG728 found!");
+  }
+  // Maybe they have an ADG729?
+  else if (adg72x.begin(ADG729_DEFAULT_ADDR, &Wire)) {
+    //Serial.println("ADG729 found!");
+  }
+  else {
+    Serial.println("No ADG72x device found? Check wiring!");
+    while (1); // Stop here if no device was found
+  }
+}
+
+void loop() {
+  unsigned long currentTime = millis();
+
+  // read and print analog value every 10ms
+  if ((currentTime - lastReadTime) >= readTimer) {
+    analogValueDA = analogRead(analogInA0);
+    analogValueDB = analogRead(analogInA1);
+    Serial.print(analogValueDA);
+    Serial.print(",");
+    Serial.println(analogValueDB);
+    lastReadTime = currentTime;
+  }
+
+  // switch channels every 1 second
+  if ((currentTime - lastSwitchTime) >= switchTimer) {
+    uint8_t bits = 1 << currentChannel; // Shift a '1' from LSB to MSB
+    if (!adg72x.selectChannels(bits)) {
+      Serial.println("Failed to set channels...");
+    }
+    /*Serial.print((currentChannel % 4) + 1);
+    if (currentChannel < 4) Serial.println("A");
+    else       Serial.println("B");*/
+    currentChannel = (currentChannel + 1) % 8; // Move to the next channel, wrap around at 8
+    lastSwitchTime = currentTime;
+  }
+}

AtariFruit_Joystick/.nrf52832.test.only renamed to ADG72x_Examples/Arduino_ADG729_Plotter/.uno.test.only

@@ -0,0 +1,26 @@
+# SPDX-FileCopyrightText: Copyright (c) 2024 Liz Clark for Adafruit Industries
+#
+# SPDX-License-Identifier: MIT
+
+import time
+import board
+import adafruit_adg72x
+from analogio import AnalogIn
+
+analog_in = AnalogIn(board.A0)
+
+i2c = board.I2C()
+switch = adafruit_adg72x.ADG72x(i2c)
+
+c = 0
+switch_time = 2
+channels = [0, 4]
+clock = time.monotonic()
+while True:
+    if (time.monotonic() - clock) > switch_time:
+        print(f"Selecting channel {channels[c] + 1}")
+        switch.channel = channels[c]
+        c = (c + 1) % 2
+        clock = time.monotonic()
+    print((analog_in.value,))
+    time.sleep(0.1)

ADG72x_Examples/Arduino_ADG729_Plotter/Arduino_ADG729_Plotter.ino

@@ -0,0 +1,31 @@
+# SPDX-FileCopyrightText: Copyright (c) 2024 Liz Clark for Adafruit Industries
+#
+# SPDX-License-Identifier: MIT
+
+import time
+import board
+import adafruit_adg72x
+from analogio import AnalogIn
+
+analog_in_DA = AnalogIn(board.A0)
+analog_in_DB = AnalogIn(board.A1)
+
+i2c = board.I2C()
+switch = adafruit_adg72x.ADG72x(i2c, 0x44)
+
+c = 0
+switch_time = 3
+clock = time.monotonic()
+
+while True:
+    if (time.monotonic() - clock) > switch_time:
+        if c < 4:
+            channels = "A"
+        else:
+            channels = "B"
+        print(f"Selecting channel {(c % 4) + 1}{channels}")
+        switch.channel = c
+        c = (c + 1) % 8
+        clock = time.monotonic()
+    print((analog_in_DA.value, analog_in_DB.value,))
+    time.sleep(0.1)

ADG72x_Examples/CircuitPython_ADG728/code.py

@@ -93,7 +93,7 @@ void disableInternalPower() {
 #endif
 
 #if defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2)
-  // turn on the I2C power by setting pin to rest state (off)
+  // turn off the I2C power by setting pin to rest state (off)
   pinMode(PIN_I2C_POWER, INPUT);
   pinMode(NEOPIXEL_POWER, OUTPUT);
   digitalWrite(NEOPIXEL_POWER, LOW);

ADG72x_Examples/CircuitPython_ADG729/code.py

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: MIT
 
+import os
 import time
 import board
 import busio
@@ -15,12 +16,10 @@
 
 ### WiFi ###
 
-# Get wifi details and more from a secrets.py file
-try:
-    from secrets import secrets
-except ImportError:
-    print("WiFi secrets are kept in secrets.py, please add them there!")
-    raise
+secrets = {
+    "ssid" : os.getenv("CIRCUITPY_WIFI_SSID"),
+    "password" : os.getenv("CIRCUITPY_WIFI_PASSWORD"),
+}
 
 # If you are using a board with pre-defined ESP32 Pins:
 esp32_cs = DigitalInOut(board.ESP_CS)
@@ -55,7 +54,7 @@
 
 ### Feeds ###
 # Set up a feed named Relay for subscribing to the relay feed on Adafruit IO
-feed_relay = secrets["aio_username"] + "/feeds/relay"
+feed_relay = os.getenv("AIO_USERNAME") + "/feeds/relay"
 
 ### Code ###
 
@@ -107,8 +106,8 @@ def on_relay_msg(client, topic, value):
 # Set up a MiniMQTT Client
 client = MQTT.MQTT(
     broker="io.adafruit.com",
-    username=secrets["aio_username"],
-    password=secrets["aio_key"],
+    username=os.getenv("AIO_USERNAME"),
+    password=os.getenv("AIO_KEY"),
     socket_pool=pool,
     ssl_context=ssl_context,
 )

Adafruit_ESP32_Arduino_Demos/ESP32_sleeptest/ESP32_sleeptest.ino

@@ -46,7 +46,7 @@
 print("MAC addr:", [hex(i) for i in esp.MAC_address])
 
 for ap in esp.scan_networks():
-    print("\t%s\t\tRSSI: %d" % (str(ap['ssid'], 'utf-8'), ap['rssi']))
+    print("\t%s\t\tRSSI: %d" % (str(ap.ssid, 'utf-8'), ap.rssi))
 
 print("Connecting to AP...")
 while not esp.is_connected:
@@ -55,7 +55,7 @@
     except RuntimeError as e:
         print("could not connect to AP, retrying: ", e)
         continue
-print("Connected to", str(esp.ssid, "utf-8"), "\tRSSI:", esp.rssi)
+print("Connected to", str(esp.ap_info.ssid, "utf-8"), "\tRSSI:", esp.ap_info.rssi)
 print("My IP address is", esp.pretty_ip(esp.ip_address))
 
 print(