Merge remote-tracking branch 'upstream/master'

Author: waveform80

docs/cli_pinout.rst

@@ -8,7 +8,7 @@ Synopsis
 
 ::
 
-    pinout [-h] [-r REVISION] [-c] [-m]
+    pinout [-h] [-r REVISION] [-c] [-m] [-x]
 
 Description
 -----------
@@ -41,6 +41,10 @@ Options
 
     Force monochrome output. See also :option:`--color`
 
+.. option:: -x, --xyz
+
+    Open `pinout.xyz`_ in the default web browser
+
 Examples
 --------
 
@@ -172,4 +176,5 @@ PIGPIO_PORT
 
         :manpage:`remote-gpio(7)`
 
-.. _revision codes: http://elinux.org/RPi_HardwareHistory
+.. _pinout.xyz: https://pinout.xyz/
+.. _revision codes: https://www.raspberrypi.org/documentation/hardware/raspberrypi/revision-codes/README.md

docs/development.rst

@@ -90,7 +90,7 @@ command should install all required dependencies:
 .. code-block:: console
 
     $ sudo apt install texlive-latex-recommended texlive-latex-extra \
-        texlive-fonts-recommended graphviz inkscape
+        texlive-fonts-recommended graphviz inkscape python-sphinx
 
 Once these are installed, you can use the "doc" target to build the
 documentation:

gpiozero/boards.py

@@ -1602,6 +1602,10 @@ def __repr__(self):
         except DeviceClosed:
             return "<gpiozero.Energenie object closed>"
 
+    @property
+    def socket(self):
+        return self._socket
+
     @property
     def value(self):
         return self._value

gpiozero/pins/data.py

@@ -122,7 +122,7 @@
 {style:white on green}| {J8:{style} col2}{style:white on green} J8     {style:black on white}+===={style:reset}
 {style:white on green}| {J8:{style} col1}{style:white on green}        {style:black on white}| USB{style:reset}
 {style:white on green}|                             {style:black on white}+===={style:reset}
-{style:white on green}|      {style:bold}Pi Model {model:3s}V{pcb_revision:3s}{style:normal}          |{style:reset}
+{style:white on green}|      {style:bold}Pi Model {model:4s}V{pcb_revision:3s}{style:normal}          |{style:reset}
 {style:white on green}|      {style:on black}+----+{style:on green}                 {style:black on white}+===={style:reset}
 {style:white on green}| {style:on black}|D|{style:on green}  {style:on black}|SoC |{style:on green}                 {style:black on white}| USB{style:reset}
 {style:white on green}| {style:on black}|S|{style:on green}  {style:on black}|    |{style:on green}                 {style:black on white}+===={style:reset}
@@ -841,7 +841,7 @@ def from_revision(cls, revision):
             # CCCC     - Manufacturer (0=Sony, 1=Egoman, 2=Embest, 3=Sony Japan)
             # 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, 10=CM3, 12=Zero W)
+            #                  8=3B, 9=Zero, 10=CM3, 12=Zero W, 13=3B+)
             # RRRR     - Revision (0, 1, 2, etc.)
             revcode_memory       = (revision & 0x700000) >> 20
             revcode_manufacturer = (revision & 0xf0000)  >> 16
@@ -860,6 +860,7 @@ def from_revision(cls, revision):
                     9:  'Zero',
                     10: 'CM3',
                     12: 'Zero W',
+                    13:  '3B+',
                     }.get(revcode_type, '???')
                 if model in ('A', 'B'):
                     pcb_revision = {
@@ -896,6 +897,7 @@ def from_revision(cls, revision):
                     'Zero':   '2015Q4' if pcb_revision == '1.2' else '2016Q2',
                     'CM3':    '2017Q1',
                     'Zero W': '2017Q1',
+                    '3B+':    '2018Q1',
                     }.get(model, 'Unknown')
                 storage = {
                     'A':   'SD',
@@ -923,10 +925,12 @@ def from_revision(cls, revision):
                 wifi = {
                     '3B':     True,
                     'Zero W': True,
+                    '3B+':    True,
                     }.get(model, False)
                 bluetooth = {
                     '3B':     True,
                     'Zero W': True,
+                    '3B+':    True,
                     }.get(model, False)
                 csi = {
                     'Zero':   0 if pcb_revision == '1.0' else 1,

gpiozerocli/pinout.py

@@ -13,6 +13,7 @@
 import sys
 import textwrap
 import warnings
+import webbrowser
 
 class PinoutTool(object):
     def __init__(self):
@@ -38,6 +39,12 @@ def __init__(self):
             action='store_false',
             help='Force monochrome output. See also --color'
         )
+        self.parser.add_argument(
+            '-x', '--xyz',
+            dest='xyz',
+            action='store_true',
+            help='Open pinout.xyz in the default web browser'
+        )
 
     def __call__(self, args=None):
         if args is None:
@@ -69,23 +76,27 @@ def main(self, args):
                 "remotely access your Pi."
             )
             formatter.add_text(
-                "* https://gpiozero.readthedocs.io/en/latest/remote_gpio.html"
+                "* https://gpiozero.readthedocs.io/en/stable/remote_gpio.html"
             )
             sys.stderr.write(formatter.format_help())
         else:
-            if args.revision == '':
-                try:
-                    pi_info().pprint(color=args.color)
-                except IOError:
-                    raise IOError('This device is not a Raspberry Pi')
+            if args.xyz:
+                webbrowser.open('https://pinout.xyz')
             else:
-                pi_info(args.revision).pprint(color=args.color)
-            formatter = self.parser._get_formatter()
-            formatter.add_text(
-                "For further information, please refer to https://pinout.xyz/"
-            )
-            sys.stdout.write('\n')
-            sys.stdout.write(formatter.format_help())
+                if args.revision == '':
+                    try:
+                        pi_info().pprint(color=args.color)
+                    except IOError:
+                        raise IOError('This device is not a Raspberry Pi')
+                else:
+                    pi_info(args.revision).pprint(color=args.color)
+                formatter = self.parser._get_formatter()
+                formatter.add_text(
+                    "For further information, please refer to "
+                    "https://pinout.xyz/"
+                )
+                sys.stdout.write('\n')
+                sys.stdout.write(formatter.format_help())
 
 
 main = PinoutTool()

tests/test_boards.py

@@ -935,6 +935,8 @@ def test_energenie():
         assert repr(device2) == '<gpiozero.Energenie object on socket 2>'
         assert device1.value
         assert not device2.value
+        assert device1.socket == 1
+        assert device2.socket == 2
         [pin.clear_states() for pin in pins]
         device1.on()
         assert device1.value