Digital actuators return int instead of bool to prevent invalid device command response messages.

Author: jburhenn

myDevices/devices/digital/helper.py

@@ -18,7 +18,6 @@
 from myDevices.devices.digital.gpio import NativeGPIO as GPIO
 
 
-
 class DigitalSensor():
 
     def __init__(self, gpio, channel, invert=False):
@@ -53,9 +52,8 @@ def read(self):
         self.setGPIOInstance()
         value = self.gpio.digitalRead(self.channel)
         if self.invert:
-            return not value
-        else:
-            return value
+            value = not value
+        return int(value)
 
 class MotionSensor(DigitalSensor):
     def __init__(self, gpio, channel, invert=False):
@@ -79,7 +77,7 @@ def __family__(self):
     @response("%d")
     def write(self, value):
         if self.invert:
-            value = not value
+            value = int(not value)
         self.gpio.digitalWrite(self.channel, value)
         return self.read()
 

myDevices/test/client_test.py

@@ -70,6 +70,7 @@ def testSensors(self):
 
     def testSensorInfo(self):
         sensors = {'actuator' : {'description': 'Digital Output', 'device': 'DigitalActuator', 'args': {'gpio': 'GPIO', 'invert': False, 'channel': 16}, 'name': 'test_actuator'},
+                   'light_switch' : {'description': 'Light Switch', 'device': 'LightSwitch', 'args': {'gpio': 'GPIO', 'invert': True, 'channel': 15}, 'name': 'test_light_switch'},
                    'MCP3004' : {'description': 'MCP3004', 'device': 'MCP3004', 'args': {'chip': '0'}, 'name': 'test_MCP3004'},
                    'distance' : {'description': 'Analog Distance Sensor', 'device': 'DistanceSensor', 'args': {'adc': 'test_MCP3004', 'channel': 0}, 'name': 'test_distance'}}
         for sensor in sensors.values():
@@ -78,6 +79,8 @@ def testSensorInfo(self):
         #Test setting sensor values
         self.setSensorValue(sensors['actuator'], 1)
         self.setSensorValue(sensors['actuator'], 0)
+        self.setSensorValue(sensors['light_switch'], 1)
+        self.setSensorValue(sensors['light_switch'], 0)
         #Test getting analog value
         retrievedSensorInfo = next(obj for obj in SensorsClientTest.client.SensorsInfo() if obj['name'] == sensors['distance']['name'])
         self.assertEqual(retrievedSensorInfo['float'], 0.0)