mesh: add mesh_node_reset

This commit is contained in:
Matthias Ringwald 2019-06-14 16:03:52 +02:00
parent b761c42513
commit 0e9fe84441
7 changed files with 22 additions and 21 deletions

View File

@ -760,14 +760,8 @@ static void stdin_process(char cmd){
load_pts_app_key();
break;
case '8':
btstack_tlv_singleton_impl->delete_tag(btstack_tlv_singleton_context, 'PROV');
mesh_delete_network_keys();
mesh_delete_app_keys();
mesh_delete_appkey_lists();
mesh_delete_virtual_addresses();
mesh_delete_subscriptions();
mesh_delete_publications();
printf("Provisioning data, net keys, app keys, model to app key lists, virtual addresses, model subscriptions deleted\n");
mesh_node_reset();
printf("Mesh Node Reset!\n");
setup_advertising_unprovisioned();
break;
case 'p':

View File

@ -984,4 +984,3 @@ int mesh_model_contains_appkey(mesh_model_t * mesh_model, uint16_t appkey_index)
return 0;
}

View File

@ -225,7 +225,7 @@ uint8_t * mesh_pdu_data(mesh_pdu_t * pdu);
// Mesh NetKey List
void mesh_store_network_key(mesh_network_key_t * network_key);
void mesh_delete_network_key(uint16_t internal_index);
void mesh_delete_networ_keys(void);
void mesh_delete_network_keys(void);
void mesh_load_network_keys(void);
// Mesh Appkeys
@ -283,7 +283,6 @@ void mesh_access_network_add_model_identifier(mesh_network_pdu_t * pdu, uint32_t
mesh_network_pdu_t * mesh_access_setup_unsegmented_message(const mesh_access_message_t *template, ...);
mesh_transport_pdu_t * mesh_access_setup_segmented_message(const mesh_access_message_t *template, ...);
#ifdef __cplusplus
} /* end of extern "C" */
#endif

View File

@ -1998,7 +1998,7 @@ static void config_node_reset_status(mesh_model_t *mesh_model, uint16_t netkey_i
}
static void config_node_reset_handler(mesh_model_t *mesh_model, mesh_pdu_t * pdu){
mesh_foundation_node_reset();
mesh_node_reset();
config_node_reset_status(mesh_model, mesh_pdu_netkey_index(pdu), mesh_pdu_src(pdu));
mesh_access_message_processed(pdu);
}
@ -2117,3 +2117,18 @@ const static mesh_operation_t mesh_configuration_server_model_operations[] = {
const mesh_operation_t * mesh_configuration_server_get_operations(void){
return mesh_configuration_server_model_operations;
}
void mesh_node_reset(void){
mesh_configuration_server_setup_tlv();
// PROV
btstack_tlv_singleton_impl->delete_tag(btstack_tlv_singleton_context, 'PROV');
// everything else
mesh_delete_network_keys();
mesh_delete_app_keys();
mesh_delete_appkey_lists();
mesh_delete_virtual_addresses();
mesh_delete_subscriptions();
mesh_delete_publications();
}

View File

@ -60,6 +60,9 @@ void mesh_load_publications(void);
void mesh_delete_publications(void);
//
void mesh_node_reset(void);
// PTS Testing
void config_nekey_list_set_max(uint16_t max);

View File

@ -109,7 +109,3 @@ void mesh_foundation_relay_retransmit_set(uint8_t relay_retransmit){
uint8_t mesh_foundation_relay_retransmit_get(void){
return mesh_foundation_relay_retransmit;
}
void mesh_foundation_node_reset(void){
printf("MESH: NODE RESET\n");
}

View File

@ -250,11 +250,6 @@ void mesh_foundation_relay_retransmit_set(uint8_t relay_retransmit);
*/
uint8_t mesh_foundation_relay_retransmit_get(void);
/**
*
*/
void mesh_foundation_node_reset(void);
#ifdef __cplusplus
} /* end of extern "C" */
#endif