First stage of v5 support

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "python.pythonPath": "/usr/local/bin/python3"
+}

airtouch4pyapi/__init__.py

@@ -1 +1 @@
-from airtouch4pyapi.airtouch import AirTouch, AirTouchStatus
+from airtouch4pyapi.airtouch import AirTouch, AirTouchStatus, AirTouchVersion

airtouch4pyapi/airtouch.py

@@ -4,6 +4,7 @@
 from airtouch4pyapi import packetmap
 from airtouch4pyapi import communicate
 from enum import Enum
+
 #API
 
 # class Airtouch
@@ -34,6 +35,9 @@ class AirTouchStatus(Enum):
     CONNECTION_LOST = 3,
     ERROR = 4
 
+class AirTouchVersion(Enum):
+    AIRTOUCH4 = 4,
+    AIRTOUCH5 = 5
 
 class AirTouchGroup:
     def __init__(self):
@@ -59,32 +63,36 @@ def __init__(self):
 class AirTouch:
     IpAddress = "";
     SettingValueTranslator = packetmap.SettingValueTranslator();
-    def __init__(self, ipAddress):
+    def __init__(self, ipAddress, atVersion = AirTouchVersion.AIRTOUCH4):
         self.IpAddress = ipAddress;
         self.Status = AirTouchStatus.NOT_CONNECTED;
         self.Messages = dict();
-
+        self.atVersion = atVersion;
+
     async def UpdateInfo(self):
         self.acs = dict();
         self.groups = dict();
         self.Messages:List[AirTouchError] = [];
         #get the group infos
-        message = packetmap.MessageFactory.CreateEmptyMessageOfType("GroupStatus");
+        message = packetmap.MessageFactory.CreateEmptyMessageOfType("GroupStatus", self.atVersion);
         await self.SendMessageToAirtouch(message)
+### test
+        return
+
 
         #if the first call means we still have an error status, not worth doing the subsequent ones
         if(self.Status != AirTouchStatus.OK):
             return;
         #get the group nicknames
-        nameMessage = packetmap.MessageFactory.CreateEmptyMessageOfType("GroupName");
+        nameMessage = packetmap.MessageFactory.CreateEmptyMessageOfType("GroupName", self.atVersion);
         await self.SendMessageToAirtouch(nameMessage)
 
         #get ac infos
-        acsMessage = packetmap.MessageFactory.CreateEmptyMessageOfType("AcStatus");
+        acsMessage = packetmap.MessageFactory.CreateEmptyMessageOfType("AcStatus", self.atVersion);
         await self.SendMessageToAirtouch(acsMessage)
 
         #allocate acs to groups (ac ability?)
-        acAbilityMessage = packetmap.MessageFactory.CreateEmptyMessageOfType("AcAbility");
+        acAbilityMessage = packetmap.MessageFactory.CreateEmptyMessageOfType("AcAbility", self.atVersion);
         await self.SendMessageToAirtouch(acAbilityMessage)
 
         for group in self.groups.values():
@@ -234,21 +242,30 @@ def GetGroups(self):
     async def SendMessageToAirtouch(self, messageObject):
         if(messageObject.MessageType == "GroupStatus"):
             MESSAGE = "80b0012b0000"
+        if(messageObject.MessageType == "GroupStatus5"):
+            MESSAGE = "80b001c000082100000000000000"
 
         if(messageObject.MessageType == "GroupName"):
+
             MESSAGE = "90b0011f0002ff12"
+        if(messageObject.MessageType == "GroupName5"):
+            MESSAGE = ""
 
         if(messageObject.MessageType == "AcAbility"):
             MESSAGE = "90b0011f0002ff11"
+        if(messageObject.MessageType == "AcAbility5"):
+            MESSAGE = ""
 
-        if(messageObject.MessageType == "AcStatus"):
+        if(messageObject.MessageType == "AcStatus"): 
             MESSAGE = "80b0012d0000f4cf"
+        if(messageObject.MessageType == "AcStatus5"):
+            MESSAGE = ""
 
         if(messageObject.MessageType == "GroupControl" or messageObject.MessageType == "AcControl"):
             MESSAGE = communicate.MessageObjectToMessagePacket(messageObject, messageObject.MessageType);
 
         try: 
-            dataResult = await communicate.SendMessagePacketToAirtouch(MESSAGE, self.IpAddress)
+            dataResult = await communicate.SendMessagePacketToAirtouch(MESSAGE, self.IpAddress, self.atVersion)
             self.Status = AirTouchStatus.OK
         except Exception as e: 
             if(self.Status == AirTouchStatus.OK):
@@ -273,7 +290,7 @@ def TranslatePacketToMessage(self, dataResult):
         messageType = dataResult[5:6]
         dataLength = dataResult[6:8]
 
-        if(messageType == b'\x2b'):
+        if(messageType == b'\xc0'):
             self.DecodeAirtouchGroupStatusMessage(dataResult[8::]);
         if(messageType == b'\x1f'):
                 self.DecodeAirtouchExtendedMessage(dataResult[8::]);

airtouch4pyapi/communicate.py

@@ -2,6 +2,8 @@
 import asyncio
 import errno
 from socket import error as socket_error
+#### CEMIL TEST
+from hexdump import hexdump
 
 def MessageObjectToMessagePacket(messageObject, mapName):
     messageString = "80b001";
@@ -56,18 +58,19 @@ def TranslateMapValueToValue(groupChunk, map):
     return byteSegmentAsValue
 
 #might raise a socket or os error if connection fails
-async def SendMessagePacketToAirtouch(messageString, ipAddress):
+async def SendMessagePacketToAirtouch(messageString, ipAddress, atVersion):
     #add header, add crc
-    messageString = "5555" + messageString + format(crc16(bytes.fromhex(messageString)), '08x')[4:]
-
-    TCP_PORT = 9004
+    messageString = "555555aa" + messageString + format(crc16(bytes.fromhex(messageString)), '08x')[4:]
+    if(atVersion.value == 5):
+        TCP_PORT = 9005
+    else:
+        TCP_PORT = 9004
     BUFFER_SIZE = 4096
     reader, writer = await asyncio.open_connection(ipAddress, TCP_PORT)
-
     writer.write(bytearray.fromhex(messageString))
     response = await asyncio.wait_for(reader.read(BUFFER_SIZE), timeout=2.0)
-
     writer.close()
+    print(hexdump(response))
     await writer.wait_closed()
 
     return response;

airtouch4pyapi/packetmap.py

@@ -78,6 +78,17 @@ class DataLocationTranslator:
             "Temperature" : "5:6-16",
             "Spill": "6:5-5"
         },
+        "GroupStatus5" : {
+            "PowerState" : "1:7-8",
+            "GroupNumber" : "1:1-6",
+            "ControlMethod" : "2:8-8",
+            "OpenPercentage" : "2:1-7",
+            "BatteryLow" : "7:1-1",
+            "TargetSetpoint" : "3:1-8",
+            "Sensor" : "4:8-8",
+            "Temperature" : "5:1-16",
+            "Spill": "7:2-2"
+        },
         "AcStatus" : {
             "PowerState" : "1:7-8",
             "AcNumber" : "1:1-6",
@@ -141,7 +152,9 @@ def SetMessageValue(self, propertyName, newValue):
 
 class MessageFactory:
     @staticmethod
-    def CreateEmptyMessageOfType(messageType):
+    def CreateEmptyMessageOfType(messageType, atVersion):
+        if(atVersion.value == 5):
+            messageType = messageType + "5"
         message = Message(messageType);
         for attr in DataLocationTranslator.map[messageType]:
             message.MessageValues[attr] = 0;