https://github.com/fairecasoimeme/ZiGate/issues/161

Alx2000y · Nov 1, 2022 · 66a5a44 · 66a5a44
1 parent 4038d1c
commit 66a5a44
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 36 deletions.
diff --git a/Source/ZigbeeNodeControlBridge/app_general_events_handler.c b/Source/ZigbeeNodeControlBridge/app_general_events_handler.c
@@ -852,42 +852,38 @@ PUBLIC void APP_vHandleStackEvents ( ZPS_tsAfEvent*    psStackEvent )
                     }
                     break;
 
+                    case ZPS_ZDP_BIND_RSP_CLUSTER_ID:
+                        ZNC_BUF_U8_UPD   ( &au8LinkTxBuffer [u16Length], sApsZdpEvent.uZdpData.sUnbindRsp.u8Status,    u16Length );
+                        ZNC_BUF_U8_UPD   ( &au8LinkTxBuffer [u16Length], psStackEvent->uEvent.sApsDataIndEvent.u8SrcEndpoint, u16Length );
+                        ZNC_BUF_U8_UPD   ( &au8LinkTxBuffer [u16Length], psStackEvent->uEvent.sApsDataIndEvent.u8SrcAddrMode, u16Length );
+                        ZNC_BUF_U16_UPD  ( &au8LinkTxBuffer [u16Length],  psStackEvent->uEvent.sApsDataIndEvent.uSrcAddress.u16Addr,    u16Length );
+                        vSL_WriteMessage ( E_SL_MSG_BIND_RESPONSE,
+                                            u16Length,
+                                            au8LinkTxBuffer,
+                                            u8LinkQuality );
+                    break;
+
+                    case ZPS_ZDP_UNBIND_RSP_CLUSTER_ID:
+                        ZNC_BUF_U8_UPD   ( &au8LinkTxBuffer [u16Length], sApsZdpEvent.uZdpData.sUnbindRsp.u8Status,    u16Length );
+                        ZNC_BUF_U8_UPD   ( &au8LinkTxBuffer [u16Length], psStackEvent->uEvent.sApsDataIndEvent.u8SrcEndpoint, u16Length );
+                        ZNC_BUF_U8_UPD   ( &au8LinkTxBuffer [u16Length], psStackEvent->uEvent.sApsDataIndEvent.u8SrcAddrMode, u16Length );
+                        ZNC_BUF_U16_UPD  ( &au8LinkTxBuffer [u16Length],  psStackEvent->uEvent.sApsDataIndEvent.uSrcAddress.u16Addr,    u16Length );
+                        vSL_WriteMessage ( E_SL_MSG_UNBIND_RESPONSE,
+                                           u16Length,
+                                           au8LinkTxBuffer,
+                                           u8LinkQuality );
+                    break;
+
+                    case ZPS_ZDP_MGMT_PERMIT_JOINING_RSP_CLUSTER_ID:
+                        ZNC_BUF_U8_UPD ( &au8LinkTxBuffer [u16Length], sApsZdpEvent.uZdpData.sPermitJoiningRsp.u8Status,    u16Length );
+                        vSL_WriteMessage ( E_SL_MSG_PERMIT_JOINING_RESPONSE,
+                                           u16Length,
+                                           au8LinkTxBuffer,
+                                           u8LinkQuality );
+                    break;
+
                     default:
-                    {
-                        ZNC_BUF_U8_UPD   ( &au8LinkTxBuffer [u16Length] , sApsZdpEvent.uZdpData.sUnbindRsp.u8Status,    u16Length );
-                        switch ( sApsZdpEvent.u16ClusterId )
-                        {
-                             case ZPS_ZDP_BIND_RSP_CLUSTER_ID:
-                                 vSL_WriteMessage ( E_SL_MSG_BIND_RESPONSE,
-                                                    u16Length,
-                                                    au8LinkTxBuffer,
-                                                    u8LinkQuality );
-                             break;
-
-                             case ZPS_ZDP_UNBIND_RSP_CLUSTER_ID:
-                                 vSL_WriteMessage ( E_SL_MSG_UNBIND_RESPONSE,
-                                                    u16Length,
-                                                    au8LinkTxBuffer,
-                                                    u8LinkQuality );
-                             break;
-                             case ZPS_ZDP_MGMT_LEAVE_RSP_CLUSTER_ID:
-                                 vSL_WriteMessage ( E_SL_MSG_MANAGEMENT_LEAVE_RESPONSE,
-                                                    u16Length,
-                                                    au8LinkTxBuffer,
-                                                    u8LinkQuality );
-                             break;
-
-                             case ZPS_ZDP_MGMT_PERMIT_JOINING_RSP_CLUSTER_ID:
-                                 vSL_WriteMessage ( E_SL_MSG_PERMIT_JOINING_RESPONSE,
-                                                    u16Length,
-                                                    au8LinkTxBuffer,
-                                                    u8LinkQuality );
-                             break;
-                             default:
-                             break;
-                        }
-                    }
-                        break;
+                    break;
                     }
                 }
             }

diff --git a/Source/ZigbeeNodeControlBridge/app_zcl_event_handler.c b/Source/ZigbeeNodeControlBridge/app_zcl_event_handler.c
@@ -259,7 +259,13 @@ void APP_vHandleZclEvents ( ZPS_tsAfEvent*    psStackEvent )
                 ZNC_BUF_U8_UPD  ( &au8LinkTxBuffer [u16Length], psStackEvent->uEvent.sApsDataConfirmEvent.u8SrcEndpoint,       u16Length );
                 ZNC_BUF_U8_UPD  ( &au8LinkTxBuffer [u16Length], psStackEvent->uEvent.sApsDataConfirmEvent.u8DstEndpoint,       u16Length );
                 ZNC_BUF_U8_UPD  ( &au8LinkTxBuffer [u16Length], psStackEvent->uEvent.sApsDataConfirmEvent.u8DstAddrMode,       u16Length );
-                ZNC_BUF_U64_UPD ( &au8LinkTxBuffer [u16Length], psStackEvent->uEvent.sApsDataConfirmEvent.uDstAddr.u64Addr,    u16Length );
+                if (psStackEvent->uEvent.sApsDataConfirmEvent.u8DstAddrMode == 0x03)
+                {
+                    ZNC_BUF_U64_UPD ( &au8LinkTxBuffer [u16Length], psStackEvent->uEvent.sApsDataConfirmEvent.uDstAddr.u64Addr, u16Length );
+                }else
+                {
+                    ZNC_BUF_U16_UPD ( &au8LinkTxBuffer [u16Length], psStackEvent->uEvent.sApsDataConfirmEvent.uDstAddr.u16Addr, u16Length );
+                }
                 ZNC_BUF_U8_UPD  ( &au8LinkTxBuffer [u16Length], psStackEvent->uEvent.sApsDataConfirmEvent.u8SequenceNum,       u16Length );
                 vSL_WriteMessage ( E_SL_MSG_APS_DATA_CONFIRM_FAILED,
                                    u16Length,