Skip to content

Commit 07703c1

Browse files
RetiredWizardRetiredWizard
committed
pre-commit fixes
1 parent dbb0357 commit 07703c1

11 files changed

+45
-52
lines changed

‎adafruit_esp32spi/adafruit_esp32spi_wifimanager.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ def __init__(
6767
self._ap_index = 0
6868

6969
# Check for WPA2 Enterprise keys in the secrets dictionary and load them if they exist
70-
self.ent_ssid = secrets.get("ent_ssid",secrets["ssid"])
71-
self.ent_ident = secrets.get("ent_ident","")
70+
self.ent_ssid = secrets.get("ent_ssid", secrets["ssid"])
71+
self.ent_ident = secrets.get("ent_ident", "")
7272
self.ent_user = secrets.get("ent_user")
7373
self.ent_password = secrets.get("ent_password")
7474

‎examples/esp32spi_aio_post.py‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# SPDX-License-Identifier: MIT
33

44
import time
5+
from os import getenv
56
import board
67
import busio
7-
from os import getenv
88
from digitalio import DigitalInOut
99
import neopixel
1010
from adafruit_esp32spi import adafruit_esp32spi
@@ -16,14 +16,14 @@
1616
# tokens used by this Demo: CIRCUITPY_WIFI_SSID, CIRCUITPY_WIFI_PASSWORD
1717
# CIRCUITPY_AIO_USERNAME, CIRCUITPY_AIO_KEY
1818
secrets = {}
19-
for token in ["ssid","password"]:
20-
if getenv("CIRCUITPY_WIFI_"+token.upper()):
21-
secrets[token] = getenv("CIRCUITPY_WIFI_"+token.upper())
22-
for token in ["aio_username","aio_key"]:
23-
if getenv("CIRCUITPY_"+token.upper()):
24-
secrets[token] = getenv("CIRCUITPY_"+token.upper())
19+
for token in ["ssid", "password"]:
20+
if getenv("CIRCUITPY_WIFI_" + token.upper()):
21+
secrets[token] = getenv("CIRCUITPY_WIFI_" + token.upper())
22+
for token in ["aio_username", "aio_key"]:
23+
if getenv("CIRCUITPY_" + token.upper()):
24+
secrets[token] = getenv("CIRCUITPY_" + token.upper())
2525

26-
if secrets == {}:
26+
if not secrets:
2727
try:
2828
# Fallback on secrets.py until depreciation is over and option is removed
2929
from secrets import secrets
@@ -42,15 +42,13 @@
4242
# esp32_reset = DigitalInOut(board.D5)
4343

4444
# Secondary (SCK1) SPI used to connect to WiFi board on Arduino Nano Connect RP2040
45-
if 'SCK1' in dir(board):
45+
if "SCK1" in dir(board):
4646
spi = busio.SPI(board.SCK1, board.MOSI1, board.MISO1)
4747
else:
4848
spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
4949
esp = adafruit_esp32spi.ESP_SPIcontrol(spi, esp32_cs, esp32_ready, esp32_reset)
5050
"""Use below for Most Boards"""
51-
status_light = neopixel.NeoPixel(
52-
board.NEOPIXEL, 1, brightness=0.2
53-
)
51+
status_light = neopixel.NeoPixel(board.NEOPIXEL, 1, brightness=0.2)
5452
"""Uncomment below for ItsyBitsy M4"""
5553
# status_light = dotstar.DotStar(board.APA102_SCK, board.APA102_MOSI, 1, brightness=0.2)
5654
"""Uncomment below for an externally defined RGB LED (including Arduino Nano Connect)"""

‎examples/esp32spi_cheerlights.py‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# SPDX-License-Identifier: MIT
33

44
import time
5+
from os import getenv
56
import board
67
import busio
7-
from os import getenv
88
from digitalio import DigitalInOut
99

1010
import neopixel
@@ -17,7 +17,7 @@
1717
# tokens used by this Demo: CIRCUITPY_WIFI_SSID, CIRCUITPY_WIFI_PASSWORD
1818
secrets = {
1919
"ssid": getenv("CIRCUITPY_WIFI_SSID"),
20-
"password": getenv("CIRCUITPY_WIFI_PASSWORD")
20+
"password": getenv("CIRCUITPY_WIFI_PASSWORD"),
2121
}
2222
if secrets == {"ssid": None, "password": None}:
2323
try:
@@ -43,15 +43,13 @@
4343
# esp32_reset = DigitalInOut(board.D5)
4444

4545
# Secondary (SCK1) SPI used to connect to WiFi board on Arduino Nano Connect RP2040
46-
if 'SCK1' in dir(board):
46+
if "SCK1" in dir(board):
4747
spi = busio.SPI(board.SCK1, board.MOSI1, board.MISO1)
4848
else:
4949
spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
5050
esp = adafruit_esp32spi.ESP_SPIcontrol(spi, esp32_cs, esp32_ready, esp32_reset)
5151
"""Use below for Most Boards"""
52-
status_light = neopixel.NeoPixel(
53-
board.NEOPIXEL, 1, brightness=0.2
54-
)
52+
status_light = neopixel.NeoPixel(board.NEOPIXEL, 1, brightness=0.2)
5553
"""Uncomment below for ItsyBitsy M4"""
5654
# status_light = dotstar.DotStar(board.APA102_SCK, board.APA102_MOSI, 1, brightness=0.2)
5755
"""Uncomment below for an externally defined RGB LED (including Arduino Nano Connect)"""

‎examples/esp32spi_ipconfig.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# SPDX-License-Identifier: MIT
33

44
import time
5+
from os import getenv
56
import board
67
import busio
7-
from os import getenv
88
from digitalio import DigitalInOut
99
import adafruit_esp32spi.adafruit_esp32spi_socket as socket
1010
from adafruit_esp32spi import adafruit_esp32spi
@@ -13,7 +13,7 @@
1313
# tokens used by this Demo: CIRCUITPY_WIFI_SSID, CIRCUITPY_WIFI_PASSWORD
1414
secrets = {
1515
"ssid": getenv("CIRCUITPY_WIFI_SSID"),
16-
"password": getenv("CIRCUITPY_WIFI_PASSWORD")
16+
"password": getenv("CIRCUITPY_WIFI_PASSWORD"),
1717
}
1818
if secrets == {"ssid": None, "password": None}:
1919
try:
@@ -45,7 +45,7 @@
4545
# esp32_reset = DigitalInOut(board.D5)
4646

4747
# Secondary (SCK1) SPI used to connect to WiFi board on Arduino Nano Connect RP2040
48-
if 'SCK1' in dir(board):
48+
if "SCK1" in dir(board):
4949
spi = busio.SPI(board.SCK1, board.MOSI1, board.MISO1)
5050
else:
5151
spi = busio.SPI(board.SCK, board.MOSI, board.MISO)

‎examples/esp32spi_localtime.py‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# SPDX-License-Identifier: MIT
33

44
import time
5+
from os import getenv
56
import board
67
import busio
7-
from os import getenv
88
from digitalio import DigitalInOut
99
import neopixel
1010
import rtc
@@ -15,7 +15,7 @@
1515
# tokens used by this Demo: CIRCUITPY_WIFI_SSID, CIRCUITPY_WIFI_PASSWORD
1616
secrets = {
1717
"ssid": getenv("CIRCUITPY_WIFI_SSID"),
18-
"password": getenv("CIRCUITPY_WIFI_PASSWORD")
18+
"password": getenv("CIRCUITPY_WIFI_PASSWORD"),
1919
}
2020
if secrets == {"ssid": None, "password": None}:
2121
try:
@@ -40,16 +40,14 @@
4040
# esp32_reset = DigitalInOut(board.D5)
4141

4242
# Secondary (SCK1) SPI used to connect to WiFi board on Arduino Nano Connect RP2040
43-
if 'SCK1' in dir(board):
43+
if "SCK1" in dir(board):
4444
spi = busio.SPI(board.SCK1, board.MOSI1, board.MISO1)
4545
else:
4646
spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
4747
esp = adafruit_esp32spi.ESP_SPIcontrol(spi, esp32_cs, esp32_ready, esp32_reset)
4848

4949
"""Use below for Most Boards"""
50-
status_light = neopixel.NeoPixel(
51-
board.NEOPIXEL, 1, brightness=0.2
52-
)
50+
status_light = neopixel.NeoPixel(board.NEOPIXEL, 1, brightness=0.2)
5351
"""Uncomment below for ItsyBitsy M4"""
5452
# status_light = dotstar.DotStar(board.APA102_SCK, board.APA102_MOSI, 1, brightness=0.2)
5553
"""Uncomment below for an externally defined RGB LED (including Arduino Nano Connect)"""

‎examples/esp32spi_simpletest.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# SPDX-FileCopyrightText: 2019 ladyada for Adafruit Industries
22
# SPDX-License-Identifier: MIT
33

4+
from os import getenv
45
import board
56
import busio
6-
from os import getenv
77
from digitalio import DigitalInOut
88
import adafruit_requests as requests
99
import adafruit_esp32spi.adafruit_esp32spi_socket as socket
@@ -13,7 +13,7 @@
1313
# tokens used by this Demo: CIRCUITPY_WIFI_SSID, CIRCUITPY_WIFI_PASSWORD
1414
secrets = {
1515
"ssid": getenv("CIRCUITPY_WIFI_SSID"),
16-
"password": getenv("CIRCUITPY_WIFI_PASSWORD")
16+
"password": getenv("CIRCUITPY_WIFI_PASSWORD"),
1717
}
1818
if secrets == {"ssid": None, "password": None}:
1919
try:
@@ -51,7 +51,7 @@
5151
# esp32_reset = DigitalInOut(board.D5)
5252

5353
# Secondary (SCK1) SPI used to connect to WiFi board on Arduino Nano Connect RP2040
54-
if 'SCK1' in dir(board):
54+
if "SCK1" in dir(board):
5555
spi = busio.SPI(board.SCK1, board.MOSI1, board.MISO1)
5656
else:
5757
spi = busio.SPI(board.SCK, board.MOSI, board.MISO)

‎examples/esp32spi_simpletest_rp2040.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# SPDX-FileCopyrightText: 2019 ladyada for Adafruit Industries
22
# SPDX-License-Identifier: MIT
33

4+
from os import getenv
45
import board
56
import busio
6-
from os import getenv
77
from digitalio import DigitalInOut
88
import adafruit_requests as requests
99
import adafruit_esp32spi.adafruit_esp32spi_socket as socket
@@ -13,7 +13,7 @@
1313
# tokens used by this Demo: CIRCUITPY_WIFI_SSID, CIRCUITPY_WIFI_PASSWORD
1414
secrets = {
1515
"ssid": getenv("CIRCUITPY_WIFI_SSID"),
16-
"password": getenv("CIRCUITPY_WIFI_PASSWORD")
16+
"password": getenv("CIRCUITPY_WIFI_PASSWORD"),
1717
}
1818
if secrets == {"ssid": None, "password": None}:
1919
try:

‎examples/esp32spi_tcp_client.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# tokens used by this Demo: CIRCUITPY_WIFI_SSID, CIRCUITPY_WIFI_PASSWORD
1313
secrets = {
1414
"ssid": getenv("CIRCUITPY_WIFI_SSID"),
15-
"password": getenv("CIRCUITPY_WIFI_PASSWORD")
15+
"password": getenv("CIRCUITPY_WIFI_PASSWORD"),
1616
}
1717
if secrets == {"ssid": None, "password": None}:
1818
try:
@@ -28,7 +28,7 @@
2828
PORT = 80
2929

3030
# Secondary (SCK1) SPI used to connect to WiFi board on Arduino Nano Connect RP2040
31-
if 'SCK1' in dir(board):
31+
if "SCK1" in dir(board):
3232
spi = busio.SPI(board.SCK1, board.MOSI1, board.MISO1)
3333
else:
3434
if "SPI" in dir(board):

‎examples/esp32spi_udp_client.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33

44
import struct
55
import time
6+
from os import getenv
67
import board
78
import busio
8-
from os import getenv
99
from digitalio import DigitalInOut
1010
from adafruit_esp32spi import adafruit_esp32spi
1111
import adafruit_esp32spi.adafruit_esp32spi_socket as socket
@@ -14,7 +14,7 @@
1414
# tokens used by this Demo: CIRCUITPY_WIFI_SSID, CIRCUITPY_WIFI_PASSWORD
1515
secrets = {
1616
"ssid": getenv("CIRCUITPY_WIFI_SSID"),
17-
"password": getenv("CIRCUITPY_WIFI_PASSWORD")
17+
"password": getenv("CIRCUITPY_WIFI_PASSWORD"),
1818
}
1919
if secrets == {"ssid": None, "password": None}:
2020
try:
@@ -31,7 +31,7 @@
3131
NTP_TO_UNIX_EPOCH = 2208988800 # 1970-01-01 00:00:00
3232

3333
# Secondary (SCK1) SPI used to connect to WiFi board on Arduino Nano Connect RP2040
34-
if 'SCK1' in dir(board):
34+
if "SCK1" in dir(board):
3535
spi = busio.SPI(board.SCK1, board.MOSI1, board.MISO1)
3636
else:
3737
if "SPI" in dir(board):

‎examples/esp32spi_wpa2ent_aio_post.py‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# SPDX-License-Identifier: MIT
33

44
import time
5+
from os import getenv
56
import board
67
import busio
7-
from os import getenv
88
from digitalio import DigitalInOut
99
import neopixel
1010
from adafruit_esp32spi import adafruit_esp32spi
@@ -17,13 +17,13 @@
1717
# CIRCUITPY_WIFI_ENT_SSID, CIRCUITPY_WIFI_ENT_PASSWORD,
1818
# CIRCUITPY_WIFI_ENT_USER, CIRCUITPY_WIFI_ENT_IDENT
1919
secrets = {}
20-
for token in ["ssid","password","user","ident"]:
21-
if getenv("CIRCUITPY_WIFI_ENT_"+token.upper()):
22-
secrets[token] = getenv("CIRCUITPY_WIFI_"+token.upper())
23-
for token in ["aio_username","aio_key"]:
24-
if getenv("CIRCUITPY_"+token.upper()):
25-
secrets[token] = getenv("CIRCUITPY_"+token.upper())
26-
if secrets == {}:
20+
for token in ["ssid", "password", "user", "ident"]:
21+
if getenv("CIRCUITPY_WIFI_ENT_" + token.upper()):
22+
secrets[token] = getenv("CIRCUITPY_WIFI_" + token.upper())
23+
for token in ["aio_username", "aio_key"]:
24+
if getenv("CIRCUITPY_" + token.upper()):
25+
secrets[token] = getenv("CIRCUITPY_" + token.upper())
26+
if not secrets:
2727
try:
2828
# Fallback on secrets.py until depreciation is over and option is removed
2929
from secrets import secrets # pylint: disable=no-name-in-module
@@ -44,16 +44,14 @@
4444
esp32_reset = DigitalInOut(board.D5)
4545

4646
# Secondary (SCK1) SPI used to connect to WiFi board on Arduino Nano Connect RP2040
47-
if 'SCK1' in dir(board):
47+
if "SCK1" in dir(board):
4848
spi = busio.SPI(board.SCK1, board.MOSI1, board.MISO1)
4949
else:
5050
spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
5151
esp = adafruit_esp32spi.ESP_SPIcontrol(spi, esp32_cs, esp32_ready, esp32_reset)
5252

5353
"""Use below for Most Boards"""
54-
status_light = neopixel.NeoPixel(
55-
board.NEOPIXEL, 1, brightness=0.2
56-
)
54+
status_light = neopixel.NeoPixel(board.NEOPIXEL, 1, brightness=0.2)
5755
"""Uncomment below for ItsyBitsy M4"""
5856
# status_light = dotstar.DotStar(board.APA102_SCK, board.APA102_MOSI, 1, brightness=0.2)
5957
"""Uncomment below for an externally defined RGB LED (including Arduino Nano Connect)"""

0 commit comments

Comments
 (0)