Made UltrasonicSensor default to MAX_VALUE, not zero.

Charles Weir · Charles Weir · commit 582190612c0a · 2014-03-28T20:21:29.000Z
diff --git a/BrickPython/Sensor.py b/BrickPython/Sensor.py
@@ -109,10 +109,11 @@ class UltrasonicSensor(Sensor):
     SMOOTHING_RANGE=10
 
     def __init__(self, port):
-        self.recentRawValues = [0]
+        self.recentRawValues = [255]
         Sensor.__init__(self, port, Sensor.ULTRASONIC_CONT)
 
     def cookValue(self, rawValue):
+        rawValue = 255 if rawValue == 0 else rawValue
         self.recentRawValues.append( rawValue )
         if len(self.recentRawValues) > UltrasonicSensor.SMOOTHING_RANGE:
             del self.recentRawValues[0]
diff --git a/test/TestSensor.py b/test/TestSensor.py
@@ -65,12 +65,12 @@ def testUltrasonicSensor(self):
         sensor = UltrasonicSensor( '1' )
         self.assertEquals(sensor.port, 0)
         self.assertEquals( sensor.idChar, '1' )
-        for input, output in {0:0, 2:0, 3:5, 4:5, 9:10, 11:10, 14:15, 16:15, 22:20, 23:25, 26:25,
+        for input, output in {0:UltrasonicSensor.MAX_VALUE, 2:0, 3:5, 4:5, 9:10, 11:10, 14:15, 16:15, 22:20, 23:25, 26:25,
                               255: UltrasonicSensor.MAX_VALUE
                               }.items():
-            for i in xrange(0,100):
+            for i in xrange(0,UltrasonicSensor.SMOOTHING_RANGE+1):
                 sensor.updateValue( input )  # Remove effects of smoothing.
-            self.assertEquals( sensor.value(), output )
+            self.assertEquals( sensor.value(), output, "Failed with input %d: got %d" %(input,sensor.value()) )
 
     def testUltrasonicSensorSmoothing(self):
         sensor = UltrasonicSensor( '1' )
