From 205604ed2bfc02be6673c2bb9bbb4dda72f42168 Mon Sep 17 00:00:00 2001 From: Brennen Bearnes Date: Fri, 21 Dec 2018 13:31:47 -0700 Subject: [PATCH] first pass at switching up pi 1 revision detection --- adafruit_platformdetect/board.py | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/adafruit_platformdetect/board.py b/adafruit_platformdetect/board.py index ea17f3bd..f697dcd8 100644 --- a/adafruit_platformdetect/board.py +++ b/adafruit_platformdetect/board.py @@ -26,7 +26,8 @@ NODEMCU = "NODEMCU" ORANGE_PI_PC = "ORANGE_PI_PC" -RASPBERRY_PI_B = "RASPBERRY_PI_B" +RASPBERRY_PI_B_REV1 = "RASPBERRY_PI_B_REV1" +RASPBERRY_PI_B_REV2 = "RASPBERRY_PI_B_REV2" RASPBERRY_PI_B_PLUS = "RASPBERRY_PI_B_PLUS" RASPBERRY_PI_A = "RASPBERRY_PI_A" RASPBERRY_PI_A_PLUS = "RASPBERRY_PI_A_PLUS" @@ -40,6 +41,17 @@ RASPBERRY_PI_3A_PLUS = "RASPBERRY_PI_3A_PLUS" # pylint: enable=bad-whitespace +_RASPBERRY_PI_40_PIN_IDS = ( + RASPBERRY_PI_B_PLUS, + RASPBERRY_PI_A_PLUS, + RASPBERRY_PI_ZERO, + RASPBERRY_PI_ZERO_W, + RASPBERRY_PI_2B, + RASPBERRY_PI_3B, + RASPBERRY_PI_3B_PLUS, + RASPBERRY_PI_3A_PLUS +) + _BEAGLEBONE_IDS = ( BEAGLEBONE, BEAGLEBONE_BLACK, @@ -58,17 +70,6 @@ OSD3358_SM_RED, ) -_RASPBERRY_PI_40_PIN_IDS = ( - RASPBERRY_PI_B_PLUS, - RASPBERRY_PI_A_PLUS, - RASPBERRY_PI_ZERO, - RASPBERRY_PI_ZERO_W, - RASPBERRY_PI_2B, - RASPBERRY_PI_3B, - RASPBERRY_PI_3B_PLUS, - RASPBERRY_PI_3A_PLUS -) - # BeagleBone eeprom board ids from: # https://github.com/beagleboard/image-builder # Thanks to zmatt on freenode #beagle for pointers. @@ -138,7 +139,8 @@ # https://www.raspberrypi.org/documentation/hardware/raspberrypi/revision-codes/README.md _PI_REV_CODES = { - RASPBERRY_PI_B: ('0002', '0003', '0004', '0005', '0006', '000d', '000e', '000f'), + RASPBERRY_PI_B_REV1: ('0002', '0003'), + RASPBERRY_PI_B_REV2: ('0005', '0006', '000d', '000e', '000f'), RASPBERRY_PI_B_PLUS: ('0010', '0013', '900032'), RASPBERRY_PI_A: ('0007', '0008', '0009'), RASPBERRY_PI_A_PLUS: ('0012', '0015', '900021'),