mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-02-26 18:41:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

mesh: implement move set message for generic level client

Browse Source
This commit is contained in:
Milanka Ringwald 2019-07-09 10:14:49 +02:00 committed by Matthias Ringwald
parent 5cb141632f
commit 8286504ad7
2 changed files with 64 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
test/mesh/mesh_generic_level_client.c
View File

@ -222,21 +222,22 @@ static inline uint8_t mesh_generic_level_client_set_value(mesh_model_t * mesh_mo
}
}
uint8_t mesh_generic_level_client_set_level_value(mesh_model_t * mesh_model, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index,
// Level
uint8_t mesh_generic_level_client_level_set(mesh_model_t * mesh_model, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index,
int16_t level_value, uint8_t transition_time_gdtt, uint8_t delay_time_gdtt, uint8_t transaction_id){
return mesh_generic_level_client_set_value(mesh_model, &mesh_generic_level_set_with_transition, &mesh_generic_level_set_instantaneous,
dest, netkey_index, appkey_index, level_value, transition_time_gdtt, delay_time_gdtt, transaction_id);
}
uint8_t mesh_generic_level_client_set_level_value_unacknowledged(mesh_model_t * mesh_model, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index,
uint8_t mesh_generic_level_client_level_set_unacknowledged(mesh_model_t * mesh_model, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index,
int16_t level_value, uint8_t transition_time_gdtt, uint8_t delay_time_gdtt, uint8_t transaction_id){
return mesh_generic_level_client_set_value(mesh_model, &mesh_generic_level_set_unacknowledged_with_transition, &mesh_generic_level_set_unacknowledged_instantaneous,
dest, netkey_index, appkey_index, level_value, transition_time_gdtt, delay_time_gdtt, transaction_id);
}
uint8_t mesh_generic_level_client_get_value(mesh_model_t *mesh_model, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index){
uint8_t mesh_generic_level_client_get(mesh_model_t *mesh_model, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index){
if (mesh_model->element == NULL){
log_error("mesh_model->element == NULL");
}
@ -247,15 +248,24 @@ uint8_t mesh_generic_level_client_get_value(mesh_model_t *mesh_model, uint16_t d
return generic_client_send_message(mesh_access_get_element_address(mesh_model), dest, netkey_index, appkey_index, (mesh_pdu_t *) transport_pdu);
}
uint8_t mesh_generic_level_client_publish_level(mesh_model_t * mesh_model, int16_t level_value, uint8_t transaction_id){
mesh_publication_model_t * publication_model = mesh_model->publication_model;
uint16_t appkey_index = publication_model->appkey_index;
mesh_transport_key_t * app_key = mesh_transport_key_get(appkey_index);
if (app_key == NULL) return MESH_ERROR_APPKEY_INDEX_INVALID;
return mesh_generic_level_client_level_set_unacknowledged(mesh_model, publication_model->address, app_key->netkey_index, appkey_index, level_value, 0, 0, transaction_id);
}
// Delta
uint8_t mesh_generic_level_client_set_delta_value(mesh_model_t * mesh_model, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index,
uint8_t mesh_generic_level_client_delta_set(mesh_model_t * mesh_model, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index,
uint16_t delta_value, uint8_t transition_time_gdtt, uint8_t delay_time_gdtt, uint8_t transaction_id){
return mesh_generic_level_client_set_value(mesh_model, &mesh_generic_delta_set_with_transition, &mesh_generic_delta_set_instantaneous,
dest, netkey_index, appkey_index, delta_value, transition_time_gdtt, delay_time_gdtt, transaction_id);
}
uint8_t mesh_generic_level_client_set_delta_value_unacknowledged(mesh_model_t * mesh_model, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index,
uint8_t mesh_generic_level_client_delta_set_unacknowledged(mesh_model_t * mesh_model, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index,
uint16_t delta_value, uint8_t transition_time_gdtt, uint8_t delay_time_gdtt, uint8_t transaction_id){
return mesh_generic_level_client_set_value(mesh_model, &mesh_generic_delta_set_unacknowledged_with_transition, &mesh_generic_delta_set_unacknowledged_instantaneous,
@ -263,28 +273,18 @@ uint8_t mesh_generic_level_client_set_delta_value_unacknowledged(mesh_model_t *
}
// Move
// uint8_t mesh_generic_level_client_set_move_value(mesh_model_t * mesh_model, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index, uint16_t move_value, uint8_t transition_time_gdtt, uint8_t delay_time_gdtt){
// if (transition_time_gdtt != 0) {
// return mesh_generic_level_client_set_with_transition_message(mesh_model, &mesh_generic_move_set_with_transition, dest, netkey_index, appkey_index, move_value, transition_time_gdtt, delay_time_gdtt);
// } else {
// return mesh_generic_level_client_set_instantaneous_message(mesh_model, &mesh_generic_move_set_instantaneous, dest, netkey_index, appkey_index, move_value);
// }
// }
// uint8_t mesh_generic_level_client_set_move_value_unacknowledged(mesh_model_t * mesh_model, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index, uint16_t move_value, uint8_t transition_time_gdtt, uint8_t delay_time_gdtt){
// if (transition_time_gdtt != 0) {
// return mesh_generic_level_client_set_with_transition_message(mesh_model, &mesh_generic_move_set_unacknowledged_with_transition, dest, netkey_index, appkey_index, move_value, transition_time_gdtt, delay_time_gdtt);
// } else {
// return mesh_generic_level_client_set_instantaneous_message(mesh_model, &mesh_generic_move_set_unacknowledged_instantaneous, dest, netkey_index, appkey_index, move_value);
// }
// }
uint8_t mesh_generic_level_client_publish_value(mesh_model_t * mesh_model, int16_t level_value, uint8_t transaction_id){
mesh_publication_model_t * publication_model = mesh_model->publication_model;
uint16_t appkey_index = publication_model->appkey_index;
mesh_transport_key_t * app_key = mesh_transport_key_get(appkey_index);
if (app_key == NULL) return MESH_ERROR_APPKEY_INDEX_INVALID;
return mesh_generic_level_client_set_level_value_unacknowledged(mesh_model, publication_model->address, app_key->netkey_index, appkey_index, level_value, 0, 0, transaction_id);
uint8_t mesh_generic_level_client_move_set(mesh_model_t * mesh_model, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index,
uint16_t delta_value, uint8_t transition_time_gdtt, uint8_t delay_time_gdtt, uint8_t transaction_id){
return mesh_generic_level_client_set_value(mesh_model, &mesh_generic_move_set_with_transition, &mesh_generic_move_set_instantaneous,
dest, netkey_index, appkey_index, delta_value, transition_time_gdtt, delay_time_gdtt, transaction_id);
}
uint8_t mesh_generic_level_client_move_set_unacknowledged(mesh_model_t * mesh_model, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index,
uint16_t delta_value, uint8_t transition_time_gdtt, uint8_t delay_time_gdtt, uint8_t transaction_id){
return mesh_generic_level_client_set_value(mesh_model, &mesh_generic_move_set_unacknowledged_with_transition, &mesh_generic_move_set_unacknowledged_instantaneous,
dest, netkey_index, appkey_index, delta_value, transition_time_gdtt, delay_time_gdtt, transaction_id);
}

41
test/mesh/mesh_generic_level_client.h
View File

@ -66,7 +66,7 @@ void mesh_generic_level_client_register_packet_handler(mesh_model_t *mesh_model,
* @param transaction_id
* @return status 0 if successful
*/
uint8_t mesh_generic_level_client_set_level_value(mesh_model_t * mesh_model, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index,
uint8_t mesh_generic_level_client_level_set(mesh_model_t * mesh_model, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index,
int16_t level_value, uint8_t transition_time_gdtt, uint8_t delay_time_gdtt, uint8_t transaction_id);
/**
@ -81,7 +81,7 @@ uint8_t mesh_generic_level_client_set_level_value(mesh_model_t * mesh_model, uin
* @param transaction_id
* @return transaction_id if transaction_id == 0, it is invalid
*/
uint8_t mesh_generic_level_client_set_level_value_unacknowledged(mesh_model_t * mesh_model, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index,
uint8_t mesh_generic_level_client_level_set_unacknowledged(mesh_model_t * mesh_model, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index,
int16_t level_value, uint8_t transition_time_gdtt, uint8_t delay_time_gdtt, uint8_t transaction_id);
/**
@ -92,7 +92,7 @@ uint8_t mesh_generic_level_client_set_level_value_unacknowledged(mesh_model_t *
* @param appkey_index
* @return status 0 if successful
*/
uint8_t mesh_generic_level_client_get_level_value(mesh_model_t *mesh_model, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index);
uint8_t mesh_generic_level_client_level_get(mesh_model_t *mesh_model, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index);
/**
* @brief Publish level value by sending an unacknowledged set message to the publish destination
@ -101,7 +101,7 @@ uint8_t mesh_generic_level_client_get_level_value(mesh_model_t *mesh_model, uint
* @param transaction_id
* @return status 0 if successful
*/
void mesh_generic_level_client_publish_level_value(mesh_model_t * mesh_model, int16_t level_value, uint8_t transaction_id);
void mesh_generic_level_client_publish_level(mesh_model_t * mesh_model, int16_t level_value, uint8_t transaction_id);
/**
* @brief Set Level value
@ -115,7 +115,7 @@ void mesh_generic_level_client_publish_level_value(mesh_model_t * mesh_model, in
* @param transaction_id
* @return status 0 if successful
*/
uint8_t mesh_generic_level_client_set_delta_value(mesh_model_t * mesh_model, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index,
uint8_t mesh_generic_level_client_delta_set(mesh_model_t * mesh_model, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index,
int16_t delta_value, uint8_t transition_time_gdtt, uint8_t delay_time_gdtt, uint8_t transaction_id);
/**
@ -130,9 +130,38 @@ uint8_t mesh_generic_level_client_set_delta_value(mesh_model_t * mesh_model, uin
* @param transaction_id
* @return transaction_id if transaction_id == 0, it is invalid
*/
uint8_t mesh_generic_level_client_set_delta_value_unacknowledged(mesh_model_t * mesh_model, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index,
uint8_t mesh_generic_level_client_delta_set_unacknowledged(mesh_model_t * mesh_model, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index,
int16_t delta_value, uint8_t transition_time_gdtt, uint8_t delay_time_gdtt, uint8_t transaction_id);
/**
* @brief Set Level value
* @param mesh_model
* @param dest
* @param netkey_index
* @param appkey_index
* @param delta_value used to calculate the speed of the transition of the Generic Level state
* @param transition_time_gdtt
* @param delay_time_gdtt
* @param transaction_id
* @return status 0 if successful
*/
uint8_t mesh_generic_level_client_move_set(mesh_model_t * mesh_model, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index,
int16_t delta_value, uint8_t transition_time_gdtt, uint8_t delay_time_gdtt, uint8_t transaction_id);
/**
* @brief Get present Level value
* @param mesh_model
* @param dest
* @param netkey_index
* @param appkey_index
* @param delta_value used to calculate the speed of the transition of the Generic Level state
* @param transition_time_gdtt
* @param delay_time_gdtt
* @param transaction_id
* @return transaction_id if transaction_id == 0, it is invalid
*/
uint8_t mesh_generic_level_client_move_set_unacknowledged(mesh_model_t * mesh_model, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index,
int16_t delta_value, uint8_t transition_time_gdtt, uint8_t delay_time_gdtt, uint8_t transaction_id);
#ifdef __cplusplus
} /* end of extern "C" */