Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-27 09:18:00 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

code cleaning

Browse source
This commit is contained in:
Alexandr Pyslar 2024-10-14 18:22:31 +00:00
parent 63a3abbf10
commit 541d9b815f
2 changed files with 79 additions and 136 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -15,24 +15,6 @@
#include <lwip/dns.h> #include <lwip/dns.h>
#include "esp_event.h" #include "esp_event.h"
int time_info_print = 0;
int time_hard_reset_modem = 0;
int time_check_rssi = 0;
int time_check_pwrkey = 0;
int time_check_reset = 0;
int time_turn_on_reset = 0;
int time_turn_on_modem = 0;
int time_turn_off_modem = 0;
int last_pull_time = 0;
int time_change_state = 0;
#define TIME_TO_NEXT_HARD_RESET 30000
#define TIME_TO_START_MODEM 9000
#define TIME_CHECK_REGISTRATION_IN_NETWORK 1000
#define SYNCHRONIZATION_CHECK_PERIOD 1000
#define DELAY_HOLD_RESET_PIN 110
#define TURN_OFF_MODEM_TIME 2000
namespace esphome { namespace esphome {
namespace modem { namespace modem {
@ -59,7 +41,6 @@ void ModemComponent::setup() {
esp_log_level_set("uart_terminal", ESP_LOG_VERBOSE); esp_log_level_set("uart_terminal", ESP_LOG_VERBOSE);
ESP_LOGCONFIG(TAG, "Setting up modem..."); ESP_LOGCONFIG(TAG, "Setting up modem...");
if (this->power_pin_) { if (this->power_pin_) {
this->power_pin_->setup(); this->power_pin_->setup();
} }
@ -67,11 +48,6 @@ void ModemComponent::setup() {
this->pwrkey_pin_->setup(); this->pwrkey_pin_->setup();
} }
this->reset_pin_->setup(); this->reset_pin_->setup();
// this->turn_on_modem();
// this->use_pwrkey();
// esp_modem_hard_reset();
if (esp_reset_reason() != ESP_RST_DEEPSLEEP) { if (esp_reset_reason() != ESP_RST_DEEPSLEEP) {
// Delay here to allow power to stabilise before Modem is initialized. // Delay here to allow power to stabilise before Modem is initialized.
delay(300); // NOLINT delay(300); // NOLINT
@ -83,18 +59,11 @@ void ModemComponent::setup() {
err = esp_event_loop_create_default(); err = esp_event_loop_create_default();
ESPHL_ERROR_CHECK(err, "modem event loop error"); ESPHL_ERROR_CHECK(err, "modem event loop error");
ESP_LOGCONFIG(TAG, "Initing netif"); ESP_LOGCONFIG(TAG, "Initing netif");
esp_event_handler_register(IP_EVENT, ESP_EVENT_ANY_ID, &ModemComponent::got_ip_event_handler, NULL); esp_event_handler_register(IP_EVENT, ESP_EVENT_ANY_ID, &ModemComponent::got_ip_event_handler, NULL);
ESP_LOGD(TAG, "Initializing esp_modem"); ESP_LOGD(TAG, "Initializing esp_modem");
/* Configure the PPP netif */
this->modem_netif_init(); this->modem_netif_init();
/* Configure the DTE */
this->dte_init(); this->dte_init();
/* Configure the DCE */
this->started_ = true; this->started_ = true;
} }
@ -104,35 +73,70 @@ void ModemComponent::loop() {
return; return;
} }
switch (this->state_) { switch (this->state_) {
case ModemComponentState::STOPPED: // The state of the beginning of power supply to the modem
this->set_state(ModemComponentState::TURNING_ON_POWER); case ModemComponentState::TURNING_ON_POWER:
break;
case ModemComponentState::TURNING_ON_POWER: // time_check_pwrkey
if (power_pin_) { if (power_pin_) {
this->power_pin_->digital_write(true); this->power_pin_->digital_write(true);
time_turn_on_modem = millis();
ESP_LOGD(TAG, "Modem turn on"); ESP_LOGD(TAG, "Modem turn on");
if (this->pwrkey_pin_) {
this->set_state(ModemComponentState::TURNING_ON_PWRKEY);
} else {
this->set_state(ModemComponentState::SYNC);
}
} else { } else {
ESP_LOGD(TAG, "Can't turn on modem power pin because it is not configured, go to turn on pwrkey"); ESP_LOGD(TAG, "Can't turn on modem power pin because it is not configured, go to turn on pwrkey");
this->turn_on_pwrkey(); this->set_state(ModemComponentState::TURNING_ON_PWRKEY);
} }
this->set_state(ModemComponentState::TURNING_ON_PWRKEY);
this->dce_init(); this->dce_init();
break; break;
// Modem power supply end state
case ModemComponentState::TURNING_OFF_POWER:
this->power_pin_->digital_write(false);
ESP_LOGD(TAG, "modem turn off");
this->set_state(ModemComponentState::TURNING_ON_POWER);
break;
// The state holds the power key
case ModemComponentState::TURNING_ON_PWRKEY: case ModemComponentState::TURNING_ON_PWRKEY:
if (pwrkey_pin_) { if (pwrkey_pin_) {
this->pwrkey_pin_->digital_write(false); this->pwrkey_pin_->digital_write(false);
ESP_LOGD(TAG, "pwrkey turn on"); ESP_LOGD(TAG, "pwrkey turn on");
this->set_state(ModemComponentState::TURNING_OFF_PWRKEY);
} else { } else {
ESP_LOGD(TAG, "Can't turn on pwrkey pin because it is not configured, go to reset modem"); ESP_LOGD(TAG, "Can't turn on pwrkey pin because it is not configured, go to reset power modem");
this->turn_on_reset(); // how do if reset dont work this->set_state(ModemComponentState::TURNING_ON_RESET);
break; break;
} }
this->set_state(ModemComponentState::TURNING_OFF_PWRKEY);
break; break;
// The state releases the power key
case ModemComponentState::TURNING_OFF_PWRKEY: case ModemComponentState::TURNING_OFF_PWRKEY:
this->turn_off_pwrkey(); this->pwrkey_pin_->digital_write(true);
ESP_LOGD(TAG, "pwrkey turn off");
this->set_state(ModemComponentState::SYNC);
break; break;
// The state of the beginning of the reset of the modem
case ModemComponentState::TURNING_ON_RESET:
if (reset_pin_) {
this->reset_pin_->digital_write(false);
ESP_LOGD(TAG, "turn on reset");
this->set_state(ModemComponentState::TURNING_OFF_RESET);
} else {
ESP_LOGD(TAG, "Can't turn on reset pin because it is not configured, go to turn on pwkey");
this->set_state(ModemComponentState::TURNING_ON_PWRKEY);
}
break;
// The state of the end of the reset of the modem
case ModemComponentState::TURNING_OFF_RESET:
this->reset_pin_->digital_write(true);
ESP_LOGD(TAG, "turn off reset");
this->set_state(ModemComponentState::SYNC);
break;
// The state of waiting for the modem to connect, response to "AT" "OK"
case ModemComponentState::SYNC: case ModemComponentState::SYNC:
if (this->dce->sync() == esp_modem::command_result::OK) { if (this->dce->sync() == esp_modem::command_result::OK) {
ESP_LOGD(TAG, "sync OK"); ESP_LOGD(TAG, "sync OK");
@ -142,45 +146,36 @@ void ModemComponent::loop() {
} }
break; break;
// The state of waiting for the modem to register in the network
case ModemComponentState::REGISTRATION_IN_NETWORK: case ModemComponentState::REGISTRATION_IN_NETWORK:
if (get_rssi()) { if (get_rssi()) {
ESP_LOGD(TAG, "Starting modem connection"); ESP_LOGD(TAG, "Starting modem connection");
ESP_LOGD(TAG, "SIgnal quality: rssi=%d", get_rssi()); ESP_LOGD(TAG, "SIgnal quality: rssi=%d", get_rssi());
this->set_state(ModemComponentState::CONNECTING); this->set_state(ModemComponentState::CONNECTING);
this->dce->set_data(); this->dce->set_data();
// this->start_connect_();
} else { } else {
ESP_LOGD(TAG, "Wait RSSI"); ESP_LOGD(TAG, "Wait RSSI");
} }
break; break;
// The state of waiting state for receiving IP address
case ModemComponentState::CONNECTING: case ModemComponentState::CONNECTING:
ESP_LOGD(TAG, "Wait WAN"); ESP_LOGD(TAG, "Wait WAN");
break; break;
// The state of network connection established
case ModemComponentState::CONNECTED: case ModemComponentState::CONNECTED:
if (time_info_print < now) { // ESP_LOGI(TAG, "voltage %dV.", get_modem_voltage() / 1000);
// ESP_LOGI(TAG, "voltage %dV.", get_modem_voltage() / 1000); if (esp_netif_is_netif_up(this->modem_netif_)) {
if (esp_netif_is_netif_up(this->modem_netif_)) { ESP_LOGD(TAG, "esp_netif_is_netif_UP");
ESP_LOGD(TAG, "esp_netif_is_netif_UP"); } else {
} else { ESP_LOGD(TAG, "esp_netif_is_netif_DOWN");
ESP_LOGD(TAG, "esp_netif_is_netif_DOWN");
}
time_info_print = now + 5000;
} }
break; break;
case ModemComponentState::TURNING_ON_RESET:
this->reset_pin_->digital_write(false); default:
this->set_state(ModemComponentState::TURNING_OFF_RESET);
break;
case ModemComponentState::TURNING_OFF_RESET:
this->reset_pin_->digital_write(true);
ESP_LOGD(TAG, "turn off reset");
this->set_state(ModemComponentState::SYNC);
break;
case ModemComponentState::TURNING_OFF_POWER:
if (time_turn_off_modem + TURN_OFF_MODEM_TIME < now) {
this->turn_on_modem();
}
break; break;
} }
} }
@ -214,16 +209,16 @@ void ModemComponent::dce_init() {
bool ModemComponent::check_modem_component_state_timings() { bool ModemComponent::check_modem_component_state_timings() {
const int now = millis(); const int now = millis();
ModemComponentStateTiming timing = this->modemComponentStateTimingMap[this->state_]; ModemComponentStateTiming timing = this->modemComponentStateTimingMap[this->state_];
if (timing.time_limit && ((time_change_state + timing.time_limit) < now)) { if (timing.time_limit && ((this->change_state_ + timing.time_limit) < now)) {
ESP_LOGE(TAG, "State time limit %s", this->state_to_string(this->state_)); ESP_LOGE(TAG, "State time limit %s", this->state_to_string(this->state_));
this->turn_on_reset(); this->turn_on_reset();
} }
if (!timing.poll_period) { if (!timing.poll_period) {
return true; return true;
} }
if ((last_pull_time + timing.poll_period) < now) { if ((this->pull_time_ + timing.poll_period) < now) {
// ESP_LOGD(TAG, "it's time for pull");//%d %d", timing.poll_period, timing.time_limit); // ESP_LOGD(TAG, "it's time for pull");//%d %d", timing.poll_period, timing.time_limit);
last_pull_time = now; this->pull_time_ = now;
return true; return true;
} }
return false; return false;
@ -233,19 +228,23 @@ void ModemComponent::set_state(ModemComponentState state) {
ESP_LOGCONFIG(TAG, "Modem component change state from %s to %s", this->state_to_string(this->state_), ESP_LOGCONFIG(TAG, "Modem component change state from %s to %s", this->state_to_string(this->state_),
this->state_to_string(state)); this->state_to_string(state));
this->state_ = state; this->state_ = state;
time_change_state = millis(); this->change_state_ = millis();
} }
const char *ModemComponent::state_to_string(ModemComponentState state) { const char *ModemComponent::state_to_string(ModemComponentState state) {
switch (state) { switch (state) {
case ModemComponentState::STOPPED:
return "STOPPED";
case ModemComponentState::TURNING_ON_POWER: case ModemComponentState::TURNING_ON_POWER:
return "TURNING_ON_POWER"; return "TURNING_ON_POWER";
case ModemComponentState::TURNING_OFF_POWER:
return "TURNING_OFF_POWER";
case ModemComponentState::TURNING_ON_PWRKEY: case ModemComponentState::TURNING_ON_PWRKEY:
return "TURNING_ON_PWRKEY"; return "TURNING_ON_PWRKEY";
case ModemComponentState::TURNING_OFF_PWRKEY: case ModemComponentState::TURNING_OFF_PWRKEY:
return "TURNING_OFF_PWRKEY"; return "TURNING_OFF_PWRKEY";
case ModemComponentState::TURNING_ON_RESET:
return "TURNING_ON_RESET";
case ModemComponentState::TURNING_OFF_RESET:
return "TURNING_OFF_RESET";
case ModemComponentState::SYNC: case ModemComponentState::SYNC:
return "SYNC"; return "SYNC";
case ModemComponentState::REGISTRATION_IN_NETWORK: case ModemComponentState::REGISTRATION_IN_NETWORK:
@ -254,59 +253,10 @@ const char *ModemComponent::state_to_string(ModemComponentState state) {
return "CONNECTING"; return "CONNECTING";
case ModemComponentState::CONNECTED: case ModemComponentState::CONNECTED:
return "CONNECTED"; return "CONNECTED";
case ModemComponentState::TURNING_ON_RESET:
return "TURNING_ON_RESET";
case ModemComponentState::TURNING_OFF_RESET:
return "TURNING_OFF_RESET";
case ModemComponentState::TURNING_OFF_POWER:
return "TURNING_OFF_POWER";
} }
return "UNKNOWN"; return "UNKNOWN";
} }
void ModemComponent::turn_on_modem() {
// if (power_pin_) {
// this->power_pin_->digital_write(true);
// time_turn_on_modem = millis();
// ESP_LOGD(TAG, "Modem turn on");
// this->set_state(ModemComponentState::TURNING_ON_POWER);
// } else {
// ESP_LOGD(TAG, "Can't turn on modem power pin because it is not configured, go to turn on pwrkey");
// this->turn_on_pwrkey();
// }
}
void ModemComponent::turn_off_modem() {
this->power_pin_->digital_write(true);
time_turn_off_modem = millis();
ESP_LOGD(TAG, "modem turn off");
this->set_state(ModemComponentState::STOPPED);
}
void ModemComponent::turn_on_pwrkey() {
// if (pwrkey_pin_) {
// this->pwrkey_pin_->digital_write(false);
// ESP_LOGD(TAG, "pwrkey turn on");
// this->set_state(ModemComponentState::TURNING_ON_PWRKEY);
// } else {
// ESP_LOGD(TAG, "Can't turn on pwrkey pin because it is not configured, go to reset modem");
// this->turn_on_reset();
// }
// vTaskDelay(pdMS_TO_TICKS(500)); // NOLINT
}
void ModemComponent::turn_off_pwrkey() {
ESP_LOGD(TAG, "pwrkey turn off");
this->pwrkey_pin_->digital_write(true);
this->set_state(ModemComponentState::SYNC);
}
void ModemComponent::turn_on_reset() {
this->reset_pin_->digital_write(false);
ESP_LOGD(TAG, "turn on reset");
this->set_state(ModemComponentState::TURNING_ON_RESET);
}
void ModemComponent::dump_config() { void ModemComponent::dump_config() {
this->dump_connect_params(); this->dump_connect_params();
ESP_LOGCONFIG(TAG, "Modem:"); ESP_LOGCONFIG(TAG, "Modem:");

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

@ -26,17 +26,16 @@ enum ModemType {
}; };
enum class ModemComponentState { enum class ModemComponentState {
STOPPED,
TURNING_ON_POWER, TURNING_ON_POWER,
TURNING_OFF_POWER,
TURNING_ON_PWRKEY, TURNING_ON_PWRKEY,
TURNING_OFF_PWRKEY, TURNING_OFF_PWRKEY,
TURNING_ON_RESET,
TURNING_OFF_RESET,
SYNC, SYNC,
REGISTRATION_IN_NETWORK, REGISTRATION_IN_NETWORK,
CONNECTING, CONNECTING,
CONNECTED, CONNECTED,
TURNING_ON_RESET,
TURNING_OFF_RESET,
TURNING_OFF_POWER,
}; };
struct ModemComponentStateTiming { struct ModemComponentStateTiming {
@ -76,17 +75,16 @@ class ModemComponent : public Component {
protected: protected:
std::map<ModemComponentState, ModemComponentStateTiming> modemComponentStateTimingMap = { std::map<ModemComponentState, ModemComponentStateTiming> modemComponentStateTimingMap = {
{ModemComponentState::STOPPED, ModemComponentStateTiming(0, 0)}, {ModemComponentState::TURNING_ON_POWER, ModemComponentStateTiming(2000, 0)},
{ModemComponentState::TURNING_ON_POWER, ModemComponentStateTiming(0, 0)}, {ModemComponentState::TURNING_OFF_POWER, ModemComponentStateTiming(2000, 0)},
{ModemComponentState::TURNING_ON_PWRKEY, ModemComponentStateTiming(0, 0)}, {ModemComponentState::TURNING_ON_PWRKEY, ModemComponentStateTiming(0, 0)},
{ModemComponentState::TURNING_OFF_PWRKEY, ModemComponentStateTiming(2000, 0)}, {ModemComponentState::TURNING_OFF_PWRKEY, ModemComponentStateTiming(2000, 0)},
{ModemComponentState::TURNING_ON_RESET, ModemComponentStateTiming(0, 0)},
{ModemComponentState::TURNING_OFF_RESET, ModemComponentStateTiming(2000, 0)},
{ModemComponentState::SYNC, ModemComponentStateTiming(2000, 15000)}, {ModemComponentState::SYNC, ModemComponentStateTiming(2000, 15000)},
{ModemComponentState::REGISTRATION_IN_NETWORK, ModemComponentStateTiming(2000, 15000)}, {ModemComponentState::REGISTRATION_IN_NETWORK, ModemComponentStateTiming(2000, 15000)},
{ModemComponentState::CONNECTING, ModemComponentStateTiming(2000, 15000)}, {ModemComponentState::CONNECTING, ModemComponentStateTiming(2000, 15000)},
{ModemComponentState::CONNECTED, ModemComponentStateTiming(0, 0)}, {ModemComponentState::CONNECTED, ModemComponentStateTiming(0, 0)},
{ModemComponentState::TURNING_ON_RESET, ModemComponentStateTiming(0, 0)},
{ModemComponentState::TURNING_OFF_RESET, ModemComponentStateTiming(2000, 0)},
{ModemComponentState::TURNING_OFF_POWER, ModemComponentStateTiming(2000, 0)},
}; };
static void got_ip_event_handler(void *arg, esp_event_base_t event_base, int event_id, void *event_data); static void got_ip_event_handler(void *arg, esp_event_base_t event_base, int event_id, void *event_data);
@ -95,11 +93,6 @@ class ModemComponent : public Component {
void dce_init(); void dce_init();
bool check_modem_component_state_timings(); bool check_modem_component_state_timings();
void turn_on_modem();
void turn_off_modem();
void turn_on_pwrkey();
void turn_off_pwrkey();
void turn_on_reset();
int get_rssi(); int get_rssi();
int get_modem_voltage(); int get_modem_voltage();
const char *get_state(); const char *get_state();
@ -122,12 +115,12 @@ class ModemComponent : public Component {
int uart_tx_buffer_size_{0}; int uart_tx_buffer_size_{0};
int uart_rx_buffer_size_{0}; int uart_rx_buffer_size_{0};
int pull_time_{0}; uint pull_time_{0};
int change_state_{0}; uint change_state_{0};
bool started_{false}; bool started_{false};
ModemComponentState state_{ModemComponentState::STOPPED}; ModemComponentState state_{ModemComponentState::TURNING_ON_POWER};
int connect_begin_; int connect_begin_;
esp_netif_t *modem_netif_{nullptr}; esp_netif_t *modem_netif_{nullptr};
// esp_eth_phy_t *phy_{nullptr}; // esp_eth_phy_t *phy_{nullptr};