Skip to content

Commit ac455da

Browse files
ladyadaladyada
authored
Merge pull request #22 from brentru/update-simpletest
Update simpletest examples to detect boards with built-in ESP32
2 parents 2ae8741 + 5876119 commit ac455da

9 files changed

+82
-137
lines changed

‎examples/adafruit_io_simpletest_analog_in.py

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,29 +25,23 @@
2525
print("WiFi secrets are kept in secrets.py, please add them there!")
2626
raise
2727

28-
# PyPortal ESP32 Setup
29-
esp32_cs = DigitalInOut(board.ESP_CS)
30-
esp32_ready = DigitalInOut(board.ESP_BUSY)
31-
esp32_reset = DigitalInOut(board.ESP_RESET)
28+
# ESP32 Setup
29+
try:
30+
esp32_cs = DigitalInOut(board.ESP_CS)
31+
esp32_ready = DigitalInOut(board.ESP_BUSY)
32+
esp32_reset = DigitalInOut(board.ESP_RESET)
33+
except AttributeError:
34+
esp32_cs = DigitalInOut(board.D9)
35+
esp32_ready = DigitalInOut(board.D10)
36+
esp32_reset = DigitalInOut(board.D5)
37+
3238
spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
3339
esp = adafruit_esp32spi.ESP_SPIcontrol(spi, esp32_cs, esp32_ready, esp32_reset)
34-
"""Use below for Most Boards"""
3540
status_light = neopixel.NeoPixel(board.NEOPIXEL, 1, brightness=0.2) # Uncomment for Most Boards
3641
"""Uncomment below for ItsyBitsy M4"""
3742
#status_light = dotstar.DotStar(board.APA102_SCK, board.APA102_MOSI, 1, brightness=0.2)
3843
wifi = adafruit_esp32spi_wifimanager.ESPSPI_WiFiManager(esp, secrets, status_light)
3944

40-
"""
41-
# ESP32 Setup
42-
esp32_cs = DigitalInOut(board.D9)
43-
esp32_ready = DigitalInOut(board.D10)
44-
esp32_reset = DigitalInOut(board.D5)
45-
spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
46-
esp = adafruit_esp32spi.ESP_SPIcontrol(spi, esp32_cs, esp32_ready, esp32_reset)
47-
status_light = neopixel.NeoPixel(board.NEOPIXEL, 1, brightness=0.2)
48-
wifi = adafruit_esp32spi_wifimanager.ESPSPI_WiFiManager(esp, secrets, status_light)
49-
"""
50-
5145
# Set your Adafruit IO Username and Key in secrets.py
5246
# (visit io.adafruit.com if you need to create an account,
5347
# or if you need your Adafruit IO key.)

‎examples/adafruit_io_simpletest_data.py

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,28 +23,22 @@
2323
raise
2424

2525
# ESP32 Setup
26-
esp32_cs = DigitalInOut(board.D9)
27-
esp32_ready = DigitalInOut(board.D10)
28-
esp32_reset = DigitalInOut(board.D5)
26+
try:
27+
esp32_cs = DigitalInOut(board.ESP_CS)
28+
esp32_ready = DigitalInOut(board.ESP_BUSY)
29+
esp32_reset = DigitalInOut(board.ESP_RESET)
30+
except AttributeError:
31+
esp32_cs = DigitalInOut(board.D9)
32+
esp32_ready = DigitalInOut(board.D10)
33+
esp32_reset = DigitalInOut(board.D5)
34+
2935
spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
3036
esp = adafruit_esp32spi.ESP_SPIcontrol(spi, esp32_cs, esp32_ready, esp32_reset)
31-
"""Use below for Most Boards"""
3237
status_light = neopixel.NeoPixel(board.NEOPIXEL, 1, brightness=0.2) # Uncomment for Most Boards
3338
"""Uncomment below for ItsyBitsy M4"""
3439
#status_light = dotstar.DotStar(board.APA102_SCK, board.APA102_MOSI, 1, brightness=0.2)
3540
wifi = adafruit_esp32spi_wifimanager.ESPSPI_WiFiManager(esp, secrets, status_light)
3641

37-
"""
38-
# PyPortal ESP32 Setup
39-
esp32_cs = DigitalInOut(board.ESP_CS)
40-
esp32_ready = DigitalInOut(board.ESP_BUSY)
41-
esp32_reset = DigitalInOut(board.ESP_RESET)
42-
spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
43-
esp = adafruit_esp32spi.ESP_SPIcontrol(spi, esp32_cs, esp32_ready, esp32_reset)
44-
status_light = neopixel.NeoPixel(board.NEOPIXEL, 1, brightness=0.2)
45-
wifi = adafruit_esp32spi_wifimanager.ESPSPI_WiFiManager(esp, secrets, status_light)
46-
"""
47-
4842
# Set your Adafruit IO Username and Key in secrets.py
4943
# (visit io.adafruit.com if you need to create an account,
5044
# or if you need your Adafruit IO key.)

‎examples/adafruit_io_simpletest_digital_out.py

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,28 +24,22 @@
2424
raise
2525

2626
# ESP32 Setup
27-
esp32_cs = DigitalInOut(board.D9)
28-
esp32_ready = DigitalInOut(board.D10)
29-
esp32_reset = DigitalInOut(board.D5)
27+
try:
28+
esp32_cs = DigitalInOut(board.ESP_CS)
29+
esp32_ready = DigitalInOut(board.ESP_BUSY)
30+
esp32_reset = DigitalInOut(board.ESP_RESET)
31+
except AttributeError:
32+
esp32_cs = DigitalInOut(board.D9)
33+
esp32_ready = DigitalInOut(board.D10)
34+
esp32_reset = DigitalInOut(board.D5)
35+
3036
spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
3137
esp = adafruit_esp32spi.ESP_SPIcontrol(spi, esp32_cs, esp32_ready, esp32_reset)
32-
"""Use below for Most Boards"""
3338
status_light = neopixel.NeoPixel(board.NEOPIXEL, 1, brightness=0.2) # Uncomment for Most Boards
3439
"""Uncomment below for ItsyBitsy M4"""
3540
#status_light = dotstar.DotStar(board.APA102_SCK, board.APA102_MOSI, 1, brightness=0.2)
3641
wifi = adafruit_esp32spi_wifimanager.ESPSPI_WiFiManager(esp, secrets, status_light)
3742

38-
"""
39-
# PyPortal ESP32 Setup
40-
esp32_cs = DigitalInOut(board.ESP_CS)
41-
esp32_ready = DigitalInOut(board.ESP_BUSY)
42-
esp32_reset = DigitalInOut(board.ESP_RESET)
43-
spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
44-
esp = adafruit_esp32spi.ESP_SPIcontrol(spi, esp32_cs, esp32_ready, esp32_reset)
45-
status_light = neopixel.NeoPixel(board.NEOPIXEL, 1, brightness=0.2)
46-
wifi = adafruit_esp32spi_wifimanager.ESPSPI_WiFiManager(esp, secrets, status_light)
47-
"""
48-
4943
# Set your Adafruit IO Username and Key in secrets.py
5044
# (visit io.adafruit.com if you need to create an account,
5145
# or if you need your Adafruit IO key.)

‎examples/adafruit_io_simpletest_feeds.py

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,28 +22,22 @@
2222
raise
2323

2424
# ESP32 Setup
25-
esp32_cs = DigitalInOut(board.D9)
26-
esp32_ready = DigitalInOut(board.D10)
27-
esp32_reset = DigitalInOut(board.D5)
25+
try:
26+
esp32_cs = DigitalInOut(board.ESP_CS)
27+
esp32_ready = DigitalInOut(board.ESP_BUSY)
28+
esp32_reset = DigitalInOut(board.ESP_RESET)
29+
except AttributeError:
30+
esp32_cs = DigitalInOut(board.D9)
31+
esp32_ready = DigitalInOut(board.D10)
32+
esp32_reset = DigitalInOut(board.D5)
33+
2834
spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
2935
esp = adafruit_esp32spi.ESP_SPIcontrol(spi, esp32_cs, esp32_ready, esp32_reset)
30-
"""Use below for Most Boards"""
3136
status_light = neopixel.NeoPixel(board.NEOPIXEL, 1, brightness=0.2) # Uncomment for Most Boards
3237
"""Uncomment below for ItsyBitsy M4"""
3338
#status_light = dotstar.DotStar(board.APA102_SCK, board.APA102_MOSI, 1, brightness=0.2)
3439
wifi = adafruit_esp32spi_wifimanager.ESPSPI_WiFiManager(esp, secrets, status_light)
3540

36-
"""
37-
# PyPortal ESP32 Setup
38-
esp32_cs = DigitalInOut(board.ESP_CS)
39-
esp32_ready = DigitalInOut(board.ESP_BUSY)
40-
esp32_reset = DigitalInOut(board.ESP_RESET)
41-
spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
42-
esp = adafruit_esp32spi.ESP_SPIcontrol(spi, esp32_cs, esp32_ready, esp32_reset)
43-
status_light = neopixel.NeoPixel(board.NEOPIXEL, 1, brightness=0.2)
44-
wifi = adafruit_esp32spi_wifimanager.ESPSPI_WiFiManager(esp, secrets, status_light)
45-
"""
46-
4741
# Set your Adafruit IO Username and Key in secrets.py
4842
# (visit io.adafruit.com if you need to create an account,
4943
# or if you need your Adafruit IO key.)

‎examples/adafruit_io_simpletest_groups.py

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,28 +22,21 @@
2222
raise
2323

2424
# ESP32 Setup
25-
esp32_cs = DigitalInOut(board.D9)
26-
esp32_ready = DigitalInOut(board.D10)
27-
esp32_reset = DigitalInOut(board.D5)
25+
try:
26+
esp32_cs = DigitalInOut(board.ESP_CS)
27+
esp32_ready = DigitalInOut(board.ESP_BUSY)
28+
esp32_reset = DigitalInOut(board.ESP_RESET)
29+
except AttributeError:
30+
esp32_cs = DigitalInOut(board.D9)
31+
esp32_ready = DigitalInOut(board.D10)
32+
esp32_reset = DigitalInOut(board.D5)
33+
2834
spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
2935
esp = adafruit_esp32spi.ESP_SPIcontrol(spi, esp32_cs, esp32_ready, esp32_reset)
30-
"""Use below for Most Boards"""
3136
status_light = neopixel.NeoPixel(board.NEOPIXEL, 1, brightness=0.2) # Uncomment for Most Boards
3237
"""Uncomment below for ItsyBitsy M4"""
3338
#status_light = dotstar.DotStar(board.APA102_SCK, board.APA102_MOSI, 1, brightness=0.2)
3439
wifi = adafruit_esp32spi_wifimanager.ESPSPI_WiFiManager(esp, secrets, status_light)
35-
36-
"""
37-
# PyPortal ESP32 Setup
38-
esp32_cs = DigitalInOut(board.ESP_CS)
39-
esp32_ready = DigitalInOut(board.ESP_BUSY)
40-
esp32_reset = DigitalInOut(board.ESP_RESET)
41-
spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
42-
esp = adafruit_esp32spi.ESP_SPIcontrol(spi, esp32_cs, esp32_ready, esp32_reset)
43-
status_light = neopixel.NeoPixel(board.NEOPIXEL, 1, brightness=0.2)
44-
wifi = adafruit_esp32spi_wifimanager.ESPSPI_WiFiManager(esp, secrets, status_light)
45-
"""
46-
4740
# Set your Adafruit IO Username and Key in secrets.py
4841
# (visit io.adafruit.com if you need to create an account,
4942
# or if you need your Adafruit IO key.)

‎examples/adafruit_io_simpletest_metadata.py

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,28 +23,22 @@
2323
raise
2424

2525
# ESP32 Setup
26-
esp32_cs = DigitalInOut(board.D9)
27-
esp32_ready = DigitalInOut(board.D10)
28-
esp32_reset = DigitalInOut(board.D5)
26+
try:
27+
esp32_cs = DigitalInOut(board.ESP_CS)
28+
esp32_ready = DigitalInOut(board.ESP_BUSY)
29+
esp32_reset = DigitalInOut(board.ESP_RESET)
30+
except AttributeError:
31+
esp32_cs = DigitalInOut(board.D9)
32+
esp32_ready = DigitalInOut(board.D10)
33+
esp32_reset = DigitalInOut(board.D5)
34+
2935
spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
3036
esp = adafruit_esp32spi.ESP_SPIcontrol(spi, esp32_cs, esp32_ready, esp32_reset)
31-
"""Use below for Most Boards"""
3237
status_light = neopixel.NeoPixel(board.NEOPIXEL, 1, brightness=0.2) # Uncomment for Most Boards
3338
"""Uncomment below for ItsyBitsy M4"""
3439
#status_light = dotstar.DotStar(board.APA102_SCK, board.APA102_MOSI, 1, brightness=0.2)
3540
wifi = adafruit_esp32spi_wifimanager.ESPSPI_WiFiManager(esp, secrets, status_light)
3641

37-
"""
38-
# PyPortal ESP32 Setup
39-
esp32_cs = DigitalInOut(board.ESP_CS)
40-
esp32_ready = DigitalInOut(board.ESP_BUSY)
41-
esp32_reset = DigitalInOut(board.ESP_RESET)
42-
spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
43-
esp = adafruit_esp32spi.ESP_SPIcontrol(spi, esp32_cs, esp32_ready, esp32_reset)
44-
status_light = neopixel.NeoPixel(board.NEOPIXEL, 1, brightness=0.2)
45-
wifi = adafruit_esp32spi_wifimanager.ESPSPI_WiFiManager(esp, secrets, status_light)
46-
"""
47-
4842
# Set your Adafruit IO Username and Key in secrets.py
4943
# (visit io.adafruit.com if you need to create an account,
5044
# or if you need your Adafruit IO key.)

‎examples/adafruit_io_simpletest_randomizer.py

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,28 +24,22 @@
2424
raise
2525

2626
# ESP32 Setup
27-
esp32_cs = DigitalInOut(board.D9)
28-
esp32_ready = DigitalInOut(board.D10)
29-
esp32_reset = DigitalInOut(board.D5)
27+
try:
28+
esp32_cs = DigitalInOut(board.ESP_CS)
29+
esp32_ready = DigitalInOut(board.ESP_BUSY)
30+
esp32_reset = DigitalInOut(board.ESP_RESET)
31+
except AttributeError:
32+
esp32_cs = DigitalInOut(board.D9)
33+
esp32_ready = DigitalInOut(board.D10)
34+
esp32_reset = DigitalInOut(board.D5)
35+
3036
spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
3137
esp = adafruit_esp32spi.ESP_SPIcontrol(spi, esp32_cs, esp32_ready, esp32_reset)
32-
"""Use below for Most Boards"""
3338
status_light = neopixel.NeoPixel(board.NEOPIXEL, 1, brightness=0.2) # Uncomment for Most Boards
3439
"""Uncomment below for ItsyBitsy M4"""
3540
#status_light = dotstar.DotStar(board.APA102_SCK, board.APA102_MOSI, 1, brightness=0.2)
3641
wifi = adafruit_esp32spi_wifimanager.ESPSPI_WiFiManager(esp, secrets, status_light)
3742

38-
"""
39-
# PyPortal ESP32 Setup
40-
esp32_cs = DigitalInOut(board.ESP_CS)
41-
esp32_ready = DigitalInOut(board.ESP_BUSY)
42-
esp32_reset = DigitalInOut(board.ESP_RESET)
43-
spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
44-
esp = adafruit_esp32spi.ESP_SPIcontrol(spi, esp32_cs, esp32_ready, esp32_reset)
45-
status_light = neopixel.NeoPixel(board.NEOPIXEL, 1, brightness=0.2)
46-
wifi = adafruit_esp32spi_wifimanager.ESPSPI_WiFiManager(esp, secrets, status_light)
47-
"""
48-
4943
# Set your Adafruit IO Username and Key in secrets.py
5044
# (visit io.adafruit.com if you need to create an account,
5145
# or if you need your Adafruit IO key.)

‎examples/adafruit_io_simpletest_temperature.py

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,28 +31,22 @@
3131
raise
3232

3333
# ESP32 Setup
34-
esp32_cs = DigitalInOut(board.D9)
35-
esp32_ready = DigitalInOut(board.D10)
36-
esp32_reset = DigitalInOut(board.D5)
34+
try:
35+
esp32_cs = DigitalInOut(board.ESP_CS)
36+
esp32_ready = DigitalInOut(board.ESP_BUSY)
37+
esp32_reset = DigitalInOut(board.ESP_RESET)
38+
except AttributeError:
39+
esp32_cs = DigitalInOut(board.D9)
40+
esp32_ready = DigitalInOut(board.D10)
41+
esp32_reset = DigitalInOut(board.D5)
42+
3743
spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
3844
esp = adafruit_esp32spi.ESP_SPIcontrol(spi, esp32_cs, esp32_ready, esp32_reset)
39-
"""Use below for Most Boards"""
4045
status_light = neopixel.NeoPixel(board.NEOPIXEL, 1, brightness=0.2) # Uncomment for Most Boards
4146
"""Uncomment below for ItsyBitsy M4"""
4247
#status_light = dotstar.DotStar(board.APA102_SCK, board.APA102_MOSI, 1, brightness=0.2)
4348
wifi = adafruit_esp32spi_wifimanager.ESPSPI_WiFiManager(esp, secrets, status_light)
4449

45-
"""
46-
# PyPortal ESP32 Setup
47-
esp32_cs = DigitalInOut(board.ESP_CS)
48-
esp32_ready = DigitalInOut(board.ESP_BUSY)
49-
esp32_reset = DigitalInOut(board.ESP_RESET)
50-
spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
51-
esp = adafruit_esp32spi.ESP_SPIcontrol(spi, esp32_cs, esp32_ready, esp32_reset)
52-
status_light = neopixel.NeoPixel(board.NEOPIXEL, 1, brightness=0.2)
53-
wifi = adafruit_esp32spi_wifimanager.ESPSPI_WiFiManager(esp, secrets, status_light)
54-
"""
55-
5650
# Set your Adafruit IO Username and Key in secrets.py
5751
# (visit io.adafruit.com if you need to create an account,
5852
# or if you need your Adafruit IO key.)

‎examples/adafruit_io_simpletest_weather.py

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,28 +25,22 @@
2525
raise
2626

2727
# ESP32 Setup
28-
esp32_cs = DigitalInOut(board.D9)
29-
esp32_ready = DigitalInOut(board.D10)
30-
esp32_reset = DigitalInOut(board.D5)
28+
try:
29+
esp32_cs = DigitalInOut(board.ESP_CS)
30+
esp32_ready = DigitalInOut(board.ESP_BUSY)
31+
esp32_reset = DigitalInOut(board.ESP_RESET)
32+
except AttributeError:
33+
esp32_cs = DigitalInOut(board.D9)
34+
esp32_ready = DigitalInOut(board.D10)
35+
esp32_reset = DigitalInOut(board.D5)
36+
3137
spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
3238
esp = adafruit_esp32spi.ESP_SPIcontrol(spi, esp32_cs, esp32_ready, esp32_reset)
33-
"""Use below for Most Boards"""
3439
status_light = neopixel.NeoPixel(board.NEOPIXEL, 1, brightness=0.2) # Uncomment for Most Boards
3540
"""Uncomment below for ItsyBitsy M4"""
3641
#status_light = dotstar.DotStar(board.APA102_SCK, board.APA102_MOSI, 1, brightness=0.2)
3742
wifi = adafruit_esp32spi_wifimanager.ESPSPI_WiFiManager(esp, secrets, status_light)
3843

39-
"""
40-
# PyPortal ESP32 Setup
41-
esp32_cs = DigitalInOut(board.ESP_CS)
42-
esp32_ready = DigitalInOut(board.ESP_BUSY)
43-
esp32_reset = DigitalInOut(board.ESP_RESET)
44-
spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
45-
esp = adafruit_esp32spi.ESP_SPIcontrol(spi, esp32_cs, esp32_ready, esp32_reset)
46-
status_light = neopixel.NeoPixel(board.NEOPIXEL, 1, brightness=0.2)
47-
wifi = adafruit_esp32spi_wifimanager.ESPSPI_WiFiManager(esp, secrets, status_light)
48-
"""
49-
5044
# Set your Adafruit IO Username and Key in secrets.py
5145
# (visit io.adafruit.com if you need to create an account,
5246
# or if you need your Adafruit IO key.)

0 commit comments

Comments
 (0)