Skip to content

Commit 76b4975

Browse files
committed
Merge remote-tracking branch 'adafruit/master'
2 parents 90de341 + d5d5e71 commit 76b4975

File tree

602 files changed

+893017
-760
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

602 files changed

+893017
-760
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ Hue_Controller/secrets.h
33
.idea
44
*.DS_Store
55
CircuitPython_Logger/secrets\.py
6+
.python-version

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ cache:
1515

1616
env:
1717
global:
18-
- ARDUINO_IDE_VERSION="1.8.7"
18+
- ARDUINO_IDE_VERSION="1.8.11"
1919
- PRETTYNAME="Adafruit Learning System Guides"
2020
- PLATFORM_CHECK_ONLY_ON_FILE=true
2121

Adafruit_ESP32_Arduino_Demos/SerialESPPassthrough/SerialESPPassthrough.ino

Lines changed: 43 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,58 @@
2323

2424
unsigned long baud = 115200;
2525

26-
#if defined(ADAFRUIT_FEATHER_M4_EXPRESS) || defined(ADAFRUIT_PYBADGE_M4_EXPRESS) || defined(ADAFRUIT_PYGAMER_M4_EXPRESS)
27-
// Configure the pins used for the ESP32 connection via
26+
#if defined(ADAFRUIT_FEATHER_M4_EXPRESS) || \
27+
defined(ADAFRUIT_FEATHER_M0_EXPRESS) || \
28+
defined(ARDUINO_AVR_FEATHER32U4) || \
29+
defined(ARDUINO_NRF52840_FEATHER) || \
30+
defined(ADAFRUIT_ITSYBITSY_M0_EXPRESS) || \
31+
defined(ADAFRUIT_ITSYBITSY_M4_EXPRESS) || \
32+
defined(ARDUINO_AVR_ITSYBITSY32U4_3V)
33+
// Configure the pins used for the ESP32 connection
2834
#define SerialESP32 Serial1
29-
#define SPIWIFI SPI // The SPI port
35+
#define SPIWIFI SPI // The SPI port
3036
#define SPIWIFI_SS 13 // Chip select pin
3137
#define ESP32_RESETN 12 // Reset pin
3238
#define SPIWIFI_ACK 11 // a.k.a BUSY or READY pin
3339
#define ESP32_GPIO0 10
3440
#define NEOPIXEL_PIN 8
41+
#elif defined(ARDUINO_AVR_FEATHER328P)
42+
#define SerialESP32 Serial1
43+
#define SPIWIFI SPI // The SPI port
44+
#define SPIWIFI_SS 4 // Chip select pin
45+
#define ESP32_RESETN 3 // Reset pin
46+
#define SPIWIFI_ACK 2 // a.k.a BUSY or READY pin
47+
#define ESP32_GPIO0 -1
48+
#define NEOPIXEL_PIN 8
49+
#elif defined(TEENSYDUINO)
50+
#define SerialESP32 Serial1
51+
#define SPIWIFI SPI // The SPI port
52+
#define SPIWIFI_SS 5 // Chip select pin
53+
#define ESP32_RESETN 6 // Reset pin
54+
#define SPIWIFI_ACK 9 // a.k.a BUSY or READY pin
55+
#define ESP32_GPIO0 -1
56+
#define NEOPIXEL_PIN 8
57+
#elif defined(ARDUINO_NRF52832_FEATHER )
58+
#define SerialESP32 Serial1
59+
#define SPIWIFI SPI // The SPI port
60+
#define SPIWIFI_SS 16 // Chip select pin
61+
#define ESP32_RESETN 15 // Reset pin
62+
#define SPIWIFI_ACK 7 // a.k.a BUSY or READY pin
63+
#define ESP32_GPIO0 -1
64+
#define NEOPIXEL_PIN 8
65+
#elif !defined(SPIWIFI_SS) // if the wifi definition isnt in the board variant
66+
// Don't change the names of these #define's! they match the variant ones
67+
#define SerialESP32 Serial1
68+
#define SPIWIFI SPI
69+
#define SPIWIFI_SS 10 // Chip select pin
70+
#define SPIWIFI_ACK 7 // a.k.a BUSY or READY pin
71+
#define ESP32_RESETN 5 // Reset pin
72+
#define ESP32_GPIO0 -1 // Not connected
73+
#define NEOPIXEL_PIN 8
3574
#endif
3675

3776
Adafruit_NeoPixel pixel = Adafruit_NeoPixel(1, NEOPIXEL_PIN, NEO_GRB + NEO_KHZ800);
3877

39-
4078
void setup() {
4179
Serial.begin(baud);
4280
pixel.begin();
@@ -72,4 +110,4 @@ void loop() {
72110
pixel.setPixelColor(0, 0, 0, 10); pixel.show();
73111
Serial.write(SerialESP32.read());
74112
}
75-
}
113+
}
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
"""Sensor demo for Adafruit Feather Sense. Prints data from each of the sensors."""
2+
import time
3+
import array
4+
import math
5+
import board
6+
import audiobusio
7+
import adafruit_apds9960.apds9960
8+
import adafruit_bmp280
9+
import adafruit_lis3mdl
10+
import adafruit_lsm6ds
11+
import adafruit_sht31d
12+
13+
i2c = board.I2C()
14+
15+
apds9960 = adafruit_apds9960.apds9960.APDS9960(i2c)
16+
bmp280 = adafruit_bmp280.Adafruit_BMP280_I2C(i2c)
17+
lis3mdl = adafruit_lis3mdl.LIS3MDL(i2c)
18+
lsm6ds33 = adafruit_lsm6ds.LSM6DS33(i2c)
19+
sht31d = adafruit_sht31d.SHT31D(i2c)
20+
microphone = audiobusio.PDMIn(board.MICROPHONE_CLOCK, board.MICROPHONE_DATA,
21+
sample_rate=16000, bit_depth=16)
22+
23+
def normalized_rms(values):
24+
minbuf = int(sum(values) / len(values))
25+
return int(math.sqrt(sum(float(sample - minbuf) *
26+
(sample - minbuf) for sample in values) / len(values)))
27+
28+
apds9960.enable_proximity = True
29+
apds9960.enable_color = True
30+
31+
# Set this to sea level pressure in hectoPascals at your location for accurate altitude reading.
32+
bmp280.sea_level_pressure = 1013.25
33+
34+
while True:
35+
samples = array.array('H', [0] * 160)
36+
microphone.record(samples, len(samples))
37+
38+
print("\nFeather Sense Sensor Demo")
39+
print("---------------------------------------------")
40+
print("Proximity:", apds9960.proximity())
41+
print("Red: {}, Green: {}, Blue: {}, Clear: {}".format(*apds9960.color_data))
42+
print("Temperature: {:.1f} C".format(bmp280.temperature))
43+
print("Barometric pressure:", bmp280.pressure)
44+
print("Altitude: {:.1f} m".format(bmp280.altitude))
45+
print("Magnetic: {:.3f} {:.3f} {:.3f} uTesla".format(*lis3mdl.magnetic))
46+
print("Acceleration: {:.2f} {:.2f} {:.2f} m/s^2".format(*lsm6ds33.acceleration))
47+
print("Gyro: {:.2f} {:.2f} {:.2f} dps".format(*lsm6ds33.gyro))
48+
print("Humidity: {:.1f} %".format(sht31d.relative_humidity))
49+
print("Sound level:", normalized_rms(samples))
50+
time.sleep(0.3)
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import time
2+
import board
3+
import digitalio
4+
5+
relay = digitalio.DigitalInOut(board.A1)
6+
relay.direction = digitalio.Direction.OUTPUT
7+
8+
while True:
9+
relay.value = True
10+
time.sleep(1)
11+
relay.value = False
12+
time.sleep(1)
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
from adafruit_circuitplayground.express import cpx
2+
3+
while True:
4+
if cpx.button_a:
5+
cpx.play_file("rise.wav")
6+
if cpx.button_b:
7+
cpx.play_file("dip.wav")
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
from adafruit_circuitplayground.express import cpx
2+
3+
while True:
4+
if cpx.button_a:
5+
cpx.play_tone(260, 1)
6+
if cpx.button_b:
7+
cpx.play_tone(292, 1)

Adafruit_STEMMA_Speaker/dip.wav

25.9 KB
Binary file not shown.

Adafruit_STEMMA_Speaker/rise.wav

25.7 KB
Binary file not shown.

0 commit comments

Comments
 (0)