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

Merge pull request #274 from waveform80/doc-reorg

Browse Source 
Doc reorganization
This commit is contained in:
Dave Jones
2016-04-10 16:58:27 +01:00
parent 8f8dddd403 ecc8df8041
commit e2b8171bbb
38 changed files with 1250 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gpiozero/devices.py
View File

@@ -264,7 +264,7 @@ class CompositeDevice(Device):
def __init__(self, *args, **kwargs):
self._all = ()
self._named = {}
self._tuple = None
self._namedtuple = None
self._order = kwargs.pop('_order', None)
if self._order is None:
self._order = sorted(kwargs.keys())
@@ -279,7 +279,7 @@ class CompositeDevice(Device):
if not isinstance(dev, Device):
raise CompositeDeviceBadDevice("%s doesn't inherit from Device" % dev)
self._named = kwargs
self._tuple = namedtuple('%sValue' % self.__class__.__name__, chain(
self._namedtuple = namedtuple('%sValue' % self.__class__.__name__, chain(
(str(i) for i in range(len(args))), self._order),
rename=True)
@@ -333,12 +333,12 @@ class CompositeDevice(Device):
return all(device.closed for device in self)
@property
def tuple(self):
return self._tuple
def namedtuple(self):
return self._namedtuple
@property
def value(self):
return self.tuple(*(device.value for device in self))
return self.namedtuple(*(device.value for device in self))
@property
def is_active(self):