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

Support advanced UART customization (#4465)

Browse source 
* Add methods to get hardware uart details.

* Fix `setRxBufferSize` error.

---------

Co-authored-by: Your Name <you@example.com>
This commit is contained in:
Fabian 2023-03-31 06:30:24 +02:00 committed by GitHub
parent 79f861f012
commit 9922eb83e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
esphome/components/uart/uart_component_esp32_arduino.cpp
View file

@ -100,8 +100,8 @@ void ESP32ArduinoUARTComponent::setup() {
invert = true; invert = true;
if (rx_pin_ != nullptr && rx_pin_->is_inverted()) if (rx_pin_ != nullptr && rx_pin_->is_inverted())
invert = true; invert = true;
this->hw_serial_->begin(this->baud_rate_, get_config(), rx, tx, invert);
this->hw_serial_->setRxBufferSize(this->rx_buffer_size_); this->hw_serial_->setRxBufferSize(this->rx_buffer_size_);
this->hw_serial_->begin(this->baud_rate_, get_config(), rx, tx, invert);
} }
void ESP32ArduinoUARTComponent::dump_config() { void ESP32ArduinoUARTComponent::dump_config() {

3
esphome/components/uart/uart_component_esp32_arduino.h
View file

@ -28,6 +28,9 @@ class ESP32ArduinoUARTComponent : public UARTComponent, public Component {
uint32_t get_config(); uint32_t get_config();
HardwareSerial *get_hw_serial() { return this->hw_serial_; }
uint8_t get_hw_serial_number() { return this->number_; }
protected: protected:
void check_logger_conflict() override; void check_logger_conflict() override;

7
esphome/components/uart/uart_component_esp_idf.cpp
View file

@ -79,7 +79,12 @@ void IDFUARTComponent::setup() {
return; return;
} }
err = uart_driver_install(this->uart_num_, this->rx_buffer_size_, 0, 0, nullptr, 0); err = uart_driver_install(this->uart_num_, /* UART RX ring buffer size. */ this->rx_buffer_size_,
/* UART TX ring buffer size. If set to zero, driver will not use TX buffer, TX function will
block task until all data have been sent out.*/
0,
/* UART event queue size/depth. */ 20, &(this->uart_event_queue_),
/* Flags used to allocate the interrupt. */ 0);
if (err != ESP_OK) { if (err != ESP_OK) {
ESP_LOGW(TAG, "uart_driver_install failed: %s", esp_err_to_name(err)); ESP_LOGW(TAG, "uart_driver_install failed: %s", esp_err_to_name(err));
this->mark_failed(); this->mark_failed();

4
esphome/components/uart/uart_component_esp_idf.h
View file

@ -23,9 +23,13 @@ class IDFUARTComponent : public UARTComponent, public Component {
int available() override; int available() override;
void flush() override; void flush() override;
uint8_t get_hw_serial_number() { return this->uart_num_; }
QueueHandle_t *get_uart_event_queue() { return &this->uart_event_queue_; }
protected: protected:
void check_logger_conflict() override; void check_logger_conflict() override;
uart_port_t uart_num_; uart_port_t uart_num_;
QueueHandle_t uart_event_queue_;
uart_config_t get_config_(); uart_config_t get_config_();
SemaphoreHandle_t lock_; SemaphoreHandle_t lock_;

3
esphome/components/uart/uart_component_rp2040.h
View file

@ -30,6 +30,9 @@ class RP2040UartComponent : public UARTComponent, public Component {
uint16_t get_config(); uint16_t get_config();
bool is_hw_serial() { return this->hw_serial_; }
HardwareSerial *get_hw_serial() { return this->serial_; }
protected: protected:
void check_logger_conflict() override {} void check_logger_conflict() override {}
bool hw_serial_{false}; bool hw_serial_{false};