@@ -666,24 +666,16 @@ uart_t *uartBegin(
666
666
uart_config .baud_rate = baudrate ;
667
667
#if SOC_UART_LP_NUM >= 1
668
668
if (uart_nr >= SOC_UART_HP_NUM ) { // it is a LP UART NUM
669
- #if !(CONFIG_ARDUINO_SERIAL_FORCE_IDF_DEFAULT_CLOCK_SOURCE )
670
669
if (uart -> _uart_clock_source > 0 ) {
671
670
uart_config .lp_source_clk = (soc_periph_lp_uart_clk_src_t ) uart -> _uart_clock_source ; // use user defined LP UART clock
672
671
log_v ("Setting UART%d to user defined LP clock source (%d) " , uart_nr , uart -> _uart_clock_source );
673
- } else
674
- #endif
675
- {
672
+ } else {
676
673
uart_config .lp_source_clk = LP_UART_SCLK_DEFAULT ; // use default LP clock
677
674
log_v ("Setting UART%d to Default LP clock source" , uart_nr );
678
675
}
679
676
} else
680
677
#endif // SOC_UART_LP_NUM >= 1
681
678
{
682
- #if CONFIG_ARDUINO_SERIAL_FORCE_IDF_DEFAULT_CLOCK_SOURCE
683
- // Default CLK Source: CLK_APB for ESP32|S2|S3|C3 -- CLK_PLL_F40M for C2 -- CLK_PLL_F48M for H2 -- CLK_PLL_F80M for C6|P4
684
- uart_config .source_clk = UART_SCLK_DEFAULT ; // baudrate may change with the APB Frequency!
685
- log_v ("Setting UART%d to use DEFAULT clock" , uart_nr );
686
- #else
687
679
if (uart -> _uart_clock_source >= 0 ) {
688
680
uart_config .source_clk = (soc_module_clk_t ) uart -> _uart_clock_source ; // use user defined HP UART clock
689
681
log_v ("Setting UART%d to user defined HP clock source (%d) " , uart_nr , uart -> _uart_clock_source );
@@ -707,7 +699,6 @@ uart_t *uartBegin(
707
699
log_v ("Setting UART%d to use DEFAULT clock" , uart_nr );
708
700
#endif // SOC_UART_SUPPORT_XTAL_CLK
709
701
}
710
- #endif // CONFIG_ARDUINO_SERIAL_FORCE_IDF_DEFAULT_CLOCK_SOURCE
711
702
}
712
703
713
704
UART_MUTEX_LOCK ();
@@ -1007,24 +998,16 @@ bool uartSetBaudRate(uart_t *uart, uint32_t baud_rate) {
1007
998
int8_t previousClkSrc = uart -> _uart_clock_source ;
1008
999
#if SOC_UART_LP_NUM >= 1
1009
1000
if (uart -> num >= SOC_UART_HP_NUM ) { // it is a LP UART NUM
1010
- #if !(CONFIG_ARDUINO_SERIAL_FORCE_IDF_DEFAULT_CLOCK_SOURCE )
1011
1001
if (uart -> _uart_clock_source > 0 ) {
1012
1002
newClkSrc = (soc_periph_lp_uart_clk_src_t ) uart -> _uart_clock_source ; // use user defined LP UART clock
1013
1003
log_v ("Setting UART%d to user defined LP clock source (%d) " , uart -> num , newClkSrc );
1014
- } else
1015
- #endif
1016
- {
1004
+ } else {
1017
1005
newClkSrc = LP_UART_SCLK_DEFAULT ; // use default LP clock
1018
1006
log_v ("Setting UART%d to Default LP clock source" , uart -> num );
1019
1007
}
1020
1008
} else
1021
1009
#endif // SOC_UART_LP_NUM >= 1
1022
1010
{
1023
- #if CONFIG_ARDUINO_SERIAL_FORCE_IDF_DEFAULT_CLOCK_SOURCE
1024
- // Default CLK Source: CLK_APB for ESP32|S2|S3|C3 -- CLK_PLL_F40M for C2 -- CLK_PLL_F48M for H2 -- CLK_PLL_F80M for C6|P4
1025
- // newClkSrc already set in the variable declaration
1026
- log_v ("Setting UART%d to use DEFAULT clock" , uart -> num );
1027
- #else
1028
1011
if (uart -> _uart_clock_source >= 0 ) {
1029
1012
newClkSrc = (soc_module_clk_t ) uart -> _uart_clock_source ; // use user defined HP UART clock
1030
1013
log_v ("Setting UART%d to use HP clock source (%d) " , uart -> num , newClkSrc );
@@ -1048,7 +1031,6 @@ bool uartSetBaudRate(uart_t *uart, uint32_t baud_rate) {
1048
1031
log_v ("Setting UART%d to use DEFAULT clock" , uart -> num );
1049
1032
#endif // SOC_UART_SUPPORT_XTAL_CLK
1050
1033
}
1051
- #endif // CONFIG_ARDUINO_SERIAL_FORCE_IDF_DEFAULT_CLOCK_SOURCE
1052
1034
}
1053
1035
UART_MUTEX_LOCK ();
1054
1036
// if necessary, set the correct UART Clock Source before changing the baudrate
0 commit comments