adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

modem: chat: Start waiting for response after request is sent

Browse source 
This PR makes the modem_chat wait until a chat script chat
request has been sent before accepting responses to said
request.

This helps ensure that an unsolicitet response is not mistaken
for a response to a request, which is especially problematic
if the chat script chat is using an any match.

For example, start chat script sending AT+CGMI, expecting the
modem name as a response followed by OK

> start script, waiting for response immediately
> start sending "AT+CGMI"
> receive "+CEREG 1,0" while sending
> script accepts "+CEREG 1,0" as the response to "AT+CGMI"
> "AT+CGMI" sent
> receive "QUECTEL BG95"
> receive "OK"

script handler got "+CEREG 1,0" instead of "QUECTEL BG95"

After this PR:

> start script
> start sending AT+CGMI
> receive "+CEREG 1,0" while sending
> "AT+CGMI" sent
> start waiting for response
> receive "QUECTEL BG95"
> script accepts "QUECTEL BG95" as response to "AT+CGMI"
> receive "OK"

Signed-off-by: Bjarki Arge Andreasen <bjarki@arge-andreasen.me>
This commit is contained in:
Bjarki Arge Andreasen 2024-01-11 13:12:00 +01:00 committed by Carles Cufí
parent 85995e5688
commit 7c9f2872e1
1 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
subsys/modem/modem_chat.c
View file

@ -95,8 +95,10 @@ static void modem_chat_script_stop(struct modem_chat *chat, enum modem_chat_scri
chat->matches[MODEM_CHAT_MATCHES_INDEX_RESPONSE] = NULL;
chat->matches_size[MODEM_CHAT_MATCHES_INDEX_RESPONSE] = 0;
/* Cancel timeout work */
/* Cancel work */
k_work_cancel_delayable(&chat->script_timeout_work);
k_work_cancel_delayable(&chat->script_send_work);
k_work_cancel_delayable(&chat->script_send_timeout_work);
/* Clear script running state */
atomic_clear_bit(&chat->script_state, MODEM_CHAT_SCRIPT_STATE_RUNNING_BIT);
@ -118,6 +120,21 @@ static void modem_chat_script_send(struct modem_chat *chat)
k_work_schedule(&chat->script_send_work, K_NO_WAIT);
}
static void modem_chat_script_set_response_matches(struct modem_chat *chat)
{
const struct modem_chat_script_chat *script_chat =
&chat->script->script_chats[chat->script_chat_it];
chat->matches[MODEM_CHAT_MATCHES_INDEX_RESPONSE] = script_chat->response_matches;
chat->matches_size[MODEM_CHAT_MATCHES_INDEX_RESPONSE] = script_chat->response_matches_size;
}
static void modem_chat_script_clear_response_matches(struct modem_chat *chat)
{
chat->matches[MODEM_CHAT_MATCHES_INDEX_RESPONSE] = NULL;
chat->matches_size[MODEM_CHAT_MATCHES_INDEX_RESPONSE] = 0;
}
static void modem_chat_script_next(struct modem_chat *chat, bool initial)
{
const struct modem_chat_script_chat *script_chat;
@ -142,14 +159,13 @@ static void modem_chat_script_next(struct modem_chat *chat, bool initial)
script_chat = &chat->script->script_chats[chat->script_chat_it];
/* Set response command handlers */
chat->matches[MODEM_CHAT_MATCHES_INDEX_RESPONSE] = script_chat->response_matches;
chat->matches_size[MODEM_CHAT_MATCHES_INDEX_RESPONSE] = script_chat->response_matches_size;
/* Check if work must be sent */
/* Check if request must be sent */
if (script_chat->request_size > 0) {
LOG_DBG("sending: %.*s", script_chat->request_size, script_chat->request);
modem_chat_script_clear_response_matches(chat);
modem_chat_script_send(chat);
} else {
modem_chat_script_set_response_matches(chat);
}
}
@ -322,6 +338,8 @@ static void modem_chat_script_send_handler(struct k_work *item)
} else {
k_work_schedule(&chat->script_send_timeout_work, K_MSEC(timeout));
}
} else {
modem_chat_script_set_response_matches(chat);
}
}