Merging EV3 and NXT large servo motor classes

See ev3dev/ev3dev-lang#172

Author: ddemidov

ev3dev-lang

@@ -831,15 +831,15 @@ def list_motors(name_pattern=Motor.SYSTEM_DEVICE_NAME_CONVENTION, **kwargs):
 class LargeMotor(Motor):
 
     """
-    EV3 large servo motor
+    EV3/NXT large servo motor
     """
 
     SYSTEM_CLASS_NAME = Motor.SYSTEM_CLASS_NAME
     SYSTEM_DEVICE_NAME_CONVENTION = '*'
 
     def __init__(self, address=None, name_pattern=SYSTEM_DEVICE_NAME_CONVENTION, name_exact=False, **kwargs):
 
-        super(LargeMotor, self).__init__(address, name_pattern, name_exact, driver_name=['lego-ev3-l-motor'], **kwargs)
+        super(LargeMotor, self).__init__(address, name_pattern, name_exact, driver_name=['lego-ev3-l-motor', 'lego-nxt-motor'], **kwargs)
 
 
 # ~autogen
@@ -859,23 +859,6 @@ def __init__(self, address=None, name_pattern=SYSTEM_DEVICE_NAME_CONVENTION, nam
         super(MediumMotor, self).__init__(address, name_pattern, name_exact, driver_name=['lego-ev3-m-motor'], **kwargs)
 
 
-# ~autogen
-# ~autogen generic-class classes.nxtMotor>currentClass
-
-class NxtMotor(Motor):
-
-    """
-    NXT servo motor
-    """
-
-    SYSTEM_CLASS_NAME = Motor.SYSTEM_CLASS_NAME
-    SYSTEM_DEVICE_NAME_CONVENTION = '*'
-
-    def __init__(self, address=None, name_pattern=SYSTEM_DEVICE_NAME_CONVENTION, name_exact=False, **kwargs):
-
-        super(NxtMotor, self).__init__(address, name_pattern, name_exact, driver_name=['lego-nxt-motor'], **kwargs)
-
-
 # ~autogen
 # ~autogen generic-class classes.actuonix50Motor>currentClass