From 3013af6a9365223ec4e27ee820ec7f4dada44a4c Mon Sep 17 00:00:00 2001 From: Milanka Ringwald Date: Fri, 6 Dec 2019 14:56:57 +0100 Subject: [PATCH] mesh: implement Config Composition Data Get cofiguration client message [a2466] --- src/mesh/mesh_configuration_client.c | 27 +++++++++++++++++++-------- src/mesh/mesh_configuration_client.h | 15 +++++++++++++-- 2 files changed, 32 insertions(+), 10 deletions(-) diff --git a/src/mesh/mesh_configuration_client.c b/src/mesh/mesh_configuration_client.c index ecdd45ceb..c95bdec89 100644 --- a/src/mesh/mesh_configuration_client.c +++ b/src/mesh/mesh_configuration_client.c @@ -55,7 +55,7 @@ #include "mesh/mesh_upper_transport.h" -static void mesh_configuration_client_send_message_acknowledged(uint16_t src, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index, mesh_pdu_t *pdu, uint32_t ack_opcode){ +static void mesh_configuration_client_send_acknowledged(uint16_t src, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index, mesh_pdu_t *pdu, uint32_t ack_opcode){ uint8_t ttl = mesh_foundation_default_ttl_get(); mesh_upper_transport_setup_access_pdu_header(pdu, netkey_index, appkey_index, ttl, src, dest, 0); mesh_access_send_acknowledged_pdu(pdu, mesh_access_acknowledged_message_retransmissions(), ack_opcode); @@ -81,12 +81,12 @@ static const mesh_access_message_t mesh_configuration_client_beacon_set = { }; -#if 0 static const mesh_access_message_t mesh_configuration_client_composition_data_get = { MESH_FOUNDATION_OPERATION_COMPOSITION_DATA_GET, "1" }; +#if 0 static const mesh_access_message_t mesh_configuration_client_default_ttl_get = { MESH_FOUNDATION_OPERATION_DEFAULT_TTL_GET, "" }; @@ -121,18 +121,18 @@ static const mesh_access_message_t mesh_configuration_client_publication_virtual }; #endif -uint8_t mesh_configuration_client_send_message_config_beacon_get(mesh_model_t * mesh_model, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index){ +uint8_t mesh_configuration_client_send_config_beacon_get(mesh_model_t * mesh_model, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index){ uint8_t status = mesh_access_validate_envelop_params(mesh_model, dest, netkey_index, appkey_index); if (status != ERROR_CODE_SUCCESS) return status; mesh_network_pdu_t * network_pdu = mesh_access_setup_unsegmented_message(&mesh_configuration_client_beacon_get); if (!network_pdu) return BTSTACK_MEMORY_ALLOC_FAILED; - mesh_configuration_client_send_message_acknowledged(mesh_access_get_element_address(mesh_model), dest, netkey_index, appkey_index, (mesh_pdu_t *) network_pdu, MESH_FOUNDATION_OPERATION_BEACON_STATUS); - return ERROR_CODE_SUCCESS;; + mesh_configuration_client_send_acknowledged(mesh_access_get_element_address(mesh_model), dest, netkey_index, appkey_index, (mesh_pdu_t *) network_pdu, MESH_FOUNDATION_OPERATION_BEACON_STATUS); + return ERROR_CODE_SUCCESS; } -uint8_t mesh_configuration_client_send_message_config_beacon_set(mesh_model_t * mesh_model, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index, uint8_t beacon){ +uint8_t mesh_configuration_client_send_config_beacon_set(mesh_model_t * mesh_model, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index, uint8_t beacon){ uint8_t status = mesh_access_validate_envelop_params(mesh_model, dest, netkey_index, appkey_index); if (status != ERROR_CODE_SUCCESS) return status; @@ -141,8 +141,19 @@ uint8_t mesh_configuration_client_send_message_config_beacon_set(mesh_model_t * mesh_network_pdu_t * network_pdu = mesh_access_setup_unsegmented_message(&mesh_configuration_client_beacon_set, beacon); if (!network_pdu) return BTSTACK_MEMORY_ALLOC_FAILED; - mesh_configuration_client_send_message_acknowledged(mesh_access_get_element_address(mesh_model), dest, netkey_index, appkey_index, (mesh_pdu_t *) network_pdu, MESH_FOUNDATION_OPERATION_BEACON_STATUS); - return ERROR_CODE_SUCCESS;; + mesh_configuration_client_send_acknowledged(mesh_access_get_element_address(mesh_model), dest, netkey_index, appkey_index, (mesh_pdu_t *) network_pdu, MESH_FOUNDATION_OPERATION_BEACON_STATUS); + return ERROR_CODE_SUCCESS; +} + +uint8_t mesh_configuration_client_send_composition_data_get(mesh_model_t * mesh_model, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index, uint8_t page){ + uint8_t status = mesh_access_validate_envelop_params(mesh_model, dest, netkey_index, appkey_index); + if (status != ERROR_CODE_SUCCESS) return status; + + mesh_network_pdu_t * network_pdu = mesh_access_setup_unsegmented_message(&mesh_configuration_client_composition_data_get, page); + if (!network_pdu) return BTSTACK_MEMORY_ALLOC_FAILED; + + mesh_configuration_client_send_acknowledged(mesh_access_get_element_address(mesh_model), dest, netkey_index, appkey_index, (mesh_pdu_t *) network_pdu, MESH_FOUNDATION_OPERATION_COMPOSITION_DATA_GET); + return ERROR_CODE_SUCCESS; } // Model Operations diff --git a/src/mesh/mesh_configuration_client.h b/src/mesh/mesh_configuration_client.h index e7e4aec96..c95152818 100644 --- a/src/mesh/mesh_configuration_client.h +++ b/src/mesh/mesh_configuration_client.h @@ -62,7 +62,7 @@ void mesh_configuration_client_register_packet_handler(mesh_model_t *configurati * @param appkey_index * @return status ERROR_CODE_SUCCESS if successful, otherwise BTSTACK_MEMORY_ALLOC_FAILED or ERROR_CODE_PARAMETER_OUT_OF_MANDATORY_RANGE */ -uint8_t mesh_configuration_client_send_message_config_beacon_get(mesh_model_t * mesh_model, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index); +uint8_t mesh_configuration_client_send_beacon_get(mesh_model_t * mesh_model, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index); /** * @brief Get the current Secure Network Beacon state of a node. @@ -73,7 +73,18 @@ uint8_t mesh_configuration_client_send_message_config_beacon_get(mesh_model_t * * @param Beacon 0x01 The node is broadcasting a Secure Network beacon, 0x00 broadcastinis off * @return status ERROR_CODE_SUCCESS if successful, otherwise BTSTACK_MEMORY_ALLOC_FAILED or ERROR_CODE_PARAMETER_OUT_OF_MANDATORY_RANGE */ -uint8_t mesh_configuration_client_send_message_config_beacon_set(mesh_model_t * mesh_model, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index, uint8_t beacon); +uint8_t mesh_configuration_client_send_beacon_set(mesh_model_t * mesh_model, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index, uint8_t beacon); + +/** + * @brief Read one page of the Composition Data. + * @param mesh_model + * @param dest + * @param netkey_index + * @param appkey_index + * @param page Page number of the Composition Data + * @return status ERROR_CODE_SUCCESS if successful, otherwise BTSTACK_MEMORY_ALLOC_FAILED or ERROR_CODE_PARAMETER_OUT_OF_MANDATORY_RANGE + */ +uint8_t mesh_configuration_client_send_composition_data_get(mesh_model_t * mesh_model, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index, uint8_t page); #ifdef __cplusplus } /* end of extern "C" */