Allow returning multiple values from a special sensor helper method

See ev3dev/ev3dev-lang#169

Author: ddemidov

ev3dev-lang

@@ -1658,9 +1658,10 @@ def is_pressed(self):
         A boolean indicating whether the current touch sensor is being
         pressed.
         """
+
         self.mode = self.MODE_TOUCH
-        return self.value(0)
 
+        return self.value(0)
 
 class ColorSensor(Sensor):
 
@@ -1695,14 +1696,18 @@ def reflected_light_intensity(self):
         """
         Reflected light intensity as a percentage. Light on sensor is red.
         """
+
         self.mode = self.MODE_COL_REFLECT
+
         return self.value(0)
 
     def ambient_light_intensity(self):
         """
         Ambient light intensity. Light on sensor is dimly lit blue.
         """
+
         self.mode = self.MODE_COL_AMBIENT
+
         return self.value(0)
 
     def color(self):
@@ -1717,30 +1722,37 @@ def color(self):
           - 6: White
           - 7: Brown
         """
+
         self.mode = self.MODE_COL_COLOR
+
         return self.value(0)
 
     def red(self):
         """
         Red component of the detected color, in the range 0-1020.
         """
+
         self.mode = self.MODE_RGB_RAW
+
         return self.value(0)
 
     def green(self):
         """
         Green component of the detected color, in the range 0-1020.
         """
+
         self.mode = self.MODE_RGB_RAW
+
         return self.value(1)
 
     def blue(self):
         """
         Blue component of the detected color, in the range 0-1020.
         """
+
         self.mode = self.MODE_RGB_RAW
-        return self.value(2)
 
+        return self.value(2)
 
 class UltrasonicSensor(Sensor):
 
@@ -1776,25 +1788,30 @@ def distance_centimeters(self):
         Measurement of the distance detected by the sensor,
         in centimeters.
         """
+
         self.mode = self.MODE_US_DIST_CM
+
         return self.value(0)
 
     def distance_inches(self):
         """
         Measurement of the distance detected by the sensor,
         in inches.
         """
+
         self.mode = self.MODE_US_DIST_IN
+
         return self.value(0)
 
     def other_sensor_present(self):
         """
         Value indicating whether another ultrasonic sensor could
         be heard nearby.
         """
+
         self.mode = self.MODE_US_LISTEN
-        return self.value(0)
 
+        return self.value(0)
 
 class GyroSensor(Sensor):
 
@@ -1830,16 +1847,28 @@ def angle(self):
         The number of degrees that the sensor has been rotated
         since it was put into this mode.
         """
+
         self.mode = self.MODE_GYRO_ANG
+
         return self.value(0)
 
     def rate(self):
         """
         The rate at which the sensor is rotating, in degrees/second.
         """
+
         self.mode = self.MODE_GYRO_RATE
+
         return self.value(0)
 
+    def rate_and_angle(self):
+        """
+        Angle (degrees) and Rotational Speed (degrees/second).
+        """
+
+        self.mode = self.MODE_GYRO_G_A
+
+        return self.value(0), self.value(1)
 
 class InfraredSensor(Sensor):
 
@@ -1875,9 +1904,10 @@ def proximity(self):
         A measurement of the distance between the sensor and the remote,
         as a percentage. 100% is approximately 70cm/27in.
         """
+
         self.mode = self.MODE_IR_PROX
-        return self.value(0)
 
+        return self.value(0)
 
 class SoundSensor(Sensor):
 
@@ -1904,17 +1934,20 @@ def sound_pressure(self):
         A measurement of the measured sound pressure level, as a
         percent. Uses a flat weighting.
         """
+
         self.mode = self.MODE_DB
+
         return self.value(0)
 
     def sound_pressure_low(self):
         """
         A measurement of the measured sound pressure level, as a
         percent. Uses A-weighting, which focuses on levels up to 55 dB.
         """
+
         self.mode = self.MODE_DBA
-        return self.value(0)
 
+        return self.value(0)
 
 class LightSensor(Sensor):
 
@@ -1940,16 +1973,19 @@ def reflected_light_intensity(self):
         """
         A measurement of the reflected light intensity, as a percentage.
         """
+
         self.mode = self.MODE_REFLECT
+
         return self.value(0)
 
     def ambient_light_intensity(self):
         """
         A measurement of the ambient light intensity, as a percentage.
         """
+
         self.mode = self.MODE_AMBIENT
-        return self.value(0)
 
+        return self.value(0)
 
 
 # ~autogen

ev3dev/core.py

@@ -50,8 +50,7 @@ endfor %}
 endfor %}
 {% for mapping in currentClass.sensorValueMappings %}{%
   assign name = mapping.name | downcase | underscore_spaces %}{%
-  assign mode = mapping.requiredMode | upcase | underscore_non_wc %}{%
-  assign value_index = mapping.sourceValue %}
+  assign mode = mapping.requiredMode | upcase | underscore_non_wc %}
     def {{ name }}(self):
         """{%
   for line in mapping.description %}{%
@@ -61,7 +60,12 @@ endfor %}
 {%  endif %}{%
   endfor %}
         """
+
         self.mode = self.MODE_{{ mode }}
-        return self.value({{ value_index }})
-{% endfor %}
-{% endfor %}
+
+        return {%
+  for value_index in mapping.sourceValue
+  %}self.value({{ value_index }}){% unless forloop.last %}, {% endunless %}{%
+  endfor %}
+{% endfor %}{%
+endfor %}