From bc49871b9f7ccf537d2a3f8cd8f22bd1a1a86f1c Mon Sep 17 00:00:00 2001 From: mrG1K Date: Thu, 8 Oct 2020 14:37:00 +0300 Subject: [PATCH] hard fix --- .../ZigbeeNodeControlBridge/SerialLink.h | 1 + .../app_zcl_event_handler.c | 19 +++++-------------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/Module Radio/Firmware/src/ZiGate/Source/ZigbeeNodeControlBridge/SerialLink.h b/Module Radio/Firmware/src/ZiGate/Source/ZigbeeNodeControlBridge/SerialLink.h index 32b5c78e..ec2467fa 100644 --- a/Module Radio/Firmware/src/ZiGate/Source/ZigbeeNodeControlBridge/SerialLink.h +++ b/Module Radio/Firmware/src/ZiGate/Source/ZigbeeNodeControlBridge/SerialLink.h @@ -286,6 +286,7 @@ typedef enum E_SL_MSG_WRITE_ATTRIBUTE_RESPONSE = 0x8110, E_SL_MSG_WRITE_ATTRIBUTE_REQUEST_IAS_WD = 0x0111, E_SL_MSG_WRITE_ATTRIBUTE_REQUEST_IAS_WD_SQUAWK = 0x0112, + E_SL_MSG_WRITE_ATTRIBUTE_REQUEST_NO_RESPONSE = 0x0113, E_SL_MSG_CONFIG_REPORTING_REQUEST = 0x0120, E_SL_MSG_CONFIG_REPORTING_RESPONSE = 0x8120, E_SL_MSG_REPORT_ATTRIBUTES = 0x8121, diff --git a/Module Radio/Firmware/src/ZiGate/Source/ZigbeeNodeControlBridge/app_zcl_event_handler.c b/Module Radio/Firmware/src/ZiGate/Source/ZigbeeNodeControlBridge/app_zcl_event_handler.c index f0ae2c19..61e1cb7e 100644 --- a/Module Radio/Firmware/src/ZiGate/Source/ZigbeeNodeControlBridge/app_zcl_event_handler.c +++ b/Module Radio/Firmware/src/ZiGate/Source/ZigbeeNodeControlBridge/app_zcl_event_handler.c @@ -385,7 +385,7 @@ PRIVATE void APP_ZCL_cbEndpointCallback ( tsZCL_CallBackEvent* psEvent ) uint8 u8LinkQuality; u8LinkQuality=psEvent->pZPSevent->uEvent.sApsDataIndEvent.u8LinkQuality; - + //ZNC_BUF_U8_UPD ( &au8LinkTxBuffer [0], psEvent->pZPSevent->uEvent.sApsZgpDataIndEvent.u8Rssi, u16Length ); // ZNC_BUF_U8_UPD ( &au8LinkTxBuffer [u16Length], psEvent->pZPSevent->uEvent.sApsInterPanDataIndEvent.u8LinkQuality, u16Length ); //ZNC_BUF_U8_UPD ( &au8LinkTxBuffer [u16Length], psEvent->pZPSevent->uEvent.sApsDataIndEvent.u8LinkQuality, u16Length ); @@ -400,7 +400,7 @@ PRIVATE void APP_ZCL_cbEndpointCallback ( tsZCL_CallBackEvent* psEvent ) return; } } - + switch (psEvent->eEventType) { case E_ZCL_CBET_LOCK_MUTEX: @@ -502,7 +502,7 @@ PRIVATE void APP_ZCL_cbEndpointCallback ( tsZCL_CallBackEvent* psEvent ) ZNC_BUF_U16_UPD ( &au8LinkTxBuffer [u16Length], u16SizeOfAttribute, u16Length ); if ( u16SizeOfAttribute != 0 ) { - vLog_Printf(TRACE_ZB_CONTROLBRIDGE_TASK,LOG_DEBUG,"\nEl�ment : %d\n",i); + vLog_Printf(TRACE_ZB_CONTROLBRIDGE_TASK,LOG_DEBUG,"\nEl�ment : %d\n",i); while ( i < u16Elements ) { if( ( psEvent->uMessage.sIndividualAttributeResponse.eAttributeDataType == E_ZCL_OSTRING ) || @@ -675,7 +675,7 @@ PRIVATE void APP_ZCL_cbEndpointCallback ( tsZCL_CallBackEvent* psEvent ) u8LinkQuality ); } break; - + case E_ZCL_CBET_DISCOVER_COMMAND_RECEIVED_RESPONSE: { vLog_Printf ( TRACE_ZCL, LOG_DEBUG, " (E_ZCL_CBET_DISCOVER_COMMAND_RECEIVED_RESPONSE)" ); @@ -713,7 +713,7 @@ PRIVATE void APP_ZCL_cbEndpointCallback ( tsZCL_CallBackEvent* psEvent ) u8LinkQuality ); } break; - + case E_ZCL_CBET_CLUSTER_CUSTOM: { ZNC_BUF_U8_UPD ( &au8LinkTxBuffer [0], psEvent->u8TransactionSequenceNumber, u16Length ); @@ -1303,15 +1303,6 @@ teZCL_Status eApp_ZLO_RegisterEndpoint ( tfpZCL_ZCLCallBackFunction fptr ) eZLO_RegisterControlBridgeEndPoint ( ZIGBEENODECONTROLBRIDGE_ORVIBO_ENDPOINT, fptr, &sControlBridge ); - eZLO_RegisterControlBridgeEndPointLivolo ( ZIGBEENODECONTROLBRIDGE_LIVOLO_ENDPOINT, - fptr, - &sControlBridge ); - eZLO_RegisterControlBridgeEndPoint ( ZIGBEENODECONTROLBRIDGE_TERNCY_ENDPOINT, - fptr, - &sControlBridge ); - eZLO_RegisterControlBridgeEndPoint ( ZIGBEENODECONTROLBRIDGE_KONKE_ENDPOINT, - fptr, - &sControlBridge ); return eZLO_RegisterControlBridgeEndPoint ( ZIGBEENODECONTROLBRIDGE_ZLO_ENDPOINT, fptr, &sControlBridge );