Skip to content

Commit 1801911

Browse files
authored
"address" argument on LEDs #422 (#446)
* "address" argument on LEDs #422 * Update git_version.py for ev3dev2 directory * Improve Led and Leds __str__
1 parent 39dd003 commit 1801911

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

ev3dev2/led.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,9 @@ class Led(Device):
7878
'desc',
7979
]
8080

81-
def __init__(self, address=None,
81+
def __init__(self,
8282
name_pattern=SYSTEM_DEVICE_NAME_CONVENTION, name_exact=False,
83-
desc='LED', **kwargs):
84-
85-
if address is not None:
86-
kwargs['address'] = address
83+
desc=None, **kwargs):
8784
super(Led, self).__init__(self.SYSTEM_CLASS_NAME, name_pattern, name_exact, **kwargs)
8885

8986
self._max_brightness = None
@@ -95,7 +92,10 @@ def __init__(self, address=None,
9592
self.desc = desc
9693

9794
def __str__(self):
98-
return self.desc
95+
if self.desc:
96+
return self.desc
97+
else:
98+
return Device.__str__(self)
9999

100100
@property
101101
def max_brightness(self):
@@ -282,6 +282,9 @@ def __init__(self):
282282
for led_name in value:
283283
self.led_groups[key].append(self.leds[led_name])
284284

285+
def __str__(self):
286+
return self.__class__.__name__
287+
285288
def set_color(self, group, color, pct=1):
286289
"""
287290
Sets brigthness of leds in the given group to the values specified in

git_version.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ def git_version(abbrev=4):
7171
if version != release_version:
7272
write_release_version(version)
7373

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

7878
# Finally, return the current version.

0 commit comments

Comments
 (0)