Skip to content

Commit

Permalink
"address" argument on LEDs #422 (#446)
Browse files Browse the repository at this point in the history
* "address" argument on LEDs #422

* Update git_version.py for ev3dev2 directory

* Improve Led and Leds __str__
  • Loading branch information
dwalton76 committed Jan 31, 2018
1 parent 39dd003 commit 1801911
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 8 deletions.
15 changes: 9 additions & 6 deletions ev3dev2/led.py
Expand Up @@ -78,12 +78,9 @@ class Led(Device):
'desc',
]

def __init__(self, address=None,
def __init__(self,
name_pattern=SYSTEM_DEVICE_NAME_CONVENTION, name_exact=False,
desc='LED', **kwargs):

if address is not None:
kwargs['address'] = address
desc=None, **kwargs):
super(Led, self).__init__(self.SYSTEM_CLASS_NAME, name_pattern, name_exact, **kwargs)

self._max_brightness = None
Expand All @@ -95,7 +92,10 @@ def __init__(self, address=None,
self.desc = desc

def __str__(self):
return self.desc
if self.desc:
return self.desc
else:
return Device.__str__(self)

@property
def max_brightness(self):
Expand Down Expand Up @@ -282,6 +282,9 @@ def __init__(self):
for led_name in value:
self.led_groups[key].append(self.leds[led_name])

def __str__(self):
return self.__class__.__name__

def set_color(self, group, color, pct=1):
"""
Sets brigthness of leds in the given group to the values specified in
Expand Down
4 changes: 2 additions & 2 deletions git_version.py
Expand Up @@ -71,8 +71,8 @@ def git_version(abbrev=4):
if version != release_version:
write_release_version(version)

# Update the ev3dev/version.py
with open('{}/ev3dev/version.py'.format(os.path.dirname(__file__)), 'w') as f:
# Update the ev3dev2/version.py
with open('{}/ev3dev2/version.py'.format(os.path.dirname(__file__)), 'w') as f:
f.write("__version__ = '{}'".format(version))

# Finally, return the current version.
Expand Down

0 comments on commit 1801911

Please sign in to comment.