mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-01-06 07:00:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

mesh: expand count_log to count, and period_log to period_s in heartbeat messages of configuration client [a2592]

Browse Source
This commit is contained in:
Milanka Ringwald 2020-01-31 11:16:45 +01:00
parent 12d66e05f4
commit d175073c35
3 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/btstack_defines.h
View File

@ -3118,13 +3118,13 @@ typedef uint8_t sm_key_t[16];
#define MESH_SUBEVENT_CONFIGURATION_KEY_REFRESH_PHASE 0x53
/**
* @format 121211122
* @format 121222122
* @param subevent_code
* @param dest
* @param foundation_status
* @param heartbeat_destination
* @param count_log
* @param period_log
* @param count_S
* @param period_S
* @param ttl
* @param features
* @param netkey_index
@ -3132,14 +3132,14 @@ typedef uint8_t sm_key_t[16];
#define MESH_SUBEVENT_CONFIGURATION_HEARTBEAT_PUBLICATION 0x54
/**
* @format 121221111
* @format 12122221111
* @param subevent_code
* @param dest
* @param foundation_status
* @param heartbeat_destination
* @param heartbeat_source
* @param count_log
* @param period_log
* @param count_S
* @param period_S
* @param min_hops
* @param max_hops
*/

32
src/mesh/mesh_configuration_client.c
View File

@ -833,8 +833,8 @@ uint8_t mesh_configuration_client_send_heartbeat_publication_set(mesh_model_t *
mesh_network_pdu_t * transport_pdu = mesh_access_setup_unsegmented_message(&mesh_configuration_client_heartbeat_publication_set,
publication_state.destination,
publication_state.count_log,
publication_state.period_log,
mesh_heartbeat_period_log(publication_state.count),
mesh_heartbeat_period_log(publication_state.period_s),
publication_state.ttl,
publication_state.features,
publication_state.netkey_index);
@ -856,11 +856,11 @@ uint8_t mesh_configuration_client_send_heartbeat_subscription_get(mesh_model_t *
return ERROR_CODE_SUCCESS;
}
uint8_t mesh_configuration_client_send_heartbeat_subscription_set(mesh_model_t * mesh_model, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index, uint16_t heartbeat_source, uint16_t heartbeat_destination, uint8_t period_log){
uint8_t mesh_configuration_client_send_heartbeat_subscription_set(mesh_model_t * mesh_model, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index, uint16_t heartbeat_source, uint16_t heartbeat_destination, uint16_t period_s){
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 * transport_pdu = mesh_access_setup_unsegmented_message(&mesh_configuration_client_heartbeat_subscription_set, heartbeat_source, heartbeat_destination, period_log);
mesh_network_pdu_t * transport_pdu = mesh_access_setup_unsegmented_message(&mesh_configuration_client_heartbeat_subscription_set, heartbeat_source, heartbeat_destination, mesh_heartbeat_period_log(period_s));
if (!transport_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 *) transport_pdu, MESH_FOUNDATION_OPERATION_HEARTBEAT_SUBSCRIPTION_STATUS);
@ -1411,13 +1411,13 @@ static void mesh_configuration_client_heartbeat_publication_handler(mesh_model_t
mesh_access_parser_init(&parser, (mesh_pdu_t*) pdu);
uint8_t status = mesh_access_parser_get_u8(&parser);
uint16_t dest = mesh_access_parser_get_u16(&parser);
uint8_t count_log = mesh_access_parser_get_u8(&parser);
uint8_t period_log = mesh_access_parser_get_u8(&parser);
uint8_t count = mesh_heartbeat_pwr2(mesh_access_parser_get_u8(&parser));
uint16_t period_s = mesh_heartbeat_pwr2(mesh_access_parser_get_u8(&parser));
uint8_t ttl = mesh_access_parser_get_u8(&parser);
uint16_t features = mesh_access_parser_get_u16(&parser);
uint16_t netkey_index = mesh_access_parser_get_u16(&parser);
uint8_t event[15];
uint8_t event[17];
int pos = 0;
event[pos++] = HCI_EVENT_MESH_META;
event[pos++] = sizeof(event) - 2;
@ -1428,8 +1428,10 @@ static void mesh_configuration_client_heartbeat_publication_handler(mesh_model_t
event[pos++] = status;
little_endian_store_16(event, pos, dest);
pos += 2;
event[pos++] = count_log;
event[pos++] = period_log;
little_endian_store_16(event, pos, count);
pos += 2;
little_endian_store_16(event, pos, period_s);
pos += 2;
event[pos++] = ttl;
little_endian_store_16(event, pos, features);
pos += 2;
@ -1445,12 +1447,12 @@ static void mesh_configuration_client_heartbeat_subscription_handler(mesh_model_
uint8_t status = mesh_access_parser_get_u8(&parser);
uint16_t source = mesh_access_parser_get_u16(&parser);
uint16_t dest = mesh_access_parser_get_u16(&parser);
uint8_t period_log = mesh_access_parser_get_u8(&parser);
uint8_t count_log = mesh_access_parser_get_u8(&parser);
uint16_t period_s = mesh_heartbeat_pwr2(mesh_access_parser_get_u8(&parser));
uint16_t count = mesh_heartbeat_pwr2(mesh_access_parser_get_u8(&parser));
uint8_t min_hops = mesh_access_parser_get_u8(&parser);
uint8_t max_hops = mesh_access_parser_get_u8(&parser);
uint8_t event[14];
uint8_t event[16];
int pos = 0;
event[pos++] = HCI_EVENT_MESH_META;
event[pos++] = sizeof(event) - 2;
@ -1463,8 +1465,10 @@ static void mesh_configuration_client_heartbeat_subscription_handler(mesh_model_
pos += 2;
little_endian_store_16(event, pos, source);
pos += 2;
event[pos++] = count_log;
event[pos++] = period_log;
little_endian_store_16(event, pos, count);
pos += 2;
little_endian_store_16(event, pos, period_s);
pos += 2;
event[pos++] = min_hops;
event[pos++] = max_hops;

4
src/mesh/mesh_configuration_client.h
View File

@ -651,10 +651,10 @@ uint8_t mesh_configuration_client_send_heartbeat_subscription_get(mesh_model_t *
* @param appkey_index
* @param heartbeat_source
* @param heartbeat_destination
* @param period_log
* @param period_s
* @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_heartbeat_subscription_set(mesh_model_t * mesh_model, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index, uint16_t heartbeat_source, uint16_t heartbeat_destination, uint8_t period_log);
uint8_t mesh_configuration_client_send_heartbeat_subscription_set(mesh_model_t * mesh_model, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index, uint16_t heartbeat_source, uint16_t heartbeat_destination, uint16_t period_s);
/**
* @brief Get the current value of PollTimeout timer of the Low Power node within a Friend node.