Change group deduction for scene bindings

Author: ThatMishakov

Makefile

@@ -116,7 +116,8 @@ INCLUDE_PATHS := -I$(SRC_PATH) -I$(SRC_PATH)/includes -I$(SRC_PATH)/common  -I$(
 -I$(SDK_PATH)/zigbee/zbapi \
 -I$(SDK_PATH)/zigbee/zbhci \
 -I$(SDK_PATH)/zigbee/zcl \
--I$(SDK_PATH)/zigbee/zdo
+-I$(SDK_PATH)/zigbee/zdo \
+-I$(SDK_PATH)/zigbee/aps
 
 GCC_FLAGS += $(TEL_CHIP) $(DEVICE_DEFS)
 

src/zigbee/binding_table.h

@@ -0,0 +1,10 @@
+#ifndef _BINDING_TABLE_H_
+#define _BINDING_TABLE_H_
+
+#include "aps_api.h"
+
+#define BINDING_TABLE_FOR_EACH(cluster, endpoint, out_ptr) \
+    for (int i__ = 0; i__ < APS_BINDING_TABLE_NUM; ++i__) \
+        if (g_apsBindingTbl[i__].used && g_apsBindingTbl[i__].clusterId == (cluster) && g_apsBindingTbl[i__].srcEp == (endpoint) && ((out_ptr) = (&g_apsBindingTbl[i__])))
+
+#endif

src/zigbee/switch_cluster.c

@@ -10,6 +10,7 @@
 #include "zcl_include.h"
 #include "base_components/relay.h"
 #include "configs/nv_slots_cfg.h"
+#include "binding_table.h"
 
 #define MULTI_PRESS_CNT_TO_RESET    10
 
@@ -753,39 +754,32 @@ static void switch_cluster_binding_recall_scene(zigbee_switch_cluster *cluster)
     scenesInfo.src_endpoint = cluster->endpoint;
     scenesInfo.dst_addr_mode = 0x00;
 
-    bind_dst_list_tbl bindTbl;
+    aps_binding_entry_t *e;
 
-    if (aps_search_dst_from_bind_tbl(&scenesInfo, &bindTbl) != APS_STATUS_SUCCESS)
+    BINDING_TABLE_FOR_EACH(ZCL_CLUSTER_GEN_SCENES, cluster->endpoint, e)
     {
-      goto out;
-    }
-
-    for (u8 i = 0; i < bindTbl.txCnt; ++i)
-    {
-      bind_dst_list *l = bindTbl.list + i;
-
       u16 group_id = 0xffff;
 
       epInfo_t dstEpInfo;
       TL_SETSTRUCTCONTENT(dstEpInfo, 0);
 
-      if (l->dst_addr_mode == APS_BIND_DST_ADDR_GROUP)
+      if (e->dstAddrMode == APS_BIND_DST_ADDR_GROUP)
       {
-        group_id = l->aps_addr.dst_group_addr;
+        group_id = e->groupAddr;
 
         dstEpInfo.profileId   = HA_PROFILE_ID;
         dstEpInfo.dstAddrMode = APS_SHORT_GROUPADDR_NOEP;
-        dstEpInfo.dstAddr.shortAddr = l->aps_addr.dst_group_addr;
+        dstEpInfo.dstAddr.shortAddr = group_id;
       }
       else
       {
         group_id = 0;
 
         dstEpInfo.profileId = HA_PROFILE_ID;
         dstEpInfo.dstAddrMode = APS_LONG_DSTADDR_WITHEP;
-        dstEpInfo.dstEp = l->aps_addr.dst_endpoint;
+        dstEpInfo.dstEp = e->dstExtAddrInfo.dstEp;
 
-        ZB_IEEE_ADDR_COPY(dstEpInfo.dstAddr.extAddr, l->aps_addr.dst_ext_addr);
+        ZB_IEEE_ADDR_COPY(dstEpInfo.dstAddr.extAddr, e->dstExtAddrInfo.extAddr);
       }
 
       recallScene_t recallScene = {
@@ -798,7 +792,6 @@ static void switch_cluster_binding_recall_scene(zigbee_switch_cluster *cluster)
     }
   }
 
-out:
   switch_cluster_report_next_scene(cluster);
 }