Merge pull request #339 from makermelissa/stm32_rename

Updated for STM32->STM32F405 PlatformDetect chip rename

diff --git a/requirements.txt b/requirements.txt
index 67765e51dd640b6352b764f3933e288ad8180ef7..3926b32b7b0b34f6d0821038939a8af1b0906082 100755 (executable)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-Adafruit-PlatformDetect>=2.11.1
+Adafruit-PlatformDetect>=2.15.1
 Adafruit-PureIO>=1.1.5
 Jetson.GPIO; platform_machine=='aarch64'
 RPi.GPIO; platform_machine=='armv7l' or platform_machine=='armv6l'

diff --git a/setup.py b/setup.py
index 187451fb352fb7f9928ae892cfc67c85d227421a..df70287845ffaf745a3e1a4ec32ad6b259bee20b 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -60,7 +60,7 @@ setup(
         "adafruit_blinka.microcontroller.bcm283x.pulseio": ["libgpiod_pulsein"]
     },
     install_requires=[
-        "Adafruit-PlatformDetect>=2.11.1",
+        "Adafruit-PlatformDetect>=2.15.1",
         "Adafruit-PureIO>=1.1.5",
         "pyftdi>=0.40.0",
     ]

diff --git a/src/adafruit_blinka/board/pyboard.py b/src/adafruit_blinka/board/pyboard.py
index 4c5eb10cb775aac5f39c9f5cd1b2f71a24054cb0..14ed95758a781156d041fb1bd06751384f04f84c 100755 (executable)
--- a/src/adafruit_blinka/board/pyboard.py
+++ b/src/adafruit_blinka/board/pyboard.py
@@ -1,6 +1,6 @@
 """PyBoard pin names"""
 
-from adafruit_blinka.microcontroller.stm32 import pin
+from adafruit_blinka.microcontroller.stm32.stm32f405 import pin
 
 X1 = pin.A0
 X2 = pin.A1

diff --git a/src/adafruit_blinka/microcontroller/stm32/stm32f405/__init__.py b/src/adafruit_blinka/microcontroller/stm32/stm32f405/__init__.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/adafruit_blinka/microcontroller/stm32/pin.py b/src/adafruit_blinka/microcontroller/stm32/stm32f405/pin.py
similarity index 98%
rename from src/adafruit_blinka/microcontroller/stm32/pin.py
rename to src/adafruit_blinka/microcontroller/stm32/stm32f405/pin.py
index b308069c35cdd7c3603bb4d039cc7d2e65a2eba0..52ec1c0e68428dde44d40ae42e07b3bf0daf7377 100755 (executable)
--- a/src/adafruit_blinka/microcontroller/stm32/pin.py
+++ b/src/adafruit_blinka/microcontroller/stm32/stm32f405/pin.py
@@ -1,4 +1,4 @@
-"""STM32 pins"""
+"""STM32F405 pins"""
 
 from microcontroller import Pin
 

diff --git a/src/digitalio.py b/src/digitalio.py
index b1f1cc792bea3ee5a0e83c7de684866dfb95c729..9ebb0a7e2da25671327bb73a4b591b3a90c8cdc3 100755 (executable)
--- a/src/digitalio.py
+++ b/src/digitalio.py
@@ -53,7 +53,7 @@ elif detector.board.binho_nova:
     from adafruit_blinka.microcontroller.nova.pin import Pin
 elif detector.board.greatfet_one:
     from adafruit_blinka.microcontroller.nxp_lpc4330.pin import Pin
-elif detector.chip.STM32:
+elif detector.chip.STM32F405:
     from machine import Pin
 elif detector.board.microchip_mcp2221:
     from adafruit_blinka.microcontroller.mcp2221.pin import Pin

diff --git a/src/microcontroller/__init__.py b/src/microcontroller/__init__.py
index 9f7d8f22a639ceab2d650a1c2e9ce6aa8636f550..76c0645c71f636bd52e0eaf38b13df5e8c0ffb49 100755 (executable)
--- a/src/microcontroller/__init__.py
+++ b/src/microcontroller/__init__.py
@@ -34,8 +34,8 @@ class Pin(Enum):
 
 if chip_id == ap_chip.ESP8266:
     from adafruit_blinka.microcontroller.esp8266 import *
-elif chip_id == ap_chip.STM32:
-    from adafruit_blinka.microcontroller.stm32 import *
+elif chip_id == ap_chip.STM32F405:
+    from adafruit_blinka.microcontroller.stm32.stm32f405 import *
 elif chip_id == ap_chip.BCM2XXX:
     from adafruit_blinka.microcontroller.bcm283x import *
 elif chip_id == ap_chip.AM33XX:

diff --git a/src/microcontroller/pin.py b/src/microcontroller/pin.py
index 7c2d746b5fb46356eed6d12eff16339646efca22..83fa924c98355f6e5992a8dd17967611c67190a1 100755 (executable)
--- a/src/microcontroller/pin.py
+++ b/src/microcontroller/pin.py
@@ -8,8 +8,8 @@ from adafruit_blinka.agnostic import chip_id
 
 if chip_id == ap_chip.ESP8266:
     from adafruit_blinka.microcontroller.esp8266.pin import *
-elif chip_id == ap_chip.STM32:
-    from adafruit_blinka.microcontroller.stm32.pin import *
+elif chip_id == ap_chip.STM32F405:
+    from adafruit_blinka.microcontroller.stm32.stm32f405.pin import *
 elif chip_id == ap_chip.BCM2XXX:
     from adafruit_blinka.microcontroller.bcm283x.pin import *
 elif chip_id == ap_chip.AM33XX: