Skip to content

fix(Modem): Calculate correctly remaining timeout of waiting functions #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alkonosst merged 1 commit into from
Nov 24, 2025
Merged

fix(Modem): Calculate correctly remaining timeout of waiting functions #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 18 additions & 3 deletions src/SIM7600Modem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,12 @@ Status Modem::waitForResponse(const char* expected_response, const uint32_t time
uint32_t start = millis();

while ((millis() - start) < timeout_ms) {
Status status = readLine(_rx_buf, SIM7600_MODEM_RX_BUFFER_SIZE_B, timeout_ms);
uint32_t elapsed = millis() - start;
if (elapsed >= timeout_ms) break;

uint32_t remaining_time_ms = timeout_ms - elapsed;

Status status = readLine(_rx_buf, SIM7600_MODEM_RX_BUFFER_SIZE_B, remaining_time_ms);

if (status == Status::EmptyLine) continue;
if (status != Status::Success) return status;
Expand All @@ -190,7 +195,12 @@ Status Modem::waitForResponses(const char** expected_responses, const uint8_t re
uint32_t start = millis();

while ((millis() - start) < timeout_ms) {
Status status = readLine(_rx_buf, SIM7600_MODEM_RX_BUFFER_SIZE_B, timeout_ms);
uint32_t elapsed = millis() - start;
if (elapsed >= timeout_ms) break;

uint32_t remaining_time_ms = timeout_ms - elapsed;

Status status = readLine(_rx_buf, SIM7600_MODEM_RX_BUFFER_SIZE_B, remaining_time_ms);

if (status == Status::EmptyLine) continue;
if (status != Status::Success) return status;
Expand Down Expand Up @@ -218,12 +228,17 @@ Status Modem::waitForPrompt(const uint32_t timeout_ms) {
uint32_t start = millis();

while ((millis() - start) < timeout_ms) {
uint32_t elapsed = millis() - start;
if (elapsed >= timeout_ms) break;

uint32_t remaining_time_ms = timeout_ms - elapsed;

size_t bytes_read = 0;
Status status = readBytes(reinterpret_cast<uint8_t*>(_rx_buf),
SIM7600_MODEM_RX_BUFFER_SIZE_B,
1,
bytes_read,
timeout_ms);
remaining_time_ms);

if (status != Status::Success) return status;

Expand Down