commit 8be08749cb5e43f86426559f0f7c5378e8b0d41a
Author: Grant
Date:   Sat Jan 5 14:28:33 2013 -0500

    Added beep command. LightStatus works no matter what CMD1 is, even if it happens to coincide with different valid command.

diff --git a/pytomation/interfaces/insteon.py b/pytomation/interfaces/insteon.py
index 986c6de..c30c1ce 100644
--- a/pytomation/interfaces/insteon.py
+++ b/pytomation/interfaces/insteon.py
@@ -83,7 +83,10 @@ def simpleMap(value, in_min, in_max, out_min, out_max):

 class InsteonPLM(HAInterface):
     VERSION = '1.6'
-    
+    LIGHTLEVEL = 1
+    SENSOR = 2
+    statusRequest = 0
+
     #(address:engineVersion) engineVersion 0x00=i1, 0x01=i2, 0x02=i2cs
     deviceList = {};
     currentCommand = ""
@@ -160,6 +163,10 @@ class InsteonPLM(HAInterface):
                                     'SD03': {        #Product Data Request (generally an Ack)
                                         'callBack' : self._handle_StandardDirect_IgnoreAck
                                     },
+                                    'SDXX': {        #Get Light Level
+                                        'callBack' : self._handle_StandardDirect_LightStatusResponse,
+                                        'validResponseCommands' : ['SDXX']
+                                    },
                                     'SD0D': {        #Get InsteonPLM Engine
                                         'callBack' : self._handle_StandardDirect_EngineResponse,
                                         'validResponseCommands' : ['SD0D']
@@ -198,7 +205,11 @@ class InsteonPLM(HAInterface):
                                     },
                                     'SD19': {        #Light Status Response
                                         'callBack' : self._handle_StandardDirect_LightStatusResponse,
-                                        'validResponseCommands' : ['SD19']
+                                        'validResponseCommands' : ['SDXX']
+                                    },
+                                    'SD30': {        #Beep Response
+                                        'callBack' : self._handle_StandardDirect_AckCompletesCommand,
+                                        'validResponseCommands' : ['SD30']
                                     },
                                     #Broadcast Messages/Responses
                                     'SB01': {
@@ -326,6 +337,11 @@ class InsteonPLM(HAInterface):
             time.sleep(self.spinTime)

     def _sendStandardP2PInsteonCommand(self, destinationDevice, commandId1, commandId2):
+        if commandId1 == '19': #Light level request. Next inbound will be the response.
+            if commandId2 == '01' : 
+                self.statusRequest = self.SENSOR
+            else:
+                self.statusRequest = self.LIGHTLEVEL
         self._logger.debug("Command: %s %s %s" % (destinationDevice, commandId1, commandId2))
         return self._sendInterfaceCommand('62', _stringIdToByteIds(destinationDevice) + _buildFlags() + binascii.unhexlify(commandId1) + binascii.unhexlify(commandId2), extraCommandDetails = { 'destinationDevice': destinationDevice, 'commandId1': 'SD' + commandId1, 'commandId2': commandId2})

@@ -422,8 +438,9 @@ class InsteonPLM(HAInterface):
         else:
             #standard direct
             insteonCommandCode = 'SD' + insteonCommandCode
-
-        if insteonCommandCode == 'SD00':
+        if self.statusRequest > 0:
+            insteonCommandCode = 'SDXX'
+        #if insteonCommandCode == 'SD00':
             #this is a strange special case...
             #lightStatusRequest returns a standard message and overwrites the cmd1 and cmd2 bytes with "data"
             #cmd1 (that we use here to sort out what kind of incoming message we got) contains an 
@@ -432,7 +449,7 @@ class InsteonPLM(HAInterface):
             #for now my testing has show that its 0 (at least with my dimmer switch - my guess is cause I haven't linked it with anything)
             #so we treat the SD00 message special and pretend its really a SD19 message (and that works fine for now cause we only really
             #care about cmd2 - as it has our light status in it)
-            insteonCommandCode = 'SD19'
+        #    insteonCommandCode = 'SD19'

         #print insteonCommandCode

@@ -560,19 +577,22 @@ class InsteonPLM(HAInterface):
         # find the device and light level
         destDeviceId = _byteIdToStringId(fromIdHigh, fromIdMid, fromIdLow).upper()
         # For now lets just handle on and off until the new state code is ready.
-        for d in self._devices:
-            if d.address == destDeviceId:
-                if command1 == 0x12:
-                    d.state = State.ON
-                elif command1 == 0x14:
-                    d.state = State.OFF
-                
-        # Old stuff, don't use this at the moment
-        #lightLevelRaw = messageBytes[10]
-        #map the lightLevelRaw value to a sane value between 0 and 1
-        #normalizedLightLevel = simpleMap(ord(lightLevelRaw), 0, 255, 0, 1)
-
-        #return (True, {'lightStatus': round(normalizedLightLevel, 2) })
+        #for d in self._devices:
+        #    if d.address == destDeviceId:
+        #        if command1 == 0x12:
+        #            d.state = State.ON
+        #        elif command1 == 0x14:
+        #            d.state = State.OFF
+        lightLevelRaw = messageBytes[10] #sorry
+        normalizedLightLevel = simpleMap(ord(lightLevelRaw), 0, 255, 0, 1)
+        if self.statusRequest == self.SENSOR:
+            self.statusRequest = 0
+            return (True, {'sensorStatus': ord(lightLevelRaw) })
+        elif self.statusRequest == self.LIGHTLEVEL:
+            self.statusRequest = 0
+            return (True, {'lightStatus': round(normalizedLightLevel, 2) })
+        else:
+            return False

     #public methods
     def getPLMInfo(self, timeout = None):
@@ -609,6 +629,14 @@ class InsteonPLM(HAInterface):
         commandExecutionDetails = self._sendStandardP2PInsteonCommand(deviceId, '19', '00')
         return self._waitForCommandToFinish(commandExecutionDetails, timeout = timeout)

+    def sensorStatusRequest(self, deviceId, timeout = None): #I/O Linc Sensor.
+        commandExecutionDetails = self._sendStandardP2PInsteonCommand(deviceId, '19', '01')
+        return self._waitForCommandToFinish(commandExecutionDetails, timeout = timeout)
+
+    def beep(self, deviceId, timeout = None):
+        commandExecutionDetails = self._sendStandardP2PInsteonCommand(deviceId, '30', '00')
+        return self._waitForCommandToFinish(commandExecutionDetails, timeout = timeout)
+
     def command(self, device, command, timeout=None):
         command = command.lower()
         if isinstance(device, InsteonDevice):

[2014/01/22 22:23:50] [ERROR] [Mochad] Problem with interface: read() takes exactly 2 arguments (1 given)

--- a/pytomation/devices/light.py
+++ b/pytomation/devices/light.py
@@ -48,7 +48,7 @@ class Light(InterfaceDevice):
             primary_command = m_command[0]
         try:
             if source and (primary_command in [Command.ON, Command.LEVEL]):
-                if self.restricted and source not in self._interfaces:
+                if self.restricted and source not in self._interfaces and source.name != "HTTPServer2":
                     m_command = None
                     m_state = None