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

prepare_sim_

Browse source
This commit is contained in:
oarcher 2024-07-21 18:05:37 +02:00
parent 5321163e6b
commit d0cefb4a08
2 changed files with 41 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -27,6 +27,11 @@
return; \ return; \
} }
#define ESPMODEM_ERROR_CHECK(err, message) \
if ((err) != command_result::OK) { \
ESP_LOGE(TAG, message ": %s", command_result_to_string(err).c_str()); \
}
static const size_t CONFIG_MODEM_UART_RX_BUFFER_SIZE = 2048; static const size_t CONFIG_MODEM_UART_RX_BUFFER_SIZE = 2048;
static const size_t CONFIG_MODEM_UART_TX_BUFFER_SIZE = 1024; static const size_t CONFIG_MODEM_UART_TX_BUFFER_SIZE = 1024;
static const uint8_t CONFIG_MODEM_UART_EVENT_QUEUE_SIZE = 30; static const uint8_t CONFIG_MODEM_UART_EVENT_QUEUE_SIZE = 30;
@ -189,32 +194,41 @@ void ModemComponent::reset_() {
} }
} }
void ModemComponent::start_connect_() { bool ModemComponent::prepare_sim_() {
Watchdog wdt(60); // it seems that read_pin(pin_ok) unexpectedly fail if no sim card is inserted, whithout updating the 'pin_ok'
this->connect_begin_ = millis(); bool pin_ok = false;
this->status_set_warning("Starting connection"); if (this->dce->read_pin(pin_ok) != command_result::OK) {
this->status_set_error("Unable to read pin status. Missing SIM card?");
return false;
}
global_modem_component->got_ipv4_address_ = false; if (!pin_ok) {
bool pin_ok = true;
if (this->dce->read_pin(pin_ok) == command_result::OK && !pin_ok) {
if (!this->pin_code_.empty()) { if (!this->pin_code_.empty()) {
ESP_LOGV(TAG, "Set pin code: %s", this->pin_code_.c_str()); ESP_LOGV(TAG, "Set pin code: %s", this->pin_code_.c_str());
this->dce->set_pin(this->pin_code_); ESPMODEM_ERROR_CHECK(this->dce->set_pin(this->pin_code_), "");
delay(this->command_delay_); // NOLINT delay(this->command_delay_); // NOLINT
} }
if (this->dce->read_pin(pin_ok) == command_result::OK && !pin_ok) {
ESP_LOGE(TAG, "Invalid PIN");
return;
}
} }
this->dce->read_pin(pin_ok);
if (pin_ok) { if (pin_ok) {
if (this->pin_code_.empty()) { if (this->pin_code_.empty()) {
ESP_LOGD(TAG, "PIN not needed"); ESP_LOGD(TAG, "PIN not needed");
} else { } else {
ESP_LOGD(TAG, "PIN unlocked"); ESP_LOGD(TAG, "PIN unlocked");
} }
} else {
this->status_set_error("Invalid PIN code.");
} }
return pin_ok;
}
void ModemComponent::start_connect_() {
Watchdog wdt(60);
this->connect_begin_ = millis();
this->status_set_warning("Starting connection");
global_modem_component->got_ipv4_address_ = false;
ESP_LOGD(TAG, "Entering CMUX mode"); ESP_LOGD(TAG, "Entering CMUX mode");
if (this->dce->set_mode(modem_mode::CMUX_MODE)) { if (this->dce->set_mode(modem_mode::CMUX_MODE)) {
@ -264,6 +278,7 @@ void ModemComponent::loop() {
if (this->start_) { if (this->start_) {
if (this->modem_ready()) { if (this->modem_ready()) {
ESP_LOGI(TAG, "Modem recovered"); ESP_LOGI(TAG, "Modem recovered");
this->status_clear_warning();
this->state_ = ModemComponentState::DISCONNECTED; this->state_ = ModemComponentState::DISCONNECTED;
} else { } else {
if (this->not_responding_cb_) { if (this->not_responding_cb_) {
@ -282,9 +297,11 @@ void ModemComponent::loop() {
if (this->enabled_) { if (this->enabled_) {
if (this->start_) { if (this->start_) {
if (this->modem_ready()) { if (this->modem_ready()) {
ESP_LOGI(TAG, "Starting modem connection"); if (this->prepare_sim_()) {
this->state_ = ModemComponentState::CONNECTING; ESP_LOGI(TAG, "Starting modem connection");
this->start_connect_(); this->state_ = ModemComponentState::CONNECTING;
this->start_connect_();
}
} else { } else {
this->state_ = ModemComponentState::NOT_RESPONDING; this->state_ = ModemComponentState::NOT_RESPONDING;
} }
@ -318,9 +335,8 @@ void ModemComponent::loop() {
if (!this->start_) { if (!this->start_) {
this->state_ = ModemComponentState::DISCONNECTED; this->state_ = ModemComponentState::DISCONNECTED;
} else if (!this->connected_) { } else if (!this->connected_) {
ESP_LOGW(TAG, "Connection via Modem lost! Re-connecting..."); this->status_set_warning("Connection via Modem lost!");
this->state_ = ModemComponentState::CONNECTING; this->state_ = ModemComponentState::DISCONNECTED;
this->start_connect_();
} else { } else {
if ((now - last_health_check) >= healh_check_interval) { if ((now - last_health_check) >= healh_check_interval) {
ESP_LOGV(TAG, "Health check"); ESP_LOGV(TAG, "Health check");
@ -398,11 +414,12 @@ void ModemComponent::dump_connect_params_() {
std::string ModemComponent::send_at(const std::string &cmd) { std::string ModemComponent::send_at(const std::string &cmd) {
std::string result; std::string result;
bool status; command_result status;
ESP_LOGV(TAG, "Sending command: %s", cmd.c_str()); ESP_LOGV(TAG, "Sending command: %s", cmd.c_str());
status = this->dce->at(cmd, result, this->command_delay_) == esp_modem::command_result::OK; status = this->dce->at(cmd, result, this->command_delay_);
ESP_LOGV(TAG, "Result for command %s: %s (status %d)", cmd.c_str(), result.c_str(), status); ESP_LOGV(TAG, "Result for command %s: %s (status %s)", cmd.c_str(), result.c_str(),
if (!status) { command_result_to_string(status).c_str());
if (status != esp_modem::command_result::OK) {
result = "ERROR"; result = "ERROR";
} }
return result; return result;

1
esphome/components/modem/modem_component.h
View file

@ -92,6 +92,7 @@ class ModemComponent : public Component {
esp_netif_t *ppp_netif_{nullptr}; esp_netif_t *ppp_netif_{nullptr};
esp_modem_dte_config_t dte_config_; esp_modem_dte_config_t dte_config_;
ModemComponentState state_{ModemComponentState::DISABLED}; ModemComponentState state_{ModemComponentState::DISABLED};
bool prepare_sim_();
void start_connect_(); void start_connect_();
bool start_{false}; bool start_{false};
bool enabled_{false}; bool enabled_{false};