Skip to content

Commit fd9fe07

Browse files
authored
Specify driver name in device constructors (#216)
* Specify driver name in device constructors Fixes #215 * Renamed Firgelli actuators to Actuonix
1 parent ead32e0 commit fd9fe07

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

ev3dev-lang

ev3dev/core.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -842,7 +842,7 @@ class LargeMotor(Motor):
842842

843843
def __init__(self, address=None, name_pattern=SYSTEM_DEVICE_NAME_CONVENTION, name_exact=False, **kwargs):
844844

845-
super(LargeMotor, self).__init__(address, name_pattern, name_exact, **kwargs)
845+
super(LargeMotor, self).__init__(address, name_pattern, name_exact, driver_name=['lego-ev3-l-motor'], **kwargs)
846846

847847

848848
# ~autogen
@@ -859,7 +859,7 @@ class MediumMotor(Motor):
859859

860860
def __init__(self, address=None, name_pattern=SYSTEM_DEVICE_NAME_CONVENTION, name_exact=False, **kwargs):
861861

862-
super(MediumMotor, self).__init__(address, name_pattern, name_exact, **kwargs)
862+
super(MediumMotor, self).__init__(address, name_pattern, name_exact, driver_name=['lego-ev3-m-motor'], **kwargs)
863863

864864

865865
# ~autogen
@@ -876,41 +876,41 @@ class NxtMotor(Motor):
876876

877877
def __init__(self, address=None, name_pattern=SYSTEM_DEVICE_NAME_CONVENTION, name_exact=False, **kwargs):
878878

879-
super(NxtMotor, self).__init__(address, name_pattern, name_exact, **kwargs)
879+
super(NxtMotor, self).__init__(address, name_pattern, name_exact, driver_name=['lego-nxt-motor'], **kwargs)
880880

881881

882882
# ~autogen
883-
# ~autogen generic-class classes.firgelli50Motor>currentClass
883+
# ~autogen generic-class classes.actuonix50Motor>currentClass
884884

885-
class FirgelliL1250Motor(Motor):
885+
class ActuonixL1250Motor(Motor):
886886

887887
"""
888-
Firgelli L12 50 linear servo motor
888+
Actuonix L12 50 linear servo motor
889889
"""
890890

891891
SYSTEM_CLASS_NAME = Motor.SYSTEM_CLASS_NAME
892892
SYSTEM_DEVICE_NAME_CONVENTION = 'linear*'
893893

894894
def __init__(self, address=None, name_pattern=SYSTEM_DEVICE_NAME_CONVENTION, name_exact=False, **kwargs):
895895

896-
super(FirgelliL1250Motor, self).__init__(address, name_pattern, name_exact, **kwargs)
896+
super(ActuonixL1250Motor, self).__init__(address, name_pattern, name_exact, driver_name=['act-l12-ev3-50'], **kwargs)
897897

898898

899899
# ~autogen
900-
# ~autogen generic-class classes.firgelli100Motor>currentClass
900+
# ~autogen generic-class classes.actuonix100Motor>currentClass
901901

902-
class FirgelliL12100Motor(Motor):
902+
class ActuonixL12100Motor(Motor):
903903

904904
"""
905-
Firgelli L12 100 linear servo motor
905+
Actuonix L12 100 linear servo motor
906906
"""
907907

908908
SYSTEM_CLASS_NAME = Motor.SYSTEM_CLASS_NAME
909909
SYSTEM_DEVICE_NAME_CONVENTION = 'linear*'
910910

911911
def __init__(self, address=None, name_pattern=SYSTEM_DEVICE_NAME_CONVENTION, name_exact=False, **kwargs):
912912

913-
super(FirgelliL12100Motor, self).__init__(address, name_pattern, name_exact, **kwargs)
913+
super(ActuonixL12100Motor, self).__init__(address, name_pattern, name_exact, driver_name=['act-l12-ev3-100'], **kwargs)
914914

915915

916916
# ~autogen
@@ -1603,7 +1603,7 @@ class I2cSensor(Sensor):
16031603

16041604
def __init__(self, address=None, name_pattern=SYSTEM_DEVICE_NAME_CONVENTION, name_exact=False, **kwargs):
16051605

1606-
super(I2cSensor, self).__init__(address, name_pattern, name_exact, **kwargs)
1606+
super(I2cSensor, self).__init__(address, name_pattern, name_exact, driver_name=['nxt-i2c-sensor'], **kwargs)
16071607

16081608
self._fw_version = None
16091609
self._poll_ms = None

templates/generic-class.liquid

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ endfor %}
4040
{% endif %}
4141
def __init__(self, address=None, name_pattern=SYSTEM_DEVICE_NAME_CONVENTION, name_exact=False, **kwargs):
4242
{% if currentClass.inheritance %}
43-
super({{ class_name }}, self).__init__(address, name_pattern, name_exact, **kwargs)
43+
super({{ class_name }}, self).__init__(address, name_pattern, name_exact,{{ driver_name }} **kwargs)
4444
{% else %}
4545
if address is not None:
4646
kwargs['address'] = address
47-
super({{ class_name }}, self).__init__(self.SYSTEM_CLASS_NAME, name_pattern, name_exact, **kwargs)
47+
super({{ class_name }}, self).__init__(self.SYSTEM_CLASS_NAME, name_pattern, name_exact,{{ driver_name }} **kwargs)
4848
{% endif %}{%
4949
for prop in currentClass.systemProperties %}{%
5050
assign prop_name = prop.name | downcase | underscore_spaces %}

0 commit comments

Comments
 (0)