Merge pull request #1931 from majuss/BACnet-schedular-support

BACnet schedular support

Author: samson0v

thingsboard_gateway/connectors/bacnet/bacnet_connector.py

@@ -15,11 +15,13 @@
 import asyncio
 from asyncio import Queue, CancelledError, QueueEmpty
 from copy import deepcopy
+from datetime import time
 from threading import Thread
 from string import ascii_lowercase
 from random import choice
 from time import monotonic, sleep
 from typing import TYPE_CHECKING
+from ast import literal_eval
 
 from thingsboard_gateway.connectors.bacnet.ede_parser import EDEParser
 from thingsboard_gateway.connectors.bacnet.entities.routers import Routers
@@ -37,12 +39,13 @@
     from bacpypes3.apdu import ErrorRejectAbortNack
 
 from bacpypes3.pdu import Address, IPv4Address
+from bacpypes3.primitivedata import Null, Real
+from bacpypes3.basetypes import DailySchedule, TimeValue, DeviceObjectPropertyReference
 
 from thingsboard_gateway.connectors.bacnet.device import Device, Devices
 from thingsboard_gateway.connectors.bacnet.entities.device_object_config import DeviceObjectConfig
 from thingsboard_gateway.connectors.bacnet.application import Application
 from thingsboard_gateway.connectors.bacnet.backward_compatibility_adapter import BackwardCompatibilityAdapter
-from bacpypes3.primitivedata import Null
 
 if TYPE_CHECKING:
     from thingsboard_gateway.gateway.tb_gateway_service import TBGatewayService
@@ -540,6 +543,12 @@ async def __write_property(self, address, object_id, property_id, value, priorit
             if value is None:
                 value = Null(())
 
+            if property_id == "weeklySchedule":
+                value = self.__prepare_weekly_schedule_value(value)
+
+            if property_id == "listOfObjectPropertyReferences":
+               value = self.__prepare_list_of_object_property_references_value(value, property_id)
+
             await self.__application.write_property(address, object_id, property_id, value, priority=priority)
             return "ok"
         except ErrorRejectAbortNack as err:
@@ -548,6 +557,32 @@ async def __write_property(self, address, object_id, property_id, value, priorit
             self.__log.error('Error writing property %s:%s to device %s: %s', object_id, property_id, address, err)
             return err.__str__()
 
+    async def __prepare_weekly_schedule_value(self, value):
+        schedule = []
+        raw_schedule = literal_eval(value)
+        for idx, day in enumerate(raw_schedule):
+            schedule.append(DailySchedule(daySchedule=[]))
+            for sched in day:
+                schedule[idx].daySchedule.append(
+                    TimeValue(
+                        time=time(int(sched[0].split(":")[0]), int(sched[0].split(":")[1])),
+                        value=Real(sched[1])
+                    )
+                )
+        return schedule
+
+    async def __prepare_list_of_object_property_references_value(self, value, property_id):
+        props = []
+        raw_props = literal_eval(value)
+        for prop in raw_props:
+            props.append(
+                DeviceObjectPropertyReference(
+                    objectIdentifier = prop,
+                    propertyIdentifier = property_id
+                )
+            )
+        return props
+
     async def __convert_data(self):
         while not self.__stopped:
             try:

thingsboard_gateway/connectors/bacnet/bacnet_uplink_converter.py

@@ -15,7 +15,7 @@
 
 from bacpypes3.basetypes import DateTime
 from bacpypes3.constructeddata import AnyAtomic, Array
-from bacpypes3.basetypes import ErrorType, PriorityValue, ObjectPropertyReference
+from bacpypes3.basetypes import ErrorType, PriorityValue, ObjectPropertyReference, DailySchedule, DeviceObjectPropertyReference
 
 from thingsboard_gateway.connectors.bacnet.bacnet_converter import AsyncBACnetConverter
 from thingsboard_gateway.connectors.bacnet.entities.uplink_converter_config import UplinkConverterConfig
@@ -109,9 +109,19 @@ def __convert_data(self, data):
                     for item in value:
                         if isinstance(item, PriorityValue):
                             result.append(str(getattr(item, item._choice)))
+                        if isinstance(item, DailySchedule):
+                            schedular_array = []
+                            for sched in item.daySchedule:
+                                schedular_array.append((str(sched.time), str(sched.value.get_value())))
+                            result.append(schedular_array)
                         else:
                             result.append(item)
-
+                    value = result
+                elif isinstance(value, list):
+                    result = []
+                    for item in value:
+                        if isinstance(item, DeviceObjectPropertyReference):
+                            result.append(str(item.objectIdentifier))
                     value = result
 
                 converted_data.append({'propName': str(value_prop_id), 'value': value})