rename microcontroller.{beaglebone_black,raspi_23} to {am335x,bcm283x}

These should be named after the chips rather than the boards.

diff --git a/src/adafruit_blinka/board/beaglebone_black.py b/src/adafruit_blinka/board/beaglebone_black.py
index ffeb919571e013bc1a771dabf58e26521e61aece..5a7008caafbe559e19d381205791ef8b0c20b0bb 100644 (file)
--- a/src/adafruit_blinka/board/beaglebone_black.py
+++ b/src/adafruit_blinka/board/beaglebone_black.py
@@ -1,4 +1,4 @@
-from adafruit_blinka.microcontroller.beaglebone_black import pin
+from adafruit_blinka.microcontroller.am335x import pin

 
 # initial pins, to mimic bonescript demo
 P8_3 = pin.P8_3
 
 # initial pins, to mimic bonescript demo
 P8_3 = pin.P8_3

diff --git a/src/adafruit_blinka/board/raspi_23.py b/src/adafruit_blinka/board/raspi_23.py
index 60898f08967c147c4544b589a5b05b80d2b60bb9..f944eee9fc48512fbeb624648de700e46e0cf507 100644 (file)
--- a/src/adafruit_blinka/board/raspi_23.py
+++ b/src/adafruit_blinka/board/raspi_23.py
@@ -1,4 +1,4 @@
-from adafruit_blinka.microcontroller.raspi_23 import pin
+from adafruit_blinka.microcontroller.bcm283x import pin

 
 D2 = pin.D2
 SDA = pin.SDA
 
 D2 = pin.D2
 SDA = pin.SDA

diff --git a/src/adafruit_blinka/microcontroller/beaglebone_black/__init__.py b/src/adafruit_blinka/microcontroller/am335x/__init__.py
similarity index 100%
rename from src/adafruit_blinka/microcontroller/beaglebone_black/__init__.py
rename to src/adafruit_blinka/microcontroller/am335x/__init__.py

diff --git a/src/adafruit_blinka/microcontroller/beaglebone_black/pin.py b/src/adafruit_blinka/microcontroller/am335x/pin.py
similarity index 100%
rename from src/adafruit_blinka/microcontroller/beaglebone_black/pin.py
rename to src/adafruit_blinka/microcontroller/am335x/pin.py

diff --git a/src/adafruit_blinka/microcontroller/raspi_23/__init__.py b/src/adafruit_blinka/microcontroller/bcm283x/__init__.py
similarity index 100%
rename from src/adafruit_blinka/microcontroller/raspi_23/__init__.py
rename to src/adafruit_blinka/microcontroller/bcm283x/__init__.py

diff --git a/src/adafruit_blinka/microcontroller/raspi_23/neopixel.py b/src/adafruit_blinka/microcontroller/bcm283x/neopixel.py
similarity index 98%
rename from src/adafruit_blinka/microcontroller/raspi_23/neopixel.py
rename to src/adafruit_blinka/microcontroller/bcm283x/neopixel.py
index 3d670c703ce2404ed9a099a980e244872997d7f2..d744b255f25bee7e3657354c75a9050609a1dd83 100644 (file)
--- a/src/adafruit_blinka/microcontroller/raspi_23/neopixel.py
+++ b/src/adafruit_blinka/microcontroller/bcm283x/neopixel.py
@@ -37,7 +37,7 @@ def neopixel_write(gpio, buf):
 
         # Initialize the channel in use
         count = 0
 
         # Initialize the channel in use
         count = 0

-        if len(buf) % 3 == 0:            
+        if len(buf) % 3 == 0:

             # most common, divisible by 3 is likely RGB
             LED_STRIP = ws.WS2811_STRIP_RGB
             count = len(buf)//3
             # most common, divisible by 3 is likely RGB
             LED_STRIP = ws.WS2811_STRIP_RGB
             count = len(buf)//3


@@ -56,7 +56,7 @@ def neopixel_write(gpio, buf):
         # Initialize the controller
         ws.ws2811_t_freq_set(_led_strip, LED_FREQ_HZ)
         ws.ws2811_t_dmanum_set(_led_strip, LED_DMA_NUM)
         # Initialize the controller
         ws.ws2811_t_freq_set(_led_strip, LED_FREQ_HZ)
         ws.ws2811_t_dmanum_set(_led_strip, LED_DMA_NUM)

-    
+

         resp = ws.ws2811_init(_led_strip)
         if resp != ws.WS2811_SUCCESS:
             if resp == -5:
         resp = ws.ws2811_init(_led_strip)
         if resp != ws.WS2811_SUCCESS:
             if resp == -5:


@@ -84,7 +84,7 @@ def neopixel_write(gpio, buf):
             w = buf[bpp*i+3]
             pixel = (w << 24) | (r << 16) | (g << 8) | b
         ws.ws2811_led_set(channel, i, pixel)
             w = buf[bpp*i+3]
             pixel = (w << 24) | (r << 16) | (g << 8) | b
         ws.ws2811_led_set(channel, i, pixel)

-    
+

     resp = ws.ws2811_render(_led_strip)
     if resp != ws.WS2811_SUCCESS:
         message = ws.ws2811_get_return_t_str(resp)
     resp = ws.ws2811_render(_led_strip)
     if resp != ws.WS2811_SUCCESS:
         message = ws.ws2811_get_return_t_str(resp)

diff --git a/src/adafruit_blinka/microcontroller/raspi_23/pin.py b/src/adafruit_blinka/microcontroller/bcm283x/pin.py
similarity index 100%
rename from src/adafruit_blinka/microcontroller/raspi_23/pin.py
rename to src/adafruit_blinka/microcontroller/bcm283x/pin.py

diff --git a/src/adafruit_blinka/microcontroller/raspi_23/pulseio/PulseIn.py b/src/adafruit_blinka/microcontroller/bcm283x/pulseio/PulseIn.py
similarity index 100%
rename from src/adafruit_blinka/microcontroller/raspi_23/pulseio/PulseIn.py
rename to src/adafruit_blinka/microcontroller/bcm283x/pulseio/PulseIn.py

diff --git a/src/adafruit_blinka/microcontroller/raspi_23/pulseio/libgpiod_pulsein b/src/adafruit_blinka/microcontroller/bcm283x/pulseio/libgpiod_pulsein
similarity index 100%
rename from src/adafruit_blinka/microcontroller/raspi_23/pulseio/libgpiod_pulsein
rename to src/adafruit_blinka/microcontroller/bcm283x/pulseio/libgpiod_pulsein

diff --git a/src/busio.py b/src/busio.py
index cbcd50d6420acb29804dcfaba9d836eef7d20743..742ebe572e48af13027f3fb58a1b13981070d883 100755 (executable)
--- a/src/busio.py
+++ b/src/busio.py
@@ -98,11 +98,10 @@ class SPI(Lockable):
 
     def configure(self, baudrate=100000, polarity=0, phase=0, bits=8):
         if board_name in ap_board.ANY_RASPBERRY_PI_2_OR_3:
 
     def configure(self, baudrate=100000, polarity=0, phase=0, bits=8):
         if board_name in ap_board.ANY_RASPBERRY_PI_2_OR_3:

-            from adafruit_blinka.microcontroller.raspi_23.pin import Pin
+            from adafruit_blinka.microcontroller.bcm283x.pin import Pin

             from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
         elif board_name == ap_board.BEAGLEBONE_BLACK:
             from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
         elif board_name == ap_board.BEAGLEBONE_BLACK:

-            # reuse the raspberry pi class as both boards use Linux spidev
-            from adafruit_blinka.microcontroller.beaglebone_black.pin import Pin
+            from adafruit_blinka.microcontroller.am335x.pin import Pin

             from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
         elif board_name == ap_board.ORANGEPI_PC:
             from adafruit_blinka.microcontroller.allwinner_h3.pin import Pin
             from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
         elif board_name == ap_board.ORANGEPI_PC:
             from adafruit_blinka.microcontroller.allwinner_h3.pin import Pin

diff --git a/src/digitalio.py b/src/digitalio.py
index 40f42ad24964da35b465de0a2bb28463d4896468..631a7718b6b7f26882987b34ce0bee2fb9d3391e 100755 (executable)
--- a/src/digitalio.py
+++ b/src/digitalio.py
@@ -9,9 +9,9 @@ See `CircuitPython:digitalio` in CircuitPython for more details.
 
 from adafruit_blinka.agnostic import board_id
 if board_id == "raspi_3" or board_id == "raspi_2":
 
 from adafruit_blinka.agnostic import board_id
 if board_id == "raspi_3" or board_id == "raspi_2":

-    from adafruit_blinka.microcontroller.raspi_23.pin import Pin
+    from adafruit_blinka.microcontroller.bcm283x.pin import Pin

 elif board_id == "beaglebone_black":
 elif board_id == "beaglebone_black":

-    from adafruit_blinka.microcontroller.beaglebone_black.pin import Pin
+    from adafruit_blinka.microcontroller.am335x.pin import Pin

 elif board_id == "orangepipc":
     from adafruit_blinka.microcontroller.allwinner_h3.pin import Pin
 elif board_id == "pyboard":
 elif board_id == "orangepipc":
     from adafruit_blinka.microcontroller.allwinner_h3.pin import Pin
 elif board_id == "pyboard":

diff --git a/src/microcontroller/__init__.py b/src/microcontroller/__init__.py
index 3bd5b51736fe84902c478b9a4080e30ce13aae71..0cbdfda0e92f4c7bb34876d879fb2494b037c436 100755 (executable)
--- a/src/microcontroller/__init__.py
+++ b/src/microcontroller/__init__.py
@@ -29,9 +29,9 @@ elif platform == "stm32":
     from adafruit_blinka.microcontroller.stm32 import *
 elif platform == "linux":
     if board_id == "raspi_3" or board_id == "raspi_2":
     from adafruit_blinka.microcontroller.stm32 import *
 elif platform == "linux":
     if board_id == "raspi_3" or board_id == "raspi_2":

-        from adafruit_blinka.microcontroller.raspi_23 import *
+        from adafruit_blinka.microcontroller.bcm283x import *

     elif board_id == "beaglebone_black":
     elif board_id == "beaglebone_black":

-        from adafruit_blinka.microcontroller.beaglebone_black import *
+        from adafruit_blinka.microcontroller.am335x import *

     elif board_id == "orangepipc":
         from adafruit_blinka.microcontroller.allwinner_h3 import *
     else:
     elif board_id == "orangepipc":
         from adafruit_blinka.microcontroller.allwinner_h3 import *
     else:

diff --git a/src/microcontroller/pin.py b/src/microcontroller/pin.py
index 94aeac0624711ece89ab836f0faafc14519dc337..b3dd4cae80bdce3814ece64be0bd8d39d27f3131 100755 (executable)
--- a/src/microcontroller/pin.py
+++ b/src/microcontroller/pin.py
@@ -10,9 +10,9 @@ if agnostic.chip_name == ap_chip.ESP8266:
 elif agnostic.chip_name == ap_chip.STM32:
     from adafruit_blinka.microcontroller.stm32.pin import *
 elif agnostic.detect.any_raspberry_pi_or_3:
 elif agnostic.chip_name == ap_chip.STM32:
     from adafruit_blinka.microcontroller.stm32.pin import *
 elif agnostic.detect.any_raspberry_pi_or_3:

-    from adafruit_blinka.microcontroller.raspi_23.pin import *
+    from adafruit_blinka.microcontroller.bcm283x.pin import *

 elif agnostic.detect.beaglebone_black:
 elif agnostic.detect.beaglebone_black:

-    from adafruit_blinka.microcontroller.beaglebone_black.pin import *
+    from adafruit_blinka.microcontroller.am335x.pin import *

 elif agnostic.detect.orangepi_pc:
     from adafruit_blinka.microcontroller.allwinner_h3.pin import *
 else:
 elif agnostic.detect.orangepi_pc:
     from adafruit_blinka.microcontroller.allwinner_h3.pin import *
 else:

diff --git a/src/neopixel_write.py b/src/neopixel_write.py
index 923ae2fa58cee3d179f9cc49d067e9ec9e1097c5..cee24cf0b6be1af4f117806b253b565151850de5 100644 (file)
--- a/src/neopixel_write.py
+++ b/src/neopixel_write.py
@@ -13,7 +13,7 @@ from adafruit_blinka.agnostic import board_name
 import adafruit_platformdetect.board as ap_board
 
 if board_name in (ap_board.RASPBERRY_PI_2B, ap_board.RASPBERRY_PI_3B, ap_board.RASPBERRY_PI_B_PLUS):
 import adafruit_platformdetect.board as ap_board
 
 if board_name in (ap_board.RASPBERRY_PI_2B, ap_board.RASPBERRY_PI_3B, ap_board.RASPBERRY_PI_B_PLUS):

-    from adafruit_blinka.microcontroller.raspi_23 import neopixel as _neopixel
+    from adafruit_blinka.microcontroller.bcm283x import neopixel as _neopixel

 elif "sphinx" in sys.modules:
     pass
 else:
 elif "sphinx" in sys.modules:
     pass
 else:

diff --git a/src/pulseio.py b/src/pulseio.py
index e2d69fc2246b158fae0534978febd58ea5256824..cba0941bd1b185d681e855927df88965a0e4b07d 100644 (file)
--- a/src/pulseio.py
+++ b/src/pulseio.py
@@ -3,4 +3,4 @@ from adafruit_blinka.agnostic import board_id
 
 
 if board_id == "raspi_2" or board_id == "raspi_3":
 
 
 if board_id == "raspi_2" or board_id == "raspi_3":

-    from adafruit_blinka.microcontroller.raspi_23.pulseio.PulseIn import PulseIn as PulseIn
+    from adafruit_blinka.microcontroller.bcm283x.pulseio.PulseIn import PulseIn as PulseIn