Merge pull request UncleRus#578 from AxelLin/fix-esp32c6-build

Fix esp32c6 build
rekliner · Sep 27, 2023 · 1e3255f · 1e3255f
2 parents 15c4da6 + 626eac5
commit 1e3255f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/components/mhz19b/mhz19b.c b/components/mhz19b/mhz19b.c
@@ -60,7 +60,9 @@ esp_err_t mhz19b_init(mhz19b_dev_t *dev, uart_port_t uart_port, gpio_num_t tx_gp
         .parity    = UART_PARITY_DISABLE,
         .stop_bits = UART_STOP_BITS_1,
         .flow_ctrl = UART_HW_FLOWCTRL_DISABLE,
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 3, 0)
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
+        .source_clk = UART_SCLK_DEFAULT,
+#elif ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 3, 0)
         .source_clk = UART_SCLK_APB,
 #endif
     };

diff --git a/components/scd30/scd30.c b/components/scd30/scd30.c
@@ -43,19 +43,7 @@
 #include <freertos/FreeRTOS.h>
 #include <freertos/task.h>
 #include <esp_log.h>
-#if CONFIG_IDF_TARGET_ESP32
-#include <esp32/rom/ets_sys.h>
-#elif CONFIG_IDF_TARGET_ESP32S2
-#include <esp32s2/rom/ets_sys.h>
-#elif CONFIG_IDF_TARGET_ESP32S3
-#include <esp32s3/rom/ets_sys.h>
-#elif CONFIG_IDF_TARGET_ESP32C3
-#include <esp32c3/rom/ets_sys.h>
-#elif CONFIG_IDF_TARGET_ESP32H2
-#include <esp32h2/rom/ets_sys.h>
-#elif CONFIG_IDF_TARGET_ESP32C2
-#include <esp32c2/rom/ets_sys.h>
-#endif
+#include <ets_sys.h>
 #include <esp_idf_lib_helpers.h>
 #include "scd30.h"