Merge pull request #323 from makermelissa/main

Remove pre-decoded revcodes and tester

Author: makermelissa

adafruit_platformdetect/board.py

@@ -240,8 +240,11 @@ def _pi_id(self) -> Optional[str]:
 
                 if re_model:
                     pi_model = "".join(re_model.groups())
-                    available_models = boards._PI_REV_CODES.keys()
+                    available_models = boards._PI_MODELS.values()
                     for model in available_models:
+                        # Account for the PI_B_REV1/2 case
+                        if isinstance(model, dict) and pi_model in model:
+                            return model[pi_model]
                         if model == pi_model:
                             return model
 

adafruit_platformdetect/constants/boards.py

@@ -472,149 +472,6 @@
     BEAGLELOGIC_STANDALONE: (("A", "A335BLGC000A"),),
 }
 
-# Pi revision codes from:
-#  https://www.raspberrypi.com/documentation/computers/raspberry-pi.html#raspberry-pi-revision-codes
-
-# Each tuple here contains both the base codes, and the versions that indicate
-# the Pi is overvolted / overclocked - for 4-digit codes, this will be prefixed
-# with 1000, and for 6-digit codes it'll be prefixed with 1.  These are placed
-# on separate lines.
-
-_PI_REV_CODES = {
-    RASPBERRY_PI_B_REV1: (
-        # Regular codes:
-        "0002",
-        "0003",
-        # Overvolted/clocked versions:
-        "1000002",
-        "1000003",
-    ),
-    RASPBERRY_PI_B_REV2: (
-        "0004",
-        "0005",
-        "0006",
-        "000d",
-        "000e",
-        "000f",
-        "1000005",
-        "1000006",
-        "100000d",
-        "100000e",
-        "100000f",
-    ),
-    RASPBERRY_PI_B_PLUS: ("0010", "0013", "900032", "1000010", "1000013", "1900032"),
-    RASPBERRY_PI_A: ("0007", "0008", "0009", "1000007", "1000008", "1000009"),
-    RASPBERRY_PI_A_PLUS: ("0012", "0015", "900021", "1000012", "1000015", "1900021"),
-    RASPBERRY_PI_CM1: ("0011", "0014", "10000011", "10000014"),
-    RASPBERRY_PI_ZERO: (
-        "900092",
-        "920092",
-        "900093",
-        "920093",
-        "1900092",
-        "1920092",
-        "1900093",
-        "1920093",  # warranty bit 24
-        "2900092",
-        "2920092",
-        "2900093",
-        "2920093",  # warranty bit 25
-    ),
-    RASPBERRY_PI_ZERO_W: ("9000c1", "19000c1", "29000c1"),  # warranty bits
-    RASPBERRY_PI_2B: (
-        "a01040",
-        "a01041",
-        "a02042",
-        "a21041",
-        "a22042",
-        "1a01040",
-        "1a01041",
-        "1a02042",
-        "1a21041",
-        "1a22042",  # warranty bit 24
-        "2a01040",
-        "2a01041",
-        "2a02042",
-        "2a21041",
-        "2a22042",  # warranty bit 25
-        "3a01040",
-        "3a01041",
-        "3a02042",
-        "3a21041",
-        "3a22042",
-    ),
-    RASPBERRY_PI_3B: (
-        "a02082",
-        "a22082",
-        "a32082",
-        "a52082",
-        "1a02082",
-        "1a22082",
-        "1a32082",
-        "1a52082",  # warranty bit 24
-        "2a02082",
-        "2a22082",
-        "2a32082",
-        "2a52082",  # warranty bit 25
-    ),
-    RASPBERRY_PI_3B_PLUS: ("a020d3", "1a020d3", "2a020d3", "a020d4"),  # warranty bits
-    RASPBERRY_PI_AVNET_IIOT_GW: ("60a220b0",),
-    RASPBERRY_PI_CM3: (
-        "a020a0",
-        "a220a0",
-        "1a020a0",
-        "2a020a0",  # warranty bits
-        "1a220a0",
-        "2a220a0",
-    ),
-    RASPBERRY_PI_3A_PLUS: ("9020e0", "19020e0", "29020e0"),  # warranty bits
-    RASPBERRY_PI_CM3_PLUS: ("a02100", "1a02100", "2a02100"),  # warranty bits
-    RASPBERRY_PI_4B: (
-        "a03111",
-        "b03111",
-        "c03111",
-        "a03112",
-        "b03112",
-        "c03112",
-        "b03114",
-        "c03114",
-        "d03114",
-        "a03115",
-        "b03115",
-        "c03115",
-        "d03115",
-        "1a03111",
-        "2a03111",
-        "1b03111",
-        "2b03111",  # warranty bits
-        "1c03111",
-        "2c03111",
-        "1a03112",
-        "2a03112",
-        "1b03112",
-        "2b03112",
-        "1c03112",
-        "2c03112",
-        "80c03114",
-    ),
-    RASPBERRY_PI_400: ("c03130", "c03131"),
-    RASPBERRY_PI_CM4: (
-        "a03140",
-        "a03141",
-        "b03140",
-        "b03141",
-        "c03140",
-        "c03141",
-        "d03140",
-        "d03141",
-    ),
-    RASPBERRY_PI_ZERO_2_W: ("902120", "2902120"),
-    RASPBERRY_PI_5: (
-        "d04170",
-        "c04170",
-    ),
-}
-
 _PI_MODELS = {
     0x00: RASPBERRY_PI_A,
     0x01: {