Merge pull request #6 from myDevicesIoT/fix/piface-support

Fix PiFace device to allow adding sensors.

Author: jburhenn

myDevices/devices/manager.py

@@ -161,7 +161,7 @@ def addDevice(name, device, description, args, origin):
 def addDeviceConf(devices, origin):
     for (name, params) in devices:
         values = params.split(" ")
-        driver = values[0];
+        driver = values[0]
         description = name
         args = {}
         i = 1

myDevices/devices/shield/piface.py

@@ -17,72 +17,15 @@
 from myDevices.decorators.rest import request, response
 
 
-class PiFaceDigital():
+class PiFaceDigital(MCP23S17):
     def __init__(self, board=0):
-        mcp = MCP23S17(0, 0x20+toint(board))
-        mcp.writeRegister(mcp.getAddress(mcp.IODIR, 0), 0x00) # Port A as output
-        mcp.writeRegister(mcp.getAddress(mcp.IODIR, 8), 0xFF) # Port B as input
-        mcp.writeRegister(mcp.getAddress(mcp.GPPU,  0), 0x00) # Port A PU OFF
-        mcp.writeRegister(mcp.getAddress(mcp.GPPU,  8), 0xFF) # Port B PU ON
-        self.mcp = mcp
         self.board = toint(board)
+        MCP23S17.__init__(self, 0, 0x20 + self.board)
+        self.writeRegister(self.getAddress(self.IODIR, 0), 0x00) # Port A as output
+        self.writeRegister(self.getAddress(self.IODIR, 8), 0xFF) # Port B as input
+        self.writeRegister(self.getAddress(self.GPPU,  0), 0x00) # Port A PU OFF
+        self.writeRegister(self.getAddress(self.GPPU,  8), 0xFF) # Port B PU ON
 
     def __str__(self):
         return "PiFaceDigital(%d)" % self.board 
 
-    def __family__(self):
-        return "GPIOPort"
-    
-    def checkChannel(self, channel):
-#        if not channel in range(8):
-        if not channel in range(16):
-            raise ValueError("Channel %d invalid" % channel)
-    
-    #@request("GET", "%(channel)d/value")
-    @response("%d")
-    def digitalRead(self, channel):
-        self.checkChannel(channel)
-#        return not self.mcp.digitalRead(channel+8)
-        return self.mcp.digitalRead(channel)
-    
-    #@request("POST", "%(channel)d/value/%(value)d")
-    @response("%d")
-    def digitalWrite(self, channel, value):
-        self.checkChannel(channel)
-        return self.mcp.digitalWrite(channel, value)
-    
-#    #@request("GET", "digital/output/%(channel)d")
-#    @response("%d")
-#    def digitalReadOutput(self, channel):
-#        self.checkChannel(channel)
-#        return self.mcp.digitalRead(channel)
-    
-#    #@request("GET", "digital/*")
-#    @response(contentType=M_JSON)
-#    def readAll(self):
-#        inputs = {}
-#        outputs = {}
-#        for i in range(8):
-#            inputs[i] = self.digitalRead(i)
-#            outputs[i] = self.digitalReadOutput(i)
-#        return {"input": inputs, "output": outputs}
-
-    #@request("GET", "*")
-    @response(contentType=M_JSON)
-    def readAll(self):
-#        inputs = {}
-#        outputs = {}
-#        for i in range(8):
-#            inputs[i] = self.digitalRead(i)
-#            outputs[i] = self.digitalReadOutput(i)
-#        return {"input": inputs, "output": outputs}
-
-        values = {}
-        for i in range(16):
-            values[i] = {"function": self.mcp.getFunctionString(i), "value": int(self.mcp.digitalRead(i))}
-        return values
-
-    #@request("GET", "count")
-    @response("%d")
-    def digitalCount(self):
-        return 16

myDevices/sensors/sensors.py

@@ -269,8 +269,6 @@ def SensorsInfo(self):
                     if value['type'] == 'Humidity':
                         value['float']=self.CallDeviceFunction(sensor.getHumidity)
                         value['percent']=self.CallDeviceFunction(sensor.getHumidityPercent)
-                    if value['type'] == 'PiFaceDigital':
-                        value['all'] = self.CallDeviceFunction(sensor.readAll)
                     if value['type'] in ('DigitalSensor', 'DigitalActuator'):
                         value['value'] = self.CallDeviceFunction(sensor.read)
                     if value['type'] == 'GPIOPort':