KevinMidboe/python-gpiozero
1
0
Fork 0
mirror of https://github.com/KevinMidboe/python-gpiozero.git synced 2025-10-29 17:50:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Separate out the revision-code parsing and decoding

Browse Source
This commit is contained in:
Andrew Scheller
2017-01-22 16:51:42 +00:00
parent ed12ac1994
commit 17024c9ba3
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
gpiozero/pins/data.py
View File

@@ -825,6 +825,11 @@ class PiBoardInfo(namedtuple('PiBoardInfo', (
# PPPP - Processor (0=2835, 1=2836, 2=2837) # PPPP - Processor (0=2835, 1=2836, 2=2837)
# TTTTTTTT - Type (0=A, 1=B, 2=A+, 3=B+, 4=2B, 5=Alpha (??), 6=CM, 8=3B, 9=Zero) # TTTTTTTT - Type (0=A, 1=B, 2=A+, 3=B+, 4=2B, 5=Alpha (??), 6=CM, 8=3B, 9=Zero)
# RRRR - Revision (0, 1, 2, etc.) # RRRR - Revision (0, 1, 2, etc.)
revcode_memory = (revision & 0x700000) >> 20
revcode_manufacturer = (revision & 0xf0000) >> 16
revcode_processor = (revision & 0xf000) >> 12
revcode_type = (revision & 0xff0) >> 4
revcode_revision = (revision & 0x0f)
try: try:
model = { model = {
0: 'A', 0: 'A',
@@ -835,15 +840,15 @@ class PiBoardInfo(namedtuple('PiBoardInfo', (
6: 'CM', 6: 'CM',
8: '3B', 8: '3B',
9: 'Zero', 9: 'Zero',
}[(revision & 0xff0) >> 4] }[revcode_type]
if model in ('A', 'B'): if model in ('A', 'B'):
pcb_revision = { pcb_revision = {
0: '1.0', # is this right? 0: '1.0', # is this right?
1: '1.0', 1: '1.0',
2: '2.0', 2: '2.0',
}[revision & 0x0f] }[revcode_revision]
else: else:
pcb_revision = '1.%d' % (revision & 0x0f) pcb_revision = '1.%d' % revcode_revision
released = { released = {
'A': '2013Q1', 'A': '2013Q1',
'B': '2012Q1' if pcb_revision == '1.0' else '2012Q4', 'B': '2012Q1' if pcb_revision == '1.0' else '2012Q4',
@@ -858,17 +863,17 @@ class PiBoardInfo(namedtuple('PiBoardInfo', (
0: 'BCM2835', 0: 'BCM2835',
1: 'BCM2836', 1: 'BCM2836',
2: 'BCM2837', 2: 'BCM2837',
}[(revision & 0xf000) >> 12] }[revcode_processor]
manufacturer = { manufacturer = {
0: 'Sony', 0: 'Sony',
1: 'Egoman', 1: 'Egoman',
2: 'Embest', 2: 'Embest',
}[(revision & 0xf0000) >> 16] }[revcode_manufacturer]
memory = { memory = {
0: 256, 0: 256,
1: 512, 1: 512,
2: 1024, 2: 1024,
}[(revision & 0x700000) >> 20] }[revcode_memory]
storage = { storage = {
'A': 'SD', 'A': 'SD',
'B': 'SD', 'B': 'SD',