Deprecate auto_mode (#382)

* Deprecate auto_mode

* Remove _mode_value

Author: dwalton76

ev3dev/core.py

@@ -2245,7 +2245,7 @@ class TouchSensor(Sensor):
     Touch Sensor
     """
 
-    __slots__ = ['auto_mode', '_poll', '_value0']
+    __slots__ = ['_poll', '_value0']
 
     SYSTEM_CLASS_NAME = Sensor.SYSTEM_CLASS_NAME
     SYSTEM_DEVICE_NAME_CONVENTION = Sensor.SYSTEM_DEVICE_NAME_CONVENTION
@@ -2256,7 +2256,6 @@ class TouchSensor(Sensor):
 
     def __init__(self, address=None, name_pattern=SYSTEM_DEVICE_NAME_CONVENTION, name_exact=False, **kwargs):
         super(TouchSensor, self).__init__(address, name_pattern, name_exact, driver_name=['lego-ev3-touch', 'lego-nxt-touch'], **kwargs)
-        self.auto_mode = True
         self._poll = None
         self._value0 = None
 
@@ -2266,10 +2265,7 @@ def is_pressed(self):
         A boolean indicating whether the current touch sensor is being
         pressed.
         """
-
-        if self.auto_mode:
-            self.mode = self.MODE_TOUCH
-
+        self.mode = self.MODE_TOUCH
         return self.value(0)
 
     @property
@@ -2320,7 +2316,7 @@ class ColorSensor(Sensor):
     LEGO EV3 color sensor.
     """
 
-    __slots__ = ['auto_mode', 'red_max', 'green_max', 'blue_max']
+    __slots__ = ['red_max', 'green_max', 'blue_max']
 
     SYSTEM_CLASS_NAME = Sensor.SYSTEM_CLASS_NAME
     SYSTEM_DEVICE_NAME_CONVENTION = Sensor.SYSTEM_DEVICE_NAME_CONVENTION
@@ -2385,7 +2381,6 @@ class ColorSensor(Sensor):
 
     def __init__(self, address=None, name_pattern=SYSTEM_DEVICE_NAME_CONVENTION, name_exact=False, **kwargs):
         super(ColorSensor, self).__init__(address, name_pattern, name_exact, driver_name=['lego-ev3-color'], **kwargs)
-        self.auto_mode = True
 
         # See calibrate_white() for more details
         self.red_max = 300
@@ -2397,21 +2392,15 @@ def reflected_light_intensity(self):
         """
         Reflected light intensity as a percentage. Light on sensor is red.
         """
-
-        if self.auto_mode:
-            self.mode = self.MODE_COL_REFLECT
-
+        self.mode = self.MODE_COL_REFLECT
         return self.value(0)
 
     @property
     def ambient_light_intensity(self):
         """
         Ambient light intensity. Light on sensor is dimly lit blue.
         """
-
-        if self.auto_mode:
-            self.mode = self.MODE_COL_AMBIENT
-
+        self.mode = self.MODE_COL_AMBIENT
         return self.value(0)
 
     @property
@@ -2427,10 +2416,7 @@ def color(self):
           - 6: White
           - 7: Brown
         """
-
-        if self.auto_mode:
-            self.mode = self.MODE_COL_COLOR
-
+        self.mode = self.MODE_COL_COLOR
         return self.value(0)
 
     @property
@@ -2450,10 +2436,7 @@ def raw(self):
 
         If this is an issue, check out the rgb() and calibrate_white() methods.
         """
-
-        if self.auto_mode:
-            self.mode = self.MODE_RGB_RAW
-
+        self.mode = self.MODE_RGB_RAW
         return self.value(0), self.value(1), self.value(2)
 
     def calibrate_white(self):
@@ -2493,49 +2476,37 @@ def red(self):
         """
         Red component of the detected color, in the range 0-1020.
         """
-
-        if self.auto_mode:
-            self.mode = self.MODE_RGB_RAW
-
+        self.mode = self.MODE_RGB_RAW
         return self.value(0)
 
     @property
     def green(self):
         """
         Green component of the detected color, in the range 0-1020.
         """
-
-        if self.auto_mode:
-            self.mode = self.MODE_RGB_RAW
-
+        self.mode = self.MODE_RGB_RAW
         return self.value(1)
 
     @property
     def blue(self):
         """
         Blue component of the detected color, in the range 0-1020.
         """
-
-        if self.auto_mode:
-            self.mode = self.MODE_RGB_RAW
-
+        self.mode = self.MODE_RGB_RAW
         return self.value(2)
 
+
 class UltrasonicSensor(Sensor):
 
     """
     LEGO EV3 ultrasonic sensor.
     """
 
-    __slots__ = ['auto_mode']
-
     SYSTEM_CLASS_NAME = Sensor.SYSTEM_CLASS_NAME
     SYSTEM_DEVICE_NAME_CONVENTION = Sensor.SYSTEM_DEVICE_NAME_CONVENTION
 
     def __init__(self, address=None, name_pattern=SYSTEM_DEVICE_NAME_CONVENTION, name_exact=False, **kwargs):
         super(UltrasonicSensor, self).__init__(address, name_pattern, name_exact, driver_name=['lego-ev3-us', 'lego-nxt-us'], **kwargs)
-        self.auto_mode = True
-
 
     #: Continuous measurement in centimeters.
     MODE_US_DIST_CM = 'US-DIST-CM'
@@ -2568,10 +2539,7 @@ def distance_centimeters(self):
         Measurement of the distance detected by the sensor,
         in centimeters.
         """
-
-        if self.auto_mode:
-            self.mode = self.MODE_US_DIST_CM
-
+        self.mode = self.MODE_US_DIST_CM
         return self.value(0) * self._scale('US_DIST_CM')
 
     @property
@@ -2580,10 +2548,7 @@ def distance_inches(self):
         Measurement of the distance detected by the sensor,
         in inches.
         """
-
-        if self.auto_mode:
-            self.mode = self.MODE_US_DIST_IN
-
+        self.mode = self.MODE_US_DIST_IN
         return self.value(0) * self._scale('US_DIST_IN')
 
     @property
@@ -2592,27 +2557,21 @@ def other_sensor_present(self):
         Value indicating whether another ultrasonic sensor could
         be heard nearby.
         """
-
-        if self.auto_mode:
-            self.mode = self.MODE_US_LISTEN
-
+        self.mode = self.MODE_US_LISTEN
         return self.value(0)
 
+
 class GyroSensor(Sensor):
 
     """
     LEGO EV3 gyro sensor.
     """
 
-    __slots__ = ['auto_mode']
-
     SYSTEM_CLASS_NAME = Sensor.SYSTEM_CLASS_NAME
     SYSTEM_DEVICE_NAME_CONVENTION = Sensor.SYSTEM_DEVICE_NAME_CONVENTION
 
     def __init__(self, address=None, name_pattern=SYSTEM_DEVICE_NAME_CONVENTION, name_exact=False, **kwargs):
         super(GyroSensor, self).__init__(address, name_pattern, name_exact, driver_name=['lego-ev3-gyro'], **kwargs)
-        self.auto_mode = True
-
 
     #: Angle
     MODE_GYRO_ANG = 'GYRO-ANG'
@@ -2645,32 +2604,23 @@ def angle(self):
         The number of degrees that the sensor has been rotated
         since it was put into this mode.
         """
-
-        if self.auto_mode:
-            self.mode = self.MODE_GYRO_ANG
-
+        self.mode = self.MODE_GYRO_ANG
         return self.value(0)
 
     @property
     def rate(self):
         """
         The rate at which the sensor is rotating, in degrees/second.
         """
-
-        if self.auto_mode:
-            self.mode = self.MODE_GYRO_RATE
-
+        self.mode = self.MODE_GYRO_RATE
         return self.value(0)
 
     @property
     def rate_and_angle(self):
         """
         Angle (degrees) and Rotational Speed (degrees/second).
         """
-
-        if self.auto_mode:
-            self.mode = self.MODE_GYRO_G_A
-
+        self.mode = self.MODE_GYRO_G_A
         return self.value(0), self.value(1)
 
 
@@ -2733,8 +2683,6 @@ class InfraredSensor(Sensor, ButtonBase):
     LEGO EV3 infrared sensor.
     """
 
-    __slots__ = ['auto_mode']
-
     SYSTEM_CLASS_NAME = Sensor.SYSTEM_CLASS_NAME
     SYSTEM_DEVICE_NAME_CONVENTION = Sensor.SYSTEM_DEVICE_NAME_CONVENTION
 
@@ -2893,15 +2841,11 @@ class SoundSensor(Sensor):
     LEGO NXT Sound Sensor
     """
 
-    __slots__ = ['auto_mode']
-
     SYSTEM_CLASS_NAME = Sensor.SYSTEM_CLASS_NAME
     SYSTEM_DEVICE_NAME_CONVENTION = Sensor.SYSTEM_DEVICE_NAME_CONVENTION
 
     def __init__(self, address=None, name_pattern=SYSTEM_DEVICE_NAME_CONVENTION, name_exact=False, **kwargs):
         super(SoundSensor, self).__init__(address, name_pattern, name_exact, driver_name=['lego-nxt-sound'], **kwargs)
-        self.auto_mode = True
-
 
     #: Sound pressure level. Flat weighting
     MODE_DB = 'DB'
@@ -2922,10 +2866,7 @@ def sound_pressure(self):
         A measurement of the measured sound pressure level, as a
         percent. Uses a flat weighting.
         """
-
-        if self.auto_mode:
-            self.mode = self.MODE_DB
-
+        self.mode = self.MODE_DB
         return self.value(0) * self._scale('DB')
 
     @property
@@ -2934,27 +2875,21 @@ 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.
         """
-
-        if self.auto_mode:
-            self.mode = self.MODE_DBA
-
+        self.mode = self.MODE_DBA
         return self.value(0) * self._scale('DBA')
 
+
 class LightSensor(Sensor):
 
     """
     LEGO NXT Light Sensor
     """
 
-    __slots__ = ['auto_mode']
-
     SYSTEM_CLASS_NAME = Sensor.SYSTEM_CLASS_NAME
     SYSTEM_DEVICE_NAME_CONVENTION = Sensor.SYSTEM_DEVICE_NAME_CONVENTION
 
     def __init__(self, address=None, name_pattern=SYSTEM_DEVICE_NAME_CONVENTION, name_exact=False, **kwargs):
         super(LightSensor, self).__init__(address, name_pattern, name_exact, driver_name=['lego-nxt-light'], **kwargs)
-        self.auto_mode = True
-
 
     #: Reflected light. LED on
     MODE_REFLECT = 'REFLECT'
@@ -2974,21 +2909,15 @@ def reflected_light_intensity(self):
         """
         A measurement of the reflected light intensity, as a percentage.
         """
-
-        if self.auto_mode:
-            self.mode = self.MODE_REFLECT
-
+        self.mode = self.MODE_REFLECT
         return self.value(0) * self._scale('REFLECT')
 
     @property
     def ambient_light_intensity(self):
         """
         A measurement of the ambient light intensity, as a percentage.
         """
-
-        if self.auto_mode:
-            self.mode = self.MODE_AMBIENT
-
+        self.mode = self.MODE_AMBIENT
         return self.value(0) * self._scale('AMBIENT')