Skip to content

Fixed crashing on ESP-C6 / ESP-IDV v5.5.1 #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JarrettR wants to merge 2 commits into
base: release/v4.1
Choose a base branch
from
Open

Fixed crashing on ESP-C6 / ESP-IDV v5.5.1 #210

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7962eb9
hotfix to solve esp-idf 5.3 compatibily with ESP32-C3
siteswapjuggler Mar 25, 2025
20848b9
Switched to native UART config where possible
JarrettR Sep 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 29 additions & 26 deletions src/dmx/hal/uart.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ static struct dmx_uart_t {
} dmx_uart_context[DMX_NUM_MAX] = {
{.num = 0, .dev = UART_LL_GET_HW(0)},
{.num = 1, .dev = UART_LL_GET_HW(1)},
#if SOC_UART_NUM > 2
#if DMX_NUM_MAX > 2
{.num = 2, .dev = UART_LL_GET_HW(2)},
#endif
};
Expand Down Expand Up @@ -327,43 +327,42 @@ static void DMX_ISR_ATTR dmx_uart_isr(void *arg) {
bool dmx_uart_init(dmx_port_t dmx_num, void *isr_context, int isr_flags) {
struct dmx_uart_t *uart = &dmx_uart_context[dmx_num];

periph_module_enable(uart_periph_signal[dmx_num].module);
#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0)
periph_module_enable(PERIPH_UART0_MODULE+dmx_num);
#else
periph_module_enable(uart_periph_signal[dmx_num].module);
#endif
if (dmx_num != 0) { // Default UART port for console
#if SOC_UART_REQUIRE_CORE_RESET
// ESP32C3 workaround to prevent UART outputting garbage data
uart_ll_set_reset_core(uart->dev, true);
#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0)
periph_module_reset(PERIPH_UART0_MODULE+dmx_num);
#else
periph_module_reset(uart_periph_signal[dmx_num].module);
#endif
uart_ll_set_reset_core(uart->dev, false);
#else
#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0)
periph_module_reset(PERIPH_UART0_MODULE+dmx_num);
#else
periph_module_reset(uart_periph_signal[dmx_num].module);
#endif
#endif
}
#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
uint32_t sclk_freq;
#if CONFIG_IDF_TARGET_ESP32C6
// UART2 on C6 is a LP UART, with fixed GPIO pins for tx, rx, and rts
if (dmx_num == 2) {
LP_CLKRST.lpperi.lp_uart_clk_sel = 0; // Use LP_UART_SCLK_LP_FAST
} else {
uart_ll_set_sclk(uart->dev, UART_SCLK_DEFAULT);
}
uart_get_sclk_freq(UART_SCLK_DEFAULT, &sclk_freq);
#else
uart_ll_set_sclk(uart->dev, UART_SCLK_DEFAULT);
uart_get_sclk_freq(UART_SCLK_DEFAULT, &sclk_freq);
#endif
uart_ll_set_baudrate(uart->dev, DMX_BAUD_RATE, sclk_freq);
#else
uart_ll_set_sclk(uart->dev, UART_SCLK_APB);
uart_ll_set_baudrate(uart->dev, DMX_BAUD_RATE);
#endif
uart_ll_set_mode(uart->dev, UART_MODE_UART);
uart_ll_set_parity(uart->dev, UART_PARITY_DISABLE);
uart_ll_set_data_bit_num(uart->dev, UART_DATA_8_BITS);
uart_ll_set_stop_bits(uart->dev, UART_STOP_BITS_2);


uart_config_t uart_config = {
.baud_rate = 250000,
.data_bits = UART_DATA_8_BITS,
.parity = UART_PARITY_DISABLE,
.stop_bits = UART_STOP_BITS_2,
.flow_ctrl = UART_HW_FLOWCTRL_DISABLE,
.source_clk = UART_SCLK_DEFAULT,
};
ESP_ERROR_CHECK(uart_param_config(uart->num, &uart_config));
uart_ll_tx_break(uart->dev, 0);
uart_ll_set_tx_idle_num(uart->dev, 0);
uart_ll_set_hw_flow_ctrl(uart->dev, UART_HW_FLOWCTRL_DISABLE, 0);
uart_ll_set_txfifo_empty_thr(uart->dev, DMX_UART_EMPTY_DEFAULT);
uart_ll_set_rxfifo_full_thr(uart->dev, DMX_UART_FULL_DEFAULT);

Expand All @@ -381,7 +380,11 @@ bool dmx_uart_init(dmx_port_t dmx_num, void *isr_context, int isr_flags) {
void dmx_uart_deinit(dmx_port_t dmx_num) {
struct dmx_uart_t *uart = &dmx_uart_context[dmx_num];
if (uart->num != 0) { // Default UART port for console
#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0)
periph_module_disable(PERIPH_UART1_MODULE+dmx_num);
#else
periph_module_disable(uart_periph_signal[uart->num].module);
#endif
}
}

Expand Down