mirror of
https://github.com/esphome/esphome.git
synced 2025-04-05 18:30:28 +01:00
c0ad5d1d16
* requirements: add pyparsing >= 3.0 ESP-IDF >= 5.0 requires pyparsing's rest_of_file, which was introduced in version 3.0. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be> * esp32: fix build with ESP-IDF >= 5 We need to include esp_timer.h to be able to use esp_timer_get_time(). This header existed in ESP-IDF < 5 so we don't need if guards. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be> * ota: fix build with ESP-IDF >= 5 As of version 5, esp_task_wdt_init() takes a struct as argument. We also need to include spi_flash_mmap.h. [split unrelated change into separate commits, maintain ESP-IDF < 5 compat, use esp_task_wdt_reconfigure, add commit message] Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be> * core: fix build with ESP-IDF >= 5 These header files already existed in ESP-IDF < 5 so skip if guards. [add commit message] Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be> * wifi: fix build with ESP-IDF >= 5 ESP-IDF 4.1 introduced the esp-netif API as successor to the tcp_adapter API. The tcp_adapter API was removed in ESP-IDF 5.0.0. Part of the wifi component was already migrated to the new API. Migrate the leftover uses of the old API to the new API to fix build on ESP-IDF >= 5. The version of ESP-IDF currently in use (4.4.4) supports the new API, so we don't need any if guards to maintain backwards compatibility. Also replace xQueueHandle, which is a pre FreeRTOS v8.0.0 data type, with QueueHandle_t, so we don't need to enable backward compatibility (CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY). This reverts part of commit d42f35de5d54 to wifi_component_esp_idf.cpp, as the esp-netif API handles that internally. [replace pre FreeRTOS v8.0.0 data type, add commit message] Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be> * mdns: fix build with ESP-IDF >= 5 In ESP-IDF 5.0.0, the mdns component was removed and moved to another repository. Since the mdns component in esphome is always built, we need to add the mdns component from the esp-protocols repository. This component depends on ESP-IDF >= 5.0, so we need to add a version guard. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be> * docker: install python3-venv As of version 6.0.1, platform-espressif32 requires python3-venv. Switching between esp-idf 4.4.4 and 5.0 causes problems with esp-idf python dependencies installed by PlatformIO. They've solved this by using venv. Install python3-venv so that platform-espressif32 6.0.1 and later can be used, and we don't need to wipe the dependencies manually when switching esp-idf versions. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be> --------- Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be> Co-authored-by: Stijn Tintel <stijn@linux-ipv6.be>
92 lines
2.4 KiB
C++
92 lines
2.4 KiB
C++
#ifdef USE_ESP32
|
|
|
|
#include "esphome/core/hal.h"
|
|
#include "esphome/core/helpers.h"
|
|
#include "preferences.h"
|
|
#include <freertos/FreeRTOS.h>
|
|
#include <freertos/task.h>
|
|
#include <esp_idf_version.h>
|
|
#include <esp_task_wdt.h>
|
|
#include <esp_timer.h>
|
|
#include <soc/rtc.h>
|
|
|
|
#if ESP_IDF_VERSION_MAJOR >= 4
|
|
#include <hal/cpu_hal.h>
|
|
#endif
|
|
|
|
#ifdef USE_ARDUINO
|
|
#include <esp32-hal.h>
|
|
#endif
|
|
|
|
void setup();
|
|
void loop();
|
|
|
|
namespace esphome {
|
|
|
|
void IRAM_ATTR HOT yield() { vPortYield(); }
|
|
uint32_t IRAM_ATTR HOT millis() { return (uint32_t) (esp_timer_get_time() / 1000ULL); }
|
|
void IRAM_ATTR HOT delay(uint32_t ms) { vTaskDelay(ms / portTICK_PERIOD_MS); }
|
|
uint32_t IRAM_ATTR HOT micros() { return (uint32_t) esp_timer_get_time(); }
|
|
void IRAM_ATTR HOT delayMicroseconds(uint32_t us) { delay_microseconds_safe(us); }
|
|
void arch_restart() {
|
|
esp_restart();
|
|
// restart() doesn't always end execution
|
|
while (true) { // NOLINT(clang-diagnostic-unreachable-code)
|
|
yield();
|
|
}
|
|
}
|
|
|
|
void arch_init() {
|
|
// Enable the task watchdog only on the loop task (from which we're currently running)
|
|
#if defined(USE_ESP_IDF)
|
|
esp_task_wdt_add(nullptr);
|
|
// Idle task watchdog is disabled on ESP-IDF
|
|
#elif defined(USE_ARDUINO)
|
|
enableLoopWDT();
|
|
// Disable idle task watchdog on the core we're using (Arduino pins the task to a core)
|
|
#if defined(CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0) && CONFIG_ARDUINO_RUNNING_CORE == 0
|
|
disableCore0WDT();
|
|
#endif
|
|
#if defined(CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1) && CONFIG_ARDUINO_RUNNING_CORE == 1
|
|
disableCore1WDT();
|
|
#endif
|
|
#endif
|
|
}
|
|
void IRAM_ATTR HOT arch_feed_wdt() { esp_task_wdt_reset(); }
|
|
|
|
uint8_t progmem_read_byte(const uint8_t *addr) { return *addr; }
|
|
uint32_t arch_get_cpu_cycle_count() {
|
|
#if ESP_IDF_VERSION_MAJOR >= 4
|
|
return cpu_hal_get_cycle_count();
|
|
#else
|
|
uint32_t ccount;
|
|
__asm__ __volatile__("esync; rsr %0,ccount" : "=a"(ccount));
|
|
return ccount;
|
|
#endif
|
|
}
|
|
uint32_t arch_get_cpu_freq_hz() { return rtc_clk_apb_freq_get(); }
|
|
|
|
#ifdef USE_ESP_IDF
|
|
TaskHandle_t loop_task_handle = nullptr; // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
|
|
|
|
void loop_task(void *pv_params) {
|
|
setup();
|
|
while (true) {
|
|
loop();
|
|
}
|
|
}
|
|
|
|
extern "C" void app_main() {
|
|
esp32::setup_preferences();
|
|
xTaskCreate(loop_task, "loopTask", 8192, nullptr, 1, &loop_task_handle);
|
|
}
|
|
#endif // USE_ESP_IDF
|
|
|
|
#ifdef USE_ARDUINO
|
|
extern "C" void init() { esp32::setup_preferences(); }
|
|
#endif // USE_ARDUINO
|
|
|
|
} // namespace esphome
|
|
|
|
#endif // USE_ESP32
|