sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-31 07:03:55 +00:00
Code Issues Releases Wiki Activity

using other configs from yaml in c++ code from

Browse Source
This commit is contained in:
Alexandr Pyslar
2024-10-02 09:25:16 +00:00
parent d662f7995a
commit 25af4bc2bd
3 changed files with 217 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
esphome/components/modem/__init__.py
View File

@@ -1,21 +1,19 @@
from esphome import pins from esphome import pins
import esphome.config_validation as cv
import esphome.codegen as cg import esphome.codegen as cg
from esphome.components.esp32 import add_idf_component, add_idf_sdkconfig_option
import esphome.config_validation as cv
from esphome.const import ( from esphome.const import (
CONF_DOMAIN, CONF_DOMAIN,
CONF_ID, CONF_ID,
CONF_TYPE,
CONF_RESET_PIN, CONF_RESET_PIN,
CONF_RX_BUFFER_SIZE, CONF_RX_BUFFER_SIZE,
CONF_RX_PIN, CONF_RX_PIN,
CONF_TX_BUFFER_SIZE, CONF_TX_BUFFER_SIZE,
CONF_TX_PIN, CONF_TX_PIN,
CONF_TYPE,
CONF_USE_ADDRESS, CONF_USE_ADDRESS,
) )
from esphome.core import CORE, coroutine_with_priority from esphome.core import CORE, coroutine_with_priority
from esphome.components.esp32 import add_idf_component, add_idf_sdkconfig_option
from esphome.components.network import IPAddress
CONFLICTS_WITH = ["wifi", "ethernet"] CONFLICTS_WITH = ["wifi", "ethernet"]
DEPENDENCIES = ["esp32"] DEPENDENCIES = ["esp32"]
@@ -68,6 +66,7 @@ def _validate(config):
config[CONF_USE_ADDRESS] = use_address config[CONF_USE_ADDRESS] = use_address
return config return config
CONFIG_SCHEMA = cv.Schema( CONFIG_SCHEMA = cv.Schema(
{ {
cv.GenerateID(): cv.declare_id(ModemComponent), cv.GenerateID(): cv.declare_id(ModemComponent),
@@ -76,7 +75,9 @@ CONFIG_SCHEMA = cv.Schema(
cv.Required(CONF_TX_PIN): pins.internal_gpio_output_pin_number, cv.Required(CONF_TX_PIN): pins.internal_gpio_output_pin_number,
cv.Required(CONF_RX_PIN): pins.internal_gpio_output_pin_number, cv.Required(CONF_RX_PIN): pins.internal_gpio_output_pin_number,
cv.Optional(CONF_APN, default="internet"): cv.string, cv.Optional(CONF_APN, default="internet"): cv.string,
cv.Optional(CONF_UART_EVENT_TASK_STACK_SIZE, default=2048): cv.positive_not_null_int, cv.Optional(
CONF_UART_EVENT_TASK_STACK_SIZE, default=2048
): cv.positive_not_null_int,
cv.Optional(CONF_UART_EVENT_TASK_PRIORITY, default=5): cv.positive_not_null_int, cv.Optional(CONF_UART_EVENT_TASK_PRIORITY, default=5): cv.positive_not_null_int,
cv.Optional(CONF_UART_EVENT_QUEUE_SIZE, default=30): cv.positive_not_null_int, cv.Optional(CONF_UART_EVENT_QUEUE_SIZE, default=30): cv.positive_not_null_int,
cv.Optional(CONF_TX_BUFFER_SIZE, default=512): cv.positive_not_null_int, cv.Optional(CONF_TX_BUFFER_SIZE, default=512): cv.positive_not_null_int,
@@ -86,23 +87,23 @@ CONFIG_SCHEMA = cv.Schema(
} }
).extend(cv.COMPONENT_SCHEMA) ).extend(cv.COMPONENT_SCHEMA)
@coroutine_with_priority(60.0) @coroutine_with_priority(60.0)
async def to_code(config): async def to_code(config):
var = cg.new_Pvariable(config[CONF_ID]) var = cg.new_Pvariable(config[CONF_ID])
await cg.register_component(var, config) await cg.register_component(var, config)
cg.add(var.set_type(config[CONF_TYPE])) cg.add(var.set_type(config[CONF_TYPE]))
# cg.add(var.set_reset_pin(config[CONF_RESET_PIN]))
# cg.add(var.set_tx_pin(config[CONF_TX_PIN]))
# cg.add(var.set_rx_pin(config[CONF_RX_PIN]))
# cg.add(var.set_apn(config[CONF_APN]))
# cg.add(var.set_tx_buffer_size(config[CONF_TX_BUFFER_SIZE]))
# cg.add(var.set_rx_buffer_size(config[CONF_RX_BUFFER_SIZE]))
# cg.add(var.set_uart_event_task_stack_size(config[CONF_UART_EVENT_TASK_STACK_SIZE]))
# cg.add(var.set_uart_event_task_priority(config[CONF_UART_EVENT_TASK_PRIORITY]))
# cg.add(var.set_uart_event_queue_size([CONF_UART_EVENT_QUEUE_SIZE]))
# cg.add(var.set_use_address(config[CONF_USE_ADDRESS]))
cg.add(var.set_reset_pin(config[CONF_RESET_PIN])) cg.add(var.set_reset_pin(config[CONF_RESET_PIN]))
cg.add(var.set_tx_pin(config[CONF_TX_PIN]))
cg.add(var.set_rx_pin(config[CONF_RX_PIN]))
cg.add(var.set_apn(config[CONF_APN]))
cg.add(var.set_uart_tx_buffer_size(config[CONF_TX_BUFFER_SIZE]))
cg.add(var.set_uart_rx_buffer_size(config[CONF_RX_BUFFER_SIZE]))
cg.add(var.set_uart_event_task_stack_size(config[CONF_UART_EVENT_TASK_STACK_SIZE]))
cg.add(var.set_uart_event_task_priority(config[CONF_UART_EVENT_TASK_PRIORITY]))
cg.add(var.set_uart_event_queue_size(config[CONF_UART_EVENT_QUEUE_SIZE]))
cg.add(var.set_use_address(config[CONF_USE_ADDRESS]))
cg.add_define("USE_MODEM") cg.add_define("USE_MODEM")

78
esphome/components/modem/modem_component.cpp
View File

@@ -1,12 +1,11 @@
#define CONFIG_MODEM_PPP_APN "internet" // #define CONFIG_MODEM_PPP_APN "internet"
#define CONFIG_MODEM_UART_TX_PIN 25 // #define CONFIG_MODEM_UART_TX_PIN 25
#define CONFIG_MODEM_UART_RX_PIN 26 // #define CONFIG_MODEM_UART_RX_PIN 26
#define CONFIG_MODEM_UART_EVENT_TASK_STACK_SIZE 2048 // #define CONFIG_MODEM_UART_EVENT_TASK_STACK_SIZE 2048
#define CONFIG_MODEM_UART_EVENT_TASK_PRIORITY 5 // #define CONFIG_MODEM_UART_EVENT_TASK_PRIORITY 5
#define CONFIG_MODEM_UART_EVENT_QUEUE_SIZE 30 // #define CONFIG_MODEM_UART_EVENT_QUEUE_SIZE 30
#define CONFIG_MODEM_UART_TX_BUFFER_SIZE 512 // #define CONFIG_MODEM_UART_TX_BUFFER_SIZE 512
#define CONFIG_MODEM_UART_RX_BUFFER_SIZE 1024 // #define CONFIG_MODEM_UART_RX_BUFFER_SIZE 1024
#include "esp_modem_c_api_types.h" #include "esp_modem_c_api_types.h"
#include "esp_netif_ppp.h" #include "esp_netif_ppp.h"
@@ -25,7 +24,6 @@
#include <lwip/dns.h> #include <lwip/dns.h>
#include "esp_event.h" #include "esp_event.h"
std::shared_ptr<esp_modem::DTE> dte{nullptr}; std::shared_ptr<esp_modem::DTE> dte{nullptr};
std::unique_ptr<esp_modem::DCE> dce{nullptr}; std::unique_ptr<esp_modem::DCE> dce{nullptr};
@@ -67,8 +65,7 @@ void print_netif_flags(esp_netif_flags_t flags) {
} }
#include "driver/gpio.h" #include "driver/gpio.h"
void ModemComponent::esp_modem_hard_reset() void ModemComponent::esp_modem_hard_reset() {
{
gpio_set_direction(gpio_num_t(this->reset_pin_), GPIO_MODE_OUTPUT); gpio_set_direction(gpio_num_t(this->reset_pin_), GPIO_MODE_OUTPUT);
// gpio_pullup_en(reset_pin_); // gpio_pullup_en(reset_pin_);
gpio_set_level(gpio_num_t(this->reset_pin_), 0); gpio_set_level(gpio_num_t(this->reset_pin_), 0);
@@ -102,7 +99,6 @@ int get_modem_voltage(){
// setup // setup
void ModemComponent::setup() { void ModemComponent::setup() {
esp_log_level_set("esp-netif_lwip-ppp", ESP_LOG_VERBOSE); esp_log_level_set("esp-netif_lwip-ppp", ESP_LOG_VERBOSE);
esp_log_level_set("esp-netif_lwip", ESP_LOG_VERBOSE); esp_log_level_set("esp-netif_lwip", ESP_LOG_VERBOSE);
esp_log_level_set("modem", ESP_LOG_VERBOSE); esp_log_level_set("modem", ESP_LOG_VERBOSE);
@@ -110,7 +106,6 @@ void ModemComponent::setup() {
esp_log_level_set("command_lib", ESP_LOG_VERBOSE); esp_log_level_set("command_lib", ESP_LOG_VERBOSE);
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...");
esp_modem_hard_reset(); esp_modem_hard_reset();
if (esp_reset_reason() != ESP_RST_DEEPSLEEP) { if (esp_reset_reason() != ESP_RST_DEEPSLEEP) {
@@ -130,7 +125,7 @@ void ModemComponent::setup() {
/* Configure the PPP netif */ /* Configure the PPP netif */
esp_modem_dce_config_t dce_config = ESP_MODEM_DCE_DEFAULT_CONFIG(CONFIG_MODEM_PPP_APN); esp_modem_dce_config_t dce_config = ESP_MODEM_DCE_DEFAULT_CONFIG(this->apn_.c_str());
esp_netif_config_t netif_ppp_config = ESP_NETIF_DEFAULT_PPP(); esp_netif_config_t netif_ppp_config = ESP_NETIF_DEFAULT_PPP();
this->modem_netif_ = esp_netif_new(&netif_ppp_config); this->modem_netif_ = esp_netif_new(&netif_ppp_config);
// esp_netif_t *esp_netif = esp_netif_new(&netif_ppp_config); // esp_netif_t *esp_netif = esp_netif_new(&netif_ppp_config);
@@ -141,21 +136,20 @@ void ModemComponent::setup() {
/* Configure the DTE */ /* Configure the DTE */
esp_modem_dte_config_t dte_config = ESP_MODEM_DTE_DEFAULT_CONFIG(); esp_modem_dte_config_t dte_config = ESP_MODEM_DTE_DEFAULT_CONFIG();
/* setup UART specific configuration based on kconfig options */ /* setup UART specific configuration based on kconfig options */
dte_config.uart_config.tx_io_num = CONFIG_MODEM_UART_TX_PIN; dte_config.uart_config.tx_io_num = this->tx_pin_;
dte_config.uart_config.rx_io_num = CONFIG_MODEM_UART_RX_PIN; dte_config.uart_config.rx_io_num = this->rx_pin_;
dte_config.uart_config.rx_buffer_size = CONFIG_MODEM_UART_RX_BUFFER_SIZE; dte_config.uart_config.rx_buffer_size = this->uart_rx_buffer_size_;
dte_config.uart_config.tx_buffer_size = CONFIG_MODEM_UART_TX_BUFFER_SIZE; dte_config.uart_config.tx_buffer_size = this->uart_tx_buffer_size_;
dte_config.uart_config.event_queue_size = CONFIG_MODEM_UART_EVENT_QUEUE_SIZE; dte_config.uart_config.event_queue_size = this->uart_event_queue_size_;
dte_config.task_stack_size = CONFIG_MODEM_UART_EVENT_TASK_STACK_SIZE; dte_config.task_stack_size = this->uart_event_task_stack_size_;
dte_config.task_priority = CONFIG_MODEM_UART_EVENT_TASK_PRIORITY; dte_config.task_priority = this->uart_event_task_priority_;
dte_config.dte_buffer_size = CONFIG_MODEM_UART_RX_BUFFER_SIZE / 2; dte_config.dte_buffer_size = this->uart_rx_buffer_size_ / 2;
ESP_LOGD(TAG, "Initializing esp_modem"); ESP_LOGD(TAG, "Initializing esp_modem");
dte = esp_modem::create_uart_dte(&dte_config); dte = esp_modem::create_uart_dte(&dte_config);
// esp_modem_dce_t *dce = esp_modem_new_dev(ESP_MODEM_DCE_SIM800, &dte_config, &dce_config, this->modem_netif_); // esp_modem_dce_t *dce = esp_modem_new_dev(ESP_MODEM_DCE_SIM800, &dte_config, &dce_config, this->modem_netif_);
dce = esp_modem::create_SIM800_dce(&dce_config, dte, this->modem_netif_); dce = esp_modem::create_SIM800_dce(&dce_config, dte, this->modem_netif_);
xEventGroupClearBits(event_group, CONNECT_BIT | GOT_DATA_BIT | USB_DISCONNECTED_BIT); xEventGroupClearBits(event_group, CONNECT_BIT | GOT_DATA_BIT | USB_DISCONNECTED_BIT);
/* Run the modem demo app */ /* Run the modem demo app */
// return; // return;
@@ -163,7 +157,6 @@ void ModemComponent::setup() {
esp_netif_flags_t flags = esp_netif_get_flags(this->modem_netif_); esp_netif_flags_t flags = esp_netif_get_flags(this->modem_netif_);
print_netif_flags(flags); print_netif_flags(flags);
// set data mode // set data mode
// dce->set_data(); // dce->set_data();
@@ -174,22 +167,18 @@ void ModemComponent::setup() {
// vTaskDelay(15000); // vTaskDelay(15000);
} }
void ModemComponent::loop() { void ModemComponent::loop() {
const uint32_t now = millis(); const uint32_t now = millis();
if (time_info_print < now) { if (time_info_print < now) {
// ESP_LOGI(TAG, "voltage %dV.", get_modem_voltage()/1000); // ESP_LOGI(TAG, "voltage %dV.", get_modem_voltage()/1000);
ESP_LOGD(TAG, "esp_netif_is_netif_UP"); ESP_LOGD(TAG, "esp_netif_is_netif_UP");
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; time_info_print = now + 5000;
switch (this->state_) switch (this->state_) {
{
case ModemComponentState::STOPPED: case ModemComponentState::STOPPED:
ESP_LOGD(TAG, "modem STOPPED"); ESP_LOGD(TAG, "modem STOPPED");
break; break;
@@ -208,7 +197,6 @@ void ModemComponent::loop() {
this->started_ = true; this->started_ = true;
switch (this->state_) { switch (this->state_) {
case ModemComponentState::STOPPED: case ModemComponentState::STOPPED:
if (time_check_rssi + TIME_TO_START_MODEM < now) { if (time_check_rssi + TIME_TO_START_MODEM < now) {
@@ -261,7 +249,6 @@ void ModemComponent::loop() {
} }
} }
float ModemComponent::get_setup_priority() const { return setup_priority::WIFI; } float ModemComponent::get_setup_priority() const { return setup_priority::WIFI; }
bool ModemComponent::can_proceed() { return this->is_connected(); } bool ModemComponent::can_proceed() { return this->is_connected(); }
@@ -299,8 +286,7 @@ void ModemComponent::modem_event_handler(void *arg, esp_event_base_t event_base,
ESP_LOGV(TAG, "[Modem event] %s (num=%" PRId32 ")", event_name, event); ESP_LOGV(TAG, "[Modem event] %s (num=%" PRId32 ")", event_name, event);
} }
void ModemComponent::got_ip_event_handler(void *arg, esp_event_base_t event_base, int32_t event_id, void ModemComponent::got_ip_event_handler(void *arg, esp_event_base_t event_base, int32_t event_id, void *event_data) {
void *event_data) {
xEventGroupSetBits(event_group, CONNECT_BIT); xEventGroupSetBits(event_group, CONNECT_BIT);
global_modem_component->connected_ = true; global_modem_component->connected_ = true;
global_modem_component->state_ = ModemComponentState::CONNECTED; global_modem_component->state_ = ModemComponentState::CONNECTED;
@@ -329,10 +315,8 @@ void ModemComponent::got_ip_event_handler(void *arg, esp_event_base_t event_base
ESP_LOGD(TAG, "Modem Disconnect from PPP Server"); ESP_LOGD(TAG, "Modem Disconnect from PPP Server");
global_modem_component->state_ = ModemComponentState::STOPPED; global_modem_component->state_ = ModemComponentState::STOPPED;
} }
} }
void ModemComponent::start_connect_() { void ModemComponent::start_connect_() {
this->connect_begin_ = millis(); this->connect_begin_ = millis();
this->status_set_warning(); this->status_set_warning();
@@ -343,7 +327,6 @@ void ModemComponent::start_connect_() {
ESP_LOGD(TAG, "esp_netif_set_hostname failed: %s", esp_err_to_name(err)); ESP_LOGD(TAG, "esp_netif_set_hostname failed: %s", esp_err_to_name(err));
} }
// esp_netif_dhcp_status_t status = ESP_NETIF_DHCP_INIT; // esp_netif_dhcp_status_t status = ESP_NETIF_DHCP_INIT;
// restart ppp connection // restart ppp connection
@@ -367,7 +350,24 @@ bool ModemComponent::is_connected() { return this->state_ == ModemComponentState
void ModemComponent::set_power_pin(int power_pin) { this->power_pin_ = power_pin; } void ModemComponent::set_power_pin(int power_pin) { this->power_pin_ = power_pin; }
void ModemComponent::set_type(ModemType type) { this->type_ = type; } void ModemComponent::set_type(ModemType type) { this->type_ = type; }
void ModemComponent::set_reset_pin(int reset_pin) { this->reset_pin_ = reset_pin; } void ModemComponent::set_reset_pin(int reset_pin) { this->reset_pin_ = reset_pin; }
void ModemComponent::set_apn(const std::string &apn) { this->apn_ = apn; }
void ModemComponent::set_tx_pin(int tx_pin) { this->tx_pin_ = tx_pin; }
void ModemComponent::set_rx_pin(int rx_pin) { this->rx_pin_ = rx_pin; }
void ModemComponent::set_uart_event_task_stack_size(int uart_event_task_stack_size) {
this->uart_event_task_stack_size_ = uart_event_task_stack_size;
}
void ModemComponent::set_uart_event_task_priority(int uart_event_task_priority) {
this->uart_event_task_priority_ = uart_event_task_priority;
}
void ModemComponent::set_uart_event_queue_size(int uart_event_queue_size) {
this->uart_event_queue_size_ = uart_event_queue_size;
}
void ModemComponent::set_uart_tx_buffer_size(int uart_tx_buffer_size) {
this->uart_tx_buffer_size_ = uart_tx_buffer_size;
}
void ModemComponent::set_uart_rx_buffer_size(int uart_rx_buffer_size) {
this->uart_rx_buffer_size_ = uart_rx_buffer_size;
}
std::string ModemComponent::get_use_address() const { std::string ModemComponent::get_use_address() const {
if (this->use_address_.empty()) { if (this->use_address_.empty()) {

23
esphome/components/modem/modem_component.h
View File

@@ -47,8 +47,14 @@ class ModemComponent : public Component {
void set_power_pin(int power_pin); void set_power_pin(int power_pin);
void set_type(ModemType type); void set_type(ModemType type);
void set_reset_pin(int reset_pin); void set_reset_pin(int reset_pin);
//void set_clk_mode(emac_rmii_clock_mode_t clk_mode, emac_rmii_clock_gpio_t clk_gpio); void set_apn(const std::string &apn);
//void set_manual_ip(const ManualIP &manual_ip); void set_tx_pin(int tx_pin);
void set_rx_pin(int rx_pin);
void set_uart_event_task_stack_size(int uart_event_task_stack_size);
void set_uart_event_task_priority(int uart_event_task_priority);
void set_uart_event_queue_size(int uart_event_queue_size);
void set_uart_tx_buffer_size(int uart_tx_buffer_size);
void set_uart_rx_buffer_size(int uart_rx_buffer_size);
network::IPAddress get_ip_address(); network::IPAddress get_ip_address();
std::string get_use_address() const; std::string get_use_address() const;
@@ -62,11 +68,18 @@ class ModemComponent : public Component {
void start_connect_(); void start_connect_();
void esp_modem_hard_reset(); void esp_modem_hard_reset();
std::string use_address_; ModemType type_{MODEM_TYPE_UNKNOWN};
int power_pin_{-1}; int power_pin_{-1};
int reset_pin_{-1}; int reset_pin_{-1};
ModemType type_{MODEM_TYPE_UNKNOWN}; int tx_pin_{-1};
optional<ManualIP> manual_ip_{}; int rx_pin_{-1};
std::string apn_{""};
std::string use_address_;
int uart_event_task_stack_size_{0};
int uart_event_task_priority_{0};
int uart_event_queue_size_{0};
int uart_tx_buffer_size_{0};
int uart_rx_buffer_size_{0};
bool started_{false}; bool started_{false};
bool connected_{false}; bool connected_{false};