From: Cefn Hoile Date: Mon, 19 Feb 2018 23:15:42 +0000 (+0000) Subject: Use boolean as canonical value attribute X-Git-Tag: 0.1.0~4^2~63 X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/619db47268be6dfad209f7cce7349778adcffd1e?ds=inline Use boolean as canonical value attribute --- diff --git a/python/digitalio/__init__.py b/python/digitalio/__init__.py index 3905e02..e90513d 100644 --- a/python/digitalio/__init__.py +++ b/python/digitalio/__init__.py @@ -70,12 +70,12 @@ class DigitalInOut(object): @property def value(self): - return self._pin.value() + return self._pin.value() is 1 @value.setter def value(self, val): if self.direction is Direction.OUTPUT: - self._pin.value(val) + self._pin.value(1 if val else 0) else: raise AttributeError("Not an output") diff --git a/python/testing/implementation/all/digitalio.py b/python/testing/implementation/all/digitalio.py index 6b81397..4f5ab2e 100644 --- a/python/testing/implementation/all/digitalio.py +++ b/python/testing/implementation/all/digitalio.py @@ -18,7 +18,7 @@ class TestDigitalInOut(unittest.TestCase): with digitalio.DigitalInOut(default_pin) as dio: dio.switch_to_output() self.assertEqual(dio.direction, digitalio.Direction.OUTPUT) - self.assertEqual(dio.value, 0) + self.assertEqual(dio.value, False) self.assertEqual(dio.drive_mode, digitalio.DriveMode.PUSH_PULL) def test_switch_to_input(self): @@ -41,7 +41,7 @@ class TestDigitalInOutInteractive(unittest.TestCase): with digitalio.DigitalInOut(led_pin) as led: led.direction = digitalio.Direction.OUTPUT # should now be OUT, PUSH_PULL, value=0, and LED should light - led.value = 0 if led_inverted else 1 + led.value = False if led_inverted else True self.assertTrue(yes_no("Is LED lit")) print("Winking LED...") for count in range(2): @@ -63,8 +63,8 @@ class TestDigitalInOutInteractive(unittest.TestCase): print(e) return # test trivially passed if yes_no("Is Button wired from {} to GND".format(default_pin)): - self.assertTrue(button.value == 1) - self.assertTrue(await_true("button pressed", lambda: button.value == 0)) + self.assertTrue(button.value == True) + self.assertTrue(await_true("button pressed", lambda: button.value == False)) def test_button_pull_down(self): print() @@ -77,6 +77,6 @@ class TestDigitalInOutInteractive(unittest.TestCase): print(e) return # test trivially passed if (yes_no("Is Button wired from {} to VCC".format(default_pin))): - self.assertTrue(button.value == 0) - self.assertTrue(await_true("button pressed", lambda: button.value == 1)) + self.assertTrue(button.value == False) + self.assertTrue(await_true("button pressed", lambda: button.value == True))