espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-31 11:17:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

ble_mesh: fix publication period timestamp initialization

Browse Source
This commit is contained in:
lly
2019-09-02 15:37:10 +08:00
parent 0299e22dd0
commit 0f36dabcaf
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
components/bt/esp_ble_mesh/mesh_core/access.c
View File

@ -220,7 +220,24 @@ static void publish_sent(int err, void *user_data)
} }
} }
static void publish_start(u16_t duration, int err, void *user_data)
{
struct bt_mesh_model *mod = user_data;
struct bt_mesh_model_pub *pub = mod->pub;
if (err) {
BT_ERR("Failed to publish: err %d", err);
return;
}
/* Initialize the timestamp for the beginning of a new period */
if (pub->count == BLE_MESH_PUB_TRANSMIT_COUNT(pub->retransmit)) {
pub->period_start = k_uptime_get_32();
}
}
static const struct bt_mesh_send_cb pub_sent_cb = { static const struct bt_mesh_send_cb pub_sent_cb = {
.start = publish_start,
.end = publish_sent, .end = publish_sent,
}; };
@ -310,8 +327,6 @@ static void mod_publish(struct k_work *work)
__ASSERT_NO_MSG(pub->update != NULL); __ASSERT_NO_MSG(pub->update != NULL);
pub->period_start = k_uptime_get_32();
/* Callback the model publish update event to the application layer. /* Callback the model publish update event to the application layer.
* In the event, users can update the context of the publish message * In the event, users can update the context of the publish message
* which will be published in the next period. * which will be published in the next period.
@ -856,7 +871,7 @@ int bt_mesh_model_publish(struct bt_mesh_model *model)
BT_DBG("%s", __func__); BT_DBG("%s", __func__);
if (!pub) { if (!pub || !pub->msg) {
BT_ERR("%s, Model has no publication support", __func__); BT_ERR("%s, Model has no publication support", __func__);
return -ENOTSUP; return -ENOTSUP;
} }