]> Repositories - Adafruit_Blinka-hackapet.git/commitdiff
remove fake_mcp2221 and all references of it, we're starting fresh!
authorbrentru <brent@adafruit.com>
Thu, 16 May 2024 18:02:06 +0000 (14:02 -0400)
committerbrentru <brent@adafruit.com>
Thu, 16 May 2024 18:02:06 +0000 (14:02 -0400)
12 files changed:
src/adafruit_blinka/board/fake_microchip_mcp2221.py [deleted file]
src/adafruit_blinka/microcontroller/fake_mcp2221/__init__.py [deleted file]
src/adafruit_blinka/microcontroller/fake_mcp2221/analogio.py [deleted file]
src/adafruit_blinka/microcontroller/fake_mcp2221/fake_mcp2221.py [deleted file]
src/adafruit_blinka/microcontroller/fake_mcp2221/i2c.py [deleted file]
src/adafruit_blinka/microcontroller/fake_mcp2221/pin.py [deleted file]
src/analogio.py
src/board.py
src/busio.py
src/digitalio.py
src/microcontroller/__init__.py
src/microcontroller/pin.py

diff --git a/src/adafruit_blinka/board/fake_microchip_mcp2221.py b/src/adafruit_blinka/board/fake_microchip_mcp2221.py
deleted file mode 100644 (file)
index 6aae9d5..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Melissa LeBlanc-Williams for Adafruit Industries
-#
-# SPDX-License-Identifier: MIT
-"""Pin definitions for the MicroChip MCP2221"""
-from adafruit_blinka.microcontroller.fake_mcp2221 import pin
-
-G0 = pin.G0
-G1 = pin.G1
-G2 = pin.G2
-G3 = pin.G3
-
-SCL = pin.SCL
-SDA = pin.SDA
diff --git a/src/adafruit_blinka/microcontroller/fake_mcp2221/__init__.py b/src/adafruit_blinka/microcontroller/fake_mcp2221/__init__.py
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/src/adafruit_blinka/microcontroller/fake_mcp2221/analogio.py b/src/adafruit_blinka/microcontroller/fake_mcp2221/analogio.py
deleted file mode 100644 (file)
index a70d7fc..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Melissa LeBlanc-Williams for Adafruit Industries
-#
-# SPDX-License-Identifier: MIT
-"""
-`analogio` - Analog input and output control
-=================================================
-See `CircuitPython:analogio` in CircuitPython for more details.
-* Author(s): Carter Nelson
-"""
-
-from adafruit_blinka.microcontroller.fake_mcp2221.pin import Pin
-from adafruit_blinka import ContextManaged
-
-
-class AnalogIn(ContextManaged):
-    """Analog Input Class"""
-
-    def __init__(self, pin):
-        self._pin = Pin(pin.id)
-        self._pin.init(mode=Pin.ADC)
-
-    @property
-    def value(self):
-        """Read the ADC and return the value"""
-        return self._pin.value()
-
-    # pylint: disable=no-self-use
-    @value.setter
-    def value(self, value):
-        # emulate what CircuitPython does
-        raise AttributeError("'AnalogIn' object has no attribute 'value'")
-
-    # pylint: enable=no-self-use
-
-    def deinit(self):
-        del self._pin
-
-
-class AnalogOut(ContextManaged):
-    """Analog Output Class"""
-
-    def __init__(self, pin):
-        self._pin = Pin(pin.id)
-        self._pin.init(mode=Pin.DAC)
-
-    @property
-    def value(self):
-        """Return an error. This is output only."""
-        # emulate what CircuitPython does
-        raise AttributeError("unreadable attribute")
-
-    @value.setter
-    def value(self, value):
-        self._pin.value(value)
-
-    def deinit(self):
-        del self._pin
diff --git a/src/adafruit_blinka/microcontroller/fake_mcp2221/fake_mcp2221.py b/src/adafruit_blinka/microcontroller/fake_mcp2221/fake_mcp2221.py
deleted file mode 100644 (file)
index 74a0713..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Melissa LeBlanc-Williams for Adafruit Industries
-#
-# SPDX-License-Identifier: MIT
-"""Chip Definition for MCP2221"""
-
-
-class MCP2221:
-    """MCP2221 Device Class Definition"""
-
-    def __init__(self):
-        pass  # This is a "fake" implementation
-
-    def __del__(self):
-        # try to close the device before destroying the instance
-        return
-
-    # pylint: enable=unused-argument
-
-
-mcp2221 = MCP2221()
diff --git a/src/adafruit_blinka/microcontroller/fake_mcp2221/i2c.py b/src/adafruit_blinka/microcontroller/fake_mcp2221/i2c.py
deleted file mode 100644 (file)
index d4b2c6f..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Melissa LeBlanc-Williams for Adafruit Industries
-#
-# SPDX-License-Identifier: MIT
-"""I2C Class for MCP2221"""
-import random
-from .fake_mcp2221 import mcp2221
-
-
-class I2C:
-    """Custom I2C Class for MCP2221"""
-
-    def __init__(self, *, frequency=100000):
-        self._mcp2221 = mcp2221
-        self._freq = frequency
-
-    @staticmethod
-    def scan(address_list=None):
-        """Mocks an I2C scan.
-        If address_list is not provided, this function returns a
-        list of 3 randomly generated I2C addresses from 0x0 to 0x79.
-        For a stimulus-driven test: If address_list is provided,
-        this function returns the provided address_list.
-        """
-        if address_list is None:
-            # Generate a list of 3 randomly generated addresses from 0x0 to 0x79
-            address_list = []
-            for _ in range(3):
-                address_list.append(random.randint(0x0, 0x79))
-            return address_list
-        return address_list
diff --git a/src/adafruit_blinka/microcontroller/fake_mcp2221/pin.py b/src/adafruit_blinka/microcontroller/fake_mcp2221/pin.py
deleted file mode 100644 (file)
index f522a39..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Melissa LeBlanc-Williams for Adafruit Industries
-#
-# SPDX-License-Identifier: MIT
-"""fake_mcp2221 pin names"""
-import random
-
-
-class Pin:
-    """A basic Pin class for use with a "fake" MCP2221."""
-
-    # pin modes
-    OUT = 0
-    IN = 1
-    ADC = 2
-    DAC = 3
-    # pin values
-    LOW = 0
-    HIGH = 1
-
-    def __init__(self, pin_id=None):
-        self.id = pin_id
-        self._mode = None
-        self._prv_val = False
-
-    def init(self, mode=IN, pull=None):
-        """Initialize the Pin"""
-        if self.id is None:
-            raise RuntimeError("Can not init a None type pin.")
-        if pull is not None:
-            raise NotImplementedError("Internal pullups and pulldowns not supported")
-        if mode in (Pin.IN, Pin.OUT):
-            # All pins can do GPIO
-            # mcp2221.gp_set_mode(self.id, mcp2221.GP_GPIO)
-            # mcp2221.gpio_set_direction(self.id, mode)
-            self._mode = mode
-        elif mode == Pin.ADC:
-            # ADC only available on these pins
-            if self.id not in (1, 2, 3):
-                raise ValueError("Pin does not have ADC capabilities")
-            # mcp2221.gp_set_mode(self.id, mcp2221.GP_ALT0)
-            # mcp2221.adc_configure()
-        elif mode == Pin.DAC:
-            # DAC only available on these pins
-            if self.id not in (2, 3):
-                raise ValueError("Pin does not have DAC capabilities")
-            # mcp2221.gp_set_mode(self.id, mcp2221.GP_ALT1)
-            # mcp2221.dac_configure()
-        else:
-            raise ValueError("Incorrect pin mode: {}".format(mode))
-        self._mode = mode
-
-    def value(self, val=None):
-        """Set or return the Pin Value"""
-        # Digital In / Out
-        if self._mode in (Pin.IN, Pin.OUT):
-            # digital read
-            if val is None:
-                # The returned value toggles between True and false
-                self._prv_val = not self._prv_val
-                return self._prv_val
-            # digital write
-            if val in (Pin.LOW, Pin.HIGH):
-                # We don't need to do anything here - no data is produced
-                return None
-            # nope
-            raise ValueError("Invalid value for pin.")
-        # Analog In
-        if self._mode == Pin.ADC:
-            if val is None:
-                # Returned value is between 0 and 65535 inclusive
-                # https://docs.circuitpython.org/en/latest/shared-bindings/analogio/index.html#analogio.AnalogIn.value
-                self._prv_val = random.randint(0, 65535)
-                return self._prv_val
-            # read only
-            raise AttributeError("'AnalogIn' object has no attribute 'value'")
-        # Analog Out
-        if self._mode == Pin.DAC:
-            if val is None:
-                # write only
-                raise AttributeError("unreadable attribute")
-            # We don't write to the DAC as this is a "fake" implementation
-            return None
-        raise RuntimeError(
-            "No action for mode {} with value {}".format(self._mode, val)
-        )
-
-
-# create pin instances for each pin
-G0 = Pin(0)
-G1 = Pin(1)
-G2 = Pin(2)
-G3 = Pin(3)
-
-SCL = Pin()
-SDA = Pin()
index c132ba38e19770235f135c966b3154cb8bbfb37f..bad82b9cac72f9531c3866a61c4ff8c67e918d00 100644 (file)
@@ -17,15 +17,8 @@ from adafruit_blinka.agnostic import detector
 # pylint: disable=ungrouped-imports,wrong-import-position,unused-import
 
 if detector.board.microchip_mcp2221:
 # pylint: disable=ungrouped-imports,wrong-import-position,unused-import
 
 if detector.board.microchip_mcp2221:
-    if (
-        "BLINKA_FORCECHIP" in os.environ
-        and os.environ["BLINKA_FORCEBOARD"] == "MICROCHIP_MCP2221"
-    ):
-        from adafruit_blinka.microcontroller.fake_mcp2221.analogio import AnalogIn
-        from adafruit_blinka.microcontroller.fake_mcp2221.analogio import AnalogOut
-    else:
-        from adafruit_blinka.microcontroller.mcp2221.analogio import AnalogIn
-        from adafruit_blinka.microcontroller.mcp2221.analogio import AnalogOut
+    from adafruit_blinka.microcontroller.mcp2221.analogio import AnalogIn
+    from adafruit_blinka.microcontroller.mcp2221.analogio import AnalogOut
 elif detector.board.greatfet_one:
     from adafruit_blinka.microcontroller.nxp_lpc4330.analogio import AnalogIn
     from adafruit_blinka.microcontroller.nxp_lpc4330.analogio import AnalogOut
 elif detector.board.greatfet_one:
     from adafruit_blinka.microcontroller.nxp_lpc4330.analogio import AnalogIn
     from adafruit_blinka.microcontroller.nxp_lpc4330.analogio import AnalogOut
index 7a3bc969212a034f0085e01cbf7c3aa27cb4c31d..e704e22aa75ec9991ec8fb9f1015c2648e777691 100644 (file)
@@ -224,13 +224,7 @@ elif board_id == ap_board.BINHO_NOVA:
     from adafruit_blinka.board.binho_nova import *
 
 elif board_id == ap_board.MICROCHIP_MCP2221:
     from adafruit_blinka.board.binho_nova import *
 
 elif board_id == ap_board.MICROCHIP_MCP2221:
-    if (
-        "BLINKA_FORCECHIP" in os.environ
-        and os.environ["BLINKA_FORCEBOARD"] == "MICROCHIP_MCP2221"
-    ):
-        from adafruit_blinka.board.fake_microchip_mcp2221 import *
-    else:
-        from adafruit_blinka.board.microchip_mcp2221 import *
+    from adafruit_blinka.board.microchip_mcp2221 import *
 
 elif board_id == ap_board.GREATFET_ONE:
     from adafruit_blinka.board.greatfet_one import *
 
 elif board_id == ap_board.GREATFET_ONE:
     from adafruit_blinka.board.greatfet_one import *
index 0a3f52991820fb23edf7188664ac73ade7610946..e3ab49d183160590bcab8d256a43d69a4806ec07 100644 (file)
@@ -51,13 +51,8 @@ class I2C(Lockable):
             self._i2c = _I2C(frequency=frequency)
             return
         if detector.board.microchip_mcp2221:
             self._i2c = _I2C(frequency=frequency)
             return
         if detector.board.microchip_mcp2221:
-            if (
-                "BLINKA_FORCECHIP" in os.environ
-                and os.environ["BLINKA_FORCEBOARD"] == "MICROCHIP_MCP2221"
-            ):
-                from adafruit_blinka.microcontroller.fake_mcp2221.i2c import I2C as _I2C
-            else:
-                from adafruit_blinka.microcontroller.mcp2221.i2c import I2C as _I2C
+            from adafruit_blinka.microcontroller.mcp2221.i2c import I2C as _I2C
+
             self._i2c = _I2C(frequency=frequency)
             return
         if detector.board.greatfet_one:
             self._i2c = _I2C(frequency=frequency)
             return
         if detector.board.greatfet_one:
index 7f57e31500daeef16c7f4ca2889b0cf7a7685832..1080fd5274d07069aef760cfc2ac242795ecdd0e 100644 (file)
@@ -127,13 +127,7 @@ elif detector.board.binho_nova:
 elif detector.board.greatfet_one:
     from adafruit_blinka.microcontroller.nxp_lpc4330.pin import Pin
 elif detector.board.microchip_mcp2221:
 elif detector.board.greatfet_one:
     from adafruit_blinka.microcontroller.nxp_lpc4330.pin import Pin
 elif detector.board.microchip_mcp2221:
-    if (
-        "BLINKA_FORCECHIP" in os.environ
-        and os.environ["BLINKA_FORCEBOARD"] == "MICROCHIP_MCP2221"
-    ):
-        from adafruit_blinka.microcontroller.fake_mcp2221.pin import Pin
-    else:
-        from adafruit_blinka.microcontroller.mcp2221.pin import Pin
+    from adafruit_blinka.microcontroller.mcp2221.pin import Pin
 elif detector.chip.RP2040_U2IF:
     from adafruit_blinka.microcontroller.rp2040_u2if.pin import Pin
 # MicroPython Chips
 elif detector.chip.RP2040_U2IF:
     from adafruit_blinka.microcontroller.rp2040_u2if.pin import Pin
 # MicroPython Chips
index 5ab316c928d07ad6b38980ad815a600d28071d4e..7a6e496d72a2ba132a89871f329e0a36cc6aae48 100644 (file)
@@ -123,13 +123,7 @@ elif chip_id == ap_chip.BINHO:
 elif chip_id == ap_chip.LPC4330:
     from adafruit_blinka.microcontroller.nxp_lpc4330 import *
 elif chip_id == ap_chip.MCP2221:
 elif chip_id == ap_chip.LPC4330:
     from adafruit_blinka.microcontroller.nxp_lpc4330 import *
 elif chip_id == ap_chip.MCP2221:
-    if (
-        "BLINKA_FORCECHIP" in os.environ
-        and os.environ["BLINKA_FORCEBOARD"] == "MICROCHIP_MCP2221"
-    ):
-        from adafruit_blinka.microcontroller.fake_mcp2221 import *
-    else:
-        from adafruit_blinka.microcontroller.mcp2221 import *
+    from adafruit_blinka.microcontroller.mcp2221 import *
 elif chip_id == ap_chip.MIPS24KC:
     from adafruit_blinka.microcontroller.atheros.ar9331 import *
 elif chip_id == ap_chip.MIPS24KEC:
 elif chip_id == ap_chip.MIPS24KC:
     from adafruit_blinka.microcontroller.atheros.ar9331 import *
 elif chip_id == ap_chip.MIPS24KEC:
index 8d30cbb2c80c0ed3eb4bb3ab9b5fb91bf3e245be..a54cdf4c612a3cbcbc755ea8a2abd4670d41ed83 100644 (file)
@@ -97,13 +97,7 @@ elif chip_id == ap_chip.BINHO:
 elif chip_id == ap_chip.LPC4330:
     from adafruit_blinka.microcontroller.nxp_lpc4330.pin import *
 elif chip_id == ap_chip.MCP2221:
 elif chip_id == ap_chip.LPC4330:
     from adafruit_blinka.microcontroller.nxp_lpc4330.pin import *
 elif chip_id == ap_chip.MCP2221:
-    if (
-        "BLINKA_FORCECHIP" in os.environ
-        and os.environ["BLINKA_FORCEBOARD"] == "MICROCHIP_MCP2221"
-    ):
-        from adafruit_blinka.microcontroller.fake_mcp2221.pin import *
-    else:
-        from adafruit_blinka.microcontroller.mcp2221.pin import *
+    from adafruit_blinka.microcontroller.mcp2221.pin import *
 elif chip_id == ap_chip.A10:
     from adafruit_blinka.microcontroller.allwinner.a20.pin import *
 elif chip_id == ap_chip.A20:
 elif chip_id == ap_chip.A10:
     from adafruit_blinka.microcontroller.allwinner.a20.pin import *
 elif chip_id == ap_chip.A20: