Merge remote-tracking branch 'adafruit/master'

Author: dastels

Adafruit_ESP32_Arduino_Demos/SerialESPPassthrough/PyBadge M4 with AirLift Wing Passthru.UF2

@@ -1,64 +1,75 @@
-/*
-  SerialNINAPassthrough - Use esptool to flash the ESP32 module
-  For use with PyPortal, Metro M4 WiFi...
-
-  Copyright (c) 2018 Arduino SA. All rights reserved.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-
-#include <Adafruit_NeoPixel.h>
-
-unsigned long baud = 115200;
-
-Adafruit_NeoPixel pixel = Adafruit_NeoPixel(1, 2, NEO_GRB + NEO_KHZ800);
-
-
-void setup() {
-  Serial.begin(baud);
-  pixel.begin();
-  pixel.setPixelColor(0, 10, 10, 10); pixel.show();
-
-  while (!Serial);
-  pixel.setPixelColor(0, 50, 50, 50); pixel.show();
-
-  delay(100);
-  SerialNina.begin(baud);
-
-  pinMode(13, OUTPUT);
-  pinMode(NINA_GPIO0, OUTPUT);
-  pinMode(NINA_RESETN, OUTPUT);
-  
-  // manually put the ESP32 in upload mode
-  digitalWrite(NINA_GPIO0, LOW);
-
-  digitalWrite(NINA_RESETN, LOW);
-  delay(100);
-  digitalWrite(NINA_RESETN, HIGH);
-  pixel.setPixelColor(0, 20, 20, 0); pixel.show();
-  delay(100);
-}
-
-void loop() {
-  while (Serial.available()) {
-    pixel.setPixelColor(0, 10, 0, 0); pixel.show();
-    SerialESP32.write(Serial.read());
-  }
-
-  while (SerialNina.available()) {
-    pixel.setPixelColor(0, 0, 0, 10); pixel.show();
-    Serial.write(SerialNina.read());
-  }
-}
+/*
+  SerialNINAPassthrough - Use esptool to flash the ESP32 module
+  For use with PyPortal, Metro M4 WiFi...
+
+  Copyright (c) 2018 Arduino SA. All rights reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include <Adafruit_NeoPixel.h>
+
+unsigned long baud = 115200;
+
+#if defined(ADAFRUIT_FEATHER_M4_EXPRESS) || defined(ADAFRUIT_PYBADGE_M4_EXPRESS) || defined(ADAFRUIT_PYGAMER_M4_EXPRESS)
+  // Configure the pins used for the ESP32 connection via 
+  #define SerialESP32   Serial1
+  #define SPIWIFI       SPI    // The SPI port
+  #define SPIWIFI_SS    13   // Chip select pin
+  #define ESP32_RESETN  12   // Reset pin
+  #define SPIWIFI_ACK   11   // a.k.a BUSY or READY pin
+  #define ESP32_GPIO0   10
+  #define NEOPIXEL_PIN   8
+#endif
+
+Adafruit_NeoPixel pixel = Adafruit_NeoPixel(1, NEOPIXEL_PIN, NEO_GRB + NEO_KHZ800);
+
+
+void setup() {
+  Serial.begin(baud);
+  pixel.begin();
+  pixel.setPixelColor(0, 10, 10, 10); pixel.show();
+
+  while (!Serial);
+  pixel.setPixelColor(0, 50, 50, 50); pixel.show();
+
+  delay(100);
+  SerialESP32.begin(baud);
+
+  pinMode(SPIWIFI_SS, OUTPUT);
+  pinMode(ESP32_GPIO0, OUTPUT);
+  pinMode(ESP32_RESETN, OUTPUT);
+  
+  // manually put the ESP32 in upload mode
+  digitalWrite(ESP32_GPIO0, LOW);
+
+  digitalWrite(ESP32_RESETN, LOW);
+  delay(100);
+  digitalWrite(ESP32_RESETN, HIGH);
+  pixel.setPixelColor(0, 20, 20, 0); pixel.show();
+  delay(100);
+}
+
+void loop() {
+  while (Serial.available()) {
+    pixel.setPixelColor(0, 10, 0, 0); pixel.show();
+    SerialESP32.write(Serial.read());
+  }
+
+  while (SerialESP32.available()) {
+    pixel.setPixelColor(0, 0, 0, 10); pixel.show();
+    Serial.write(SerialESP32.read());
+  }
+}

Adafruit_ESP32_Arduino_Demos/SerialESPPassthrough/SerialESPPassthrough.ino

@@ -0,0 +1,20 @@
+## Code for the Adafruit Learning System guide Gyroscopic Marble Maze
+
+See the full tutorial at https://learn.adafruit.com/gryo-marble-maze/
+
+The **code.py** file should be copied onto the **CIRCUITPY** flash drive that appears 
+when you plug the CircuitPlayground Express into your computer via a known 
+good USB cable. 
+
+If the only drive name you get is named **CPLAYBOOT**, CircuitPython may not be loaded 
+on the board. You can load CircuitPython as 
+[per this guide](https://learn.adafruit.com/adafruit-circuit-playground-express/circuitpython-quickstart). 
+Then you should be able to see the **CIRCUITPY** drive when connected via USB.
+
+CircuitPython resources are at https://CircuitPython.Org/
+
+Code written by Dano Wall and Mike Barela for Adafruit Industries. 
+
+MIT License, please attribute.
+
+Support Open Source development by buying your materials at [Adafruit.com](https://www.adafruit.com/).

CPX_Marble_Maze/README.md

@@ -0,0 +1,47 @@
+# CircuitPython code for the Gyroscopic Marble Maze
+# Adafruit Industries, 2019. MIT License
+import time
+import board
+import pulseio
+from adafruit_motor import servo
+import simpleio
+from adafruit_circuitplayground.express import cpx
+
+# create a PWMOut object on Pin A2.
+pwm1 = pulseio.PWMOut(board.A1, duty_cycle=2 ** 15, frequency=50)
+pwm2 = pulseio.PWMOut(board.A2, duty_cycle=2 ** 15, frequency=50)
+
+# Create a servo object, my_servo.
+my_servo1 = servo.Servo(pwm1)
+my_servo2 = servo.Servo(pwm2)
+
+NUM_READINGS = 8
+roll_readings = [90] * NUM_READINGS
+pitch_readings = [90] * NUM_READINGS
+
+def Average(lst):
+    return sum(lst) / len(lst)
+
+while True:
+    x, y, z = cpx.acceleration  # x = green
+    print((x, y, z))
+
+    roll = simpleio.map_range(x, -9.8, 9.8, 0, 180)
+    roll_readings = roll_readings[1:]
+    roll_readings.append(roll)
+    roll = Average(roll_readings)
+
+    print(roll)
+
+    my_servo1.angle = roll
+
+    pitch = simpleio.map_range(y, -9.8, 9.8, 0, 180)
+    pitch_readings = pitch_readings[1:]
+    pitch_readings.append(pitch)
+    pitch = Average(pitch_readings)
+
+    print(pitch)
+
+    my_servo2.angle = pitch
+
+    time.sleep(0.05)

CPX_Marble_Maze/code.py

@@ -0,0 +1,20 @@
+## Code for the Adafruit Learning System guide CircuitPython Powered AT Hand-Raiser
+
+See the full tutorial at https://learn.adafruit.com/AT-Hand-Raiser/
+
+The **code.py** file should be copied onto the **CIRCUITPY** flash drive that appears 
+when you plug the CircuitPlayground Express into your computer via a known 
+good USB cable. 
+
+If the only drive name you get is named **CPLAYBOOT**, CircuitPython may not be loaded 
+on the board. You can load CircuitPython as 
+[per this guide](https://learn.adafruit.com/adafruit-circuit-playground-express/circuitpython-quickstart). 
+Then you should be able to see the **CIRCUITPY** drive when connected via USB.
+
+CircuitPython resources are at https://CircuitPython.Org/
+
+Code written by Bill Binko. 
+
+MIT License, please attribute.
+
+Support Open Source development by buying your materials at [Adafruit.com](https://www.adafruit.com/).