Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/request_state.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include <string.h>

#include <libsettings/settings.h>
#include <swiftnav/logging.h>

#include <internal/request_state.h>
#include <internal/setting_def.h>
Expand Down Expand Up @@ -95,7 +96,12 @@ bool request_state_match(const request_state_t *state) {
int request_state_signal(request_state_t *state, settings_api_t *api,
uint16_t msg_id) {
assert(state);
assert(msg_id == state->msg_id);

if (msg_id != state->msg_id) {
log_error("Error: request msg_id [%d] do not match state msg_id [%d]",
msg_id, state->msg_id);
assert(!"request msg_id do not match state msg_id");
}

state->match = true;
state->pending = false;
Expand Down
9 changes: 6 additions & 3 deletions src/setting_sbp_cb.c
Original file line number Diff line number Diff line change
Expand Up @@ -304,9 +304,12 @@ static void setting_read_by_index_done_callback(uint16_t sender_id, uint8_t len,
/* Traverse the pending requests */
request_state_t *state = ctx->req_list;
while (state != NULL) {
state->read_by_idx_done = true;
request_state_signal(state, &ctx->client_iface,
SBP_MSG_SETTINGS_READ_BY_INDEX_REQ);
// request state signal only if the msg_id matches
if (state->msg_id == SBP_MSG_SETTINGS_READ_BY_INDEX_REQ) {
state->read_by_idx_done = true;
request_state_signal(state, &ctx->client_iface,
SBP_MSG_SETTINGS_READ_BY_INDEX_REQ);
}
state = state->next;
}
}
Expand Down