Merge pull request #9 from arduino/dev

0.2.0

Author: gbr1

arduino_alvik.py

@@ -1,3 +1,5 @@
 
 # COLOR SENSOR
 COLOR_FULL_SCALE = 4097
+WHITE_CAL = [444, 342, 345]
+BLACK_CAL = [153, 135, 123]

constants.py

@@ -0,0 +1,68 @@
+# MEASUREMENT UNITS CONVERSION #
+
+from math import pi
+
+
+def conversion_method(func):
+    def wrapper(*args, **kwargs):
+        try:
+            return func(*args, **kwargs)
+        except KeyError:
+            raise ConversionError(f'Cannot {func.__name__} from {args[1]} to {args[2]}')
+    return wrapper
+
+
+@conversion_method
+def convert_rotational_speed(value: float, from_unit: str, to_unit: str) -> float:
+    """
+    Converts a rotational speed value from one unit to another
+    :param value:
+    :param from_unit: unit of input value
+    :param to_unit: unit of output value
+    :return:
+    """
+    speeds = {'rpm': 1.0, 'deg/s': 1/6, 'rad/s': 60/(2*pi), 'rev/s': 60}
+    return value * speeds[from_unit.lower()] / speeds[to_unit.lower()]
+
+
+@conversion_method
+def convert_angle(value: float, from_unit: str, to_unit: str) -> float:
+    """
+    Converts an angle value from one unit to another
+    :param value:
+    :param from_unit: unit of input value
+    :param to_unit: unit of output value
+    :return:
+    """
+    angles = {'deg': 1.0, 'rad': 180/pi, 'rev': 360, 'revolution': 360, '%': 3.6, 'perc': 3.6}
+    return value * angles[from_unit.lower()] / angles[to_unit.lower()]
+
+
+@conversion_method
+def convert_distance(value: float, from_unit: str, to_unit: str) -> float:
+    """
+    Converts a distance value from one unit to another
+    :param value:
+    :param from_unit: unit of input value
+    :param to_unit: unit of output value
+    :return:
+    """
+    distances = {'cm': 1.0, 'mm': 0.1, 'm': 100, 'inch': 2.54, 'in': 2.54}
+    return value * distances[from_unit.lower()] / distances[to_unit.lower()]
+
+
+@conversion_method
+def convert_speed(value: float, from_unit: str, to_unit: str) -> float:
+    """
+    Converts a distance value from one unit to another
+    :param value:
+    :param from_unit: unit of input value
+    :param to_unit: unit of output value
+    :return:
+    """
+    distances = {'cm/s': 1.0, 'mm/s': 0.1, 'm/s': 100, 'inch/s': 2.54, 'in/s': 2.54}
+    return value * distances[from_unit.lower()] / distances[to_unit.lower()]
+
+
+class ConversionError(Exception):
+    pass

conversions.py

@@ -4,15 +4,17 @@
 
 alvik = ArduinoAlvik()
 alvik.begin()
-speed = 0
+
+reference = 10.0
 
 while True:
     try:
-        alvik.left_wheel.set_pid_gains(10.0, 1.3, 4.2)
-        sleep_ms(100)
-        alvik.right_wheel.set_pid_gains(4.0, 13, 1.9)
+        L, CL, C, CR, R = alvik.get_distance()
+        print(f'C: {C}')
+        error = C - reference
+        alvik.set_wheels_speed(error*10, error*10)
         sleep_ms(100)
     except KeyboardInterrupt as e:
         print('over')
         alvik.stop()
-        sys.exit()
+        sys.exit()

examples/set_pid.py renamed to examples/hand_follower.py

@@ -6,8 +6,6 @@
 if alvik.begin() < 0:
     sys.exit()
 
-speed = 0
-
 while True:
     try:
         print(f'VER: {alvik.version}')

examples/message_reader.py

@@ -8,56 +8,48 @@
 while True:
     try:
 
-        alvik.move(100.0)
+        alvik.move(100.0, 'mm')
         print("on target after move")
 
-        alvik.move(50.0)
+        alvik.move(50.0, 'mm')
         print("on target after move")
 
-        alvik.rotate(90.0)
+        alvik.rotate(90.0, 'deg')
         print("on target after rotation")
 
-        alvik.rotate(-45.00)
+        alvik.rotate(-45.00, 'deg')
         print("on target after rotation")
 
         x, y, theta = alvik.get_pose()
-        print(f'Current pose is x={x}, y={y} ,theta={theta}')
+        print(f'Current pose is x(cm)={x}, y(cm)={y}, theta(deg)={theta}')
 
         alvik.reset_pose(0, 0, 0)
 
         x, y, theta = alvik.get_pose()
-        print(f'Updated pose is x={x}, y={y} ,theta={theta}')
+        print(f'Updated pose is x(cm)={x}, y(cm)={y}, theta(deg)={theta}')
         sleep_ms(500)
 
         print("___________NON-BLOCKING__________________")
 
-        alvik.move(50.0, blocking=False)
-        while not alvik.is_target_reached():
-            print(f"Not yet on target received:{alvik.last_ack}")
+        alvik.move(50.0, 'mm', blocking=False)
         print("on target after move")
 
-        alvik.rotate(45.0, blocking=False)
-        while not alvik.is_target_reached():
-            print(f"Not yet on target received:{alvik.last_ack}")
+        alvik.rotate(45.0, 'deg', blocking=False)
         print("on target after rotation")
 
-        alvik.move(100.0, blocking=False)
-        while not alvik.is_target_reached():
-            print(f"Not yet on target received:{alvik.last_ack}")
+        alvik.move(100.0, 'mm', blocking=False)
         print("on target after move")
 
-        alvik.rotate(-90.00, blocking=False)
-        while not alvik.is_target_reached():
-            print(f"Not yet on target received:{alvik.last_ack}")
+        alvik.rotate(-90.00, 'deg', blocking=False)
         print("on target after rotation")
 
         x, y, theta = alvik.get_pose()
-        print(f'Current pose is x={x}, y={y} ,theta={theta}')
+        print(f'Current pose is x(cm)={x}, y(cm)={y}, theta(deg)={theta}')
 
         alvik.reset_pose(0, 0, 0)
 
         x, y, theta = alvik.get_pose()
-        print(f'Updated pose is x={x}, y={y} ,theta={theta}')
+        print(f'Updated pose is x={x}, y={y}, theta(deg)={theta}')
         sleep_ms(500)
 
         alvik.stop()

examples/pose_example.py

@@ -4,12 +4,13 @@
 
 alvik = ArduinoAlvik()
 alvik.begin()
-speed = 0
 
 while True:
     try:
-        r, g, b = alvik.get_color_raw()
-        print(f'RED: {r}, Green: {g}, Blue: {b}')
+        r, g, b = alvik.get_color()
+        h, s, v = alvik.get_color('hsv')
+        print(f'RED: {r}, Green: {g}, Blue: {b}, HUE: {h}, SAT: {s}, VAL: {v}')
+        print(f'COLOR LABEL: {alvik.get_color_label(h, s, v)}')
         sleep_ms(100)
     except KeyboardInterrupt as e:
         print('over')

examples/read_color_sensor.py

@@ -4,7 +4,6 @@
 
 alvik = ArduinoAlvik()
 alvik.begin()
-speed = 0
 
 while True:
     try:

examples/read_imu.py

@@ -0,0 +1,18 @@
+from arduino_alvik import ArduinoAlvik
+from time import sleep_ms
+import sys
+
+alvik = ArduinoAlvik()
+alvik.begin()
+
+while True:
+    try:
+        L, CL, C, CR, R = alvik.get_distance()
+        T = alvik.get_distance_top()
+        B = alvik.get_distance_bottom()
+        print(f'T: {T} | B: {B} | L: {L} | CL: {CL} | C: {C} | CR: {CR} | R: {R}')
+        sleep_ms(100)
+    except KeyboardInterrupt as e:
+        print('over')
+        alvik.stop()
+        sys.exit()

examples/read_tof.py

@@ -4,7 +4,6 @@
 
 alvik = ArduinoAlvik()
 alvik.begin()
-speed = 0
 
 while True:
     try: