Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-12-26 07:24:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

faster modem_ready

Browse source
This commit is contained in:
oarcher 2024-08-12 20:33:47 +02:00
parent 307880bc05
commit 8824ac14cf
1 changed files with 32 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
esphome/components/modem/modem_component.cpp
View file

@ -104,26 +104,30 @@ bool ModemComponent::get_power_status() {
bool ModemComponent::modem_ready(bool force_check) { bool ModemComponent::modem_ready(bool force_check) {
// check if the modem is ready to answer AT commands // check if the modem is ready to answer AT commands
if (this->dce) { // We first try to check flags, and then really send an AT command if force_check
if (!force_check) {
if (!this->internal_state_.modem_synced) if (!this->dce)
return false; return false;
if (!this->cmux_ && this->internal_state_.connected) if (!this->internal_state_.modem_synced)
return false; return false;
if (!this->internal_state_.powered_on) if (!this->cmux_ && this->internal_state_.connected)
return false; return false;
if (!this->internal_state_.powered_on)
return false;
#ifdef USE_MODEM_POWER #ifdef USE_MODEM_POWER
if (this->internal_state_.power_transition) if (this->internal_state_.power_transition)
return false; return false;
#endif #endif
}
if (force_check) {
if (this->get_imei()) { if (this->get_imei()) {
// we are sure that the modem is on // we are sure that the modem is on
this->internal_state_.powered_on = true; this->internal_state_.powered_on = true;
return true; return true;
} } else
} return false;
return false; } else
return true;
} }
bool ModemComponent::modem_ready() { return this->modem_ready(false); } bool ModemComponent::modem_ready() { return this->modem_ready(false); }
@ -258,10 +262,10 @@ void ModemComponent::loop() {
ESP_LOGD(TAG, "TONUART check sync"); ESP_LOGD(TAG, "TONUART check sync");
if (!this->modem_sync_()) { if (!this->modem_sync_()) {
ESP_LOGE(TAG, "Unable to power on the modem"); ESP_LOGE(TAG, "Unable to power on the modem");
this->internal_state_.powered_on = false; // this->internal_state_.powered_on = false;
} else { } else {
ESP_LOGI(TAG, "Modem powered ON"); ESP_LOGI(TAG, "Modem powered ON");
this->internal_state_.powered_on = true; // this->internal_state_.powered_on = true;
} }
break; break;
case ModemPowerState::TOFF: case ModemPowerState::TOFF:
@ -275,7 +279,7 @@ void ModemComponent::loop() {
break; break;
case ModemPowerState::TOFFUART: case ModemPowerState::TOFFUART:
this->internal_state_.power_transition = false; this->internal_state_.power_transition = false;
if (this->modem_ready()) { if (this->modem_ready(true)) {
ESP_LOGE(TAG, "Unable to power off the modem"); ESP_LOGE(TAG, "Unable to power off the modem");
this->internal_state_.powered_on = true; this->internal_state_.powered_on = true;
} else { } else {
@ -505,22 +509,22 @@ bool ModemComponent::modem_sync_() {
std::string result; std::string result;
ESP_LOGV(TAG, "Checking if the modem is synced..."); ESP_LOGV(TAG, "Checking if the modem is synced...");
bool status = this->modem_ready(true); bool status = this->get_imei();
watchdog::WatchdogManager wdt(30000);
if (!status) { if (!status) {
// Try to exit CMUX_MANUAL_DATA or DATA_MODE, if any // Try to exit CMUX_MANUAL_DATA or DATA_MODE, if any
ESP_LOGD(TAG, "Connecting to the the modem..."); ESP_LOGD(TAG, "Connecting to the the modem...");
watchdog::WatchdogManager wdt(30000);
auto command_mode = [this]() -> bool { auto command_mode = [this]() -> bool {
ESP_LOGVV(TAG, "trying command mode"); ESP_LOGVV(TAG, "trying command mode");
this->dce->set_mode(modem_mode::UNDEF); this->dce->set_mode(modem_mode::UNDEF);
return this->dce->set_mode(modem_mode::COMMAND_MODE) && this->modem_ready(true); return this->dce->set_mode(modem_mode::COMMAND_MODE) && this->get_imei();
}; };
auto cmux_command_mode = [this]() -> bool { auto cmux_command_mode = [this]() -> bool {
ESP_LOGVV(TAG, "trying cmux command mode"); ESP_LOGVV(TAG, "trying cmux command mode");
return this->dce->set_mode(modem_mode::CMUX_MANUAL_MODE) && return this->dce->set_mode(modem_mode::CMUX_MANUAL_MODE) &&
this->dce->set_mode(modem_mode::CMUX_MANUAL_COMMAND) && this->modem_ready(true); this->dce->set_mode(modem_mode::CMUX_MANUAL_COMMAND) && this->get_imei();
}; };
// The cmux state is supposed to be the same before the reboot. But if it has changed (new firwmare), we will try // The cmux state is supposed to be the same before the reboot. But if it has changed (new firwmare), we will try
@ -535,15 +539,21 @@ bool ModemComponent::modem_sync_() {
if (!status) { if (!status) {
ESP_LOGW(TAG, "modem not responding after %" PRIu32 "ms.", elapsed_ms); ESP_LOGW(TAG, "modem not responding after %" PRIu32 "ms.", elapsed_ms);
// assume the modem is OFF
this->internal_state_.powered_on = false; this->internal_state_.powered_on = false;
} else { } else {
ESP_LOGD(TAG, "Connected to the modem in %" PRIu32 "ms", elapsed_ms); ESP_LOGD(TAG, "Connected to the modem in %" PRIu32 "ms", elapsed_ms);
this->internal_state_.powered_on = true;
} }
} else {
// modem responded without need to recover command mode
this->internal_state_.powered_on = true;
} }
if (status && !this->internal_state_.modem_synced) { if (status && !this->internal_state_.modem_synced) {
App.feed_wdt();
// First time the modem is synced, or modem recovered // First time the modem is synced, or modem recovered
App.feed_wdt();
watchdog::WatchdogManager wdt(30000);
this->internal_state_.modem_synced = true; this->internal_state_.modem_synced = true;
if (!this->prepare_sim_()) { if (!this->prepare_sim_()) {