espressif/esp-protocols
1
0
Fork 1
mirror of https://github.com/espressif/esp-protocols.git synced 2025-07-29 18:27:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(modem): Fix get_network_registration_state() to accept two params

Browse Source 
Co-authored-by: Beernaert Robbe <robbe.beernaert@student.howest.be>
Closes https://github.com/espressif/esp-protocols/issues/826
This commit is contained in:
David Cermak
2025-06-23 10:51:24 +02:00
parent 01952f21cb
commit 5f54d9075e
1 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
components/esp_modem/src/esp_modem_command_library.cpp
View File

@ -635,17 +635,40 @@ command_result get_network_registration_state(CommandableIf *t, int &state)
}
constexpr std::string_view pattern = "+CEREG: ";
int state_pos_start;
int state_pos_end;
if (out.find(pattern) == std::string::npos || (state_pos_start = out.find(',')) == std::string::npos) {
// Check if pattern exists and find its position
size_t pattern_pos = out.find(pattern);
if (pattern_pos == std::string::npos) {
return command_result::FAIL;
}
if (out.find(pattern) == std::string::npos || (state_pos_end = out.find(',', state_pos_start)) == std::string::npos) {
if (std::from_chars(out.data() + state_pos_start, out.data() + out.size(), state).ec == std::errc::invalid_argument) {
return command_result::FAIL;
// Find the first comma after the pattern
size_t state_pos_start = out.find(',', pattern_pos);
if (state_pos_start == std::string::npos) {
return command_result::FAIL;
}
// Find the end of the state value - either a second comma or end of line
size_t state_pos_end = out.find(',', state_pos_start + 1);
if (state_pos_end == std::string::npos) {
// No second comma found, look for end of line characters
state_pos_end = out.find('\r', state_pos_start);
if (state_pos_end == std::string::npos) {
state_pos_end = out.find('\n', state_pos_start);
}
} else if (std::from_chars(out.data() + state_pos_start, out.data() + state_pos_end, state).ec == std::errc::invalid_argument) {
if (state_pos_end == std::string::npos) {
// No end delimiter found, use end of string
state_pos_end = out.size();
}
}
// Validate that we have a valid range to parse
if (state_pos_start + 1 >= state_pos_end) {
return command_result::FAIL;
}
// Extract state value (skip the comma)
if (std::from_chars(out.data() + state_pos_start + 1, out.data() + state_pos_end, state).ec == std::errc::invalid_argument) {
return command_result::FAIL;
}