Fix one typo

Add port parameter to lego devices

Author: topikachu

build_egg.sh

@@ -1 +1 @@
-python setup.py bdist_egg
+python setup.py bdist_egg upload

ev3/lego.py

@@ -16,8 +16,8 @@ class ColorSensor(Msensor):
     colors = (None, 'black', 'blue', 'green',
               'yellow', 'red', 'white', 'brown')
 
-    def __init__(self):
-        Msensor.__init__(self, type_id=29)
+    def __init__(self, port=-1):
+        Msensor.__init__(self, port, type_id=29)
 
     @property
     def rgb(self):
@@ -47,8 +47,8 @@ def ref_raw(self):
 
 class InfraredSensor(Msensor):
 
-    def __init__(self):
-        Msensor.__init__(self, type_id=33)
+    def __init__(self, port=-1):
+        Msensor.__init__(self, port, type_id=33)
 
     @property
     def remote(self):
@@ -76,8 +76,8 @@ def seek(self):
 
 class GyroSensor(Msensor):
 
-    def __init__(self):
-        Msensor.__init__(self, type_id=32)
+    def __init__(self, port=-1):
+        Msensor.__init__(self, port, type_id=32)
 
     @property
     def ang(self):
@@ -97,8 +97,8 @@ def ang_and_rate(self):
 
 class UltrasonicSensor(Msensor):
 
-    def __init__(self):
-        Msensor.__init__(self, type_id=30)
+    def __init__(self, port=-1):
+        Msensor.__init__(self, port, type_id=30)
 
     @property
     def dist_cm(self):
@@ -128,11 +128,11 @@ def si_in(self):
 
 class LargeMotor(Motor):
 
-    def __init__(self):
-        Motor.__init__(self, _type='tacho')
+    def __init__(self, port=''):
+        Motor.__init__(self, port, _type='tacho')
 
 
-class MidiumMotor(Motor):
+class MediumMotor(Motor):
 
-    def __init__(self):
-        Motor.__init__(self, _type='minitacho')
+    def __init__(self, port=''):
+        Motor.__init__(self, port, _type='minitacho')

test/test_ev3_motor.py

@@ -4,9 +4,9 @@
 
 
 class TestMotor(unittest.TestCase):
+    raw_input('Attach a motor on port A then continue')
     def __init__(self,*args, **kwargs):
-        super(TestMotor, self).__init__(*args, **kwargs)
-        raw_input('Attach a motor on port A then continue')
+        super(TestMotor, self).__init__(*args, **kwargs)        
         self.d=Motor(port=Motor.PORT.A)
 
     def setUp(self):

test/test_lego_large_motor.py

@@ -9,10 +9,7 @@ def test_large_motor(self):
         raw_input('Attach a LargeMotor then continue')
         d = LargeMotor()
         print(d.type)
-        d.run_mode='forever'
-        d.regulation_mode=True
-        d.pulses_per_second_sp=200
-        d.start()
+        d.run_forever(100, regulation_mode=False)
         print(d.run)
         time.sleep(5)
         d.stop()

test/test_lego_medium_motor.py

@@ -0,0 +1,17 @@
+from ev3.lego import MediumMotor
+import unittest
+import time
+
+
+
+class TesMediumMotor(unittest.TestCase):
+    def test_medium_motor(self):
+        raw_input('Attach a MediumMotor then continue')
+        d = MediumMotor()
+        print(d.type)
+        d.run_forever(100, regulation_mode=False)
+        print(d.run)
+        time.sleep(5)
+        d.stop()
+if __name__ == '__main__':
+    unittest.main()