Untangle core headers (part 1) (#2276)

esphome/components/ade7953/ade7953.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "esphome/core/component.h"
+#include "esphome/core/esphal.h"
 #include "esphome/components/i2c/i2c.h"
 #include "esphome/components/sensor/sensor.h"
 

esphome/components/am43/am43_base.cpp

@@ -1,4 +1,6 @@
 #include "am43_base.h"
+#include <cstring>
+#include <cstdio>
 
 namespace esphome {
 namespace am43 {

esphome/components/anova/anova_base.cpp

@@ -1,4 +1,6 @@
 #include "anova_base.h"
+#include <cstdio>
+#include <cstring>
 
 namespace esphome {
 namespace anova {

esphome/components/as3935/as3935.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "esphome/core/component.h"
+#include "esphome/core/esphal.h"
 #include "esphome/components/sensor/sensor.h"
 #include "esphome/components/binary_sensor/binary_sensor.h"
 

esphome/components/climate/climate_traits.cpp

@@ -1,5 +1,5 @@
 #include "climate_traits.h"
-#include "esphome/core/log.h"
+#include <cstdio>
 
 namespace esphome {
 namespace climate {

esphome/components/deep_sleep/deep_sleep_component.h

@@ -3,6 +3,7 @@
 #include "esphome/core/component.h"
 #include "esphome/core/helpers.h"
 #include "esphome/core/automation.h"
+#include "esphome/core/esphal.h"
 
 namespace esphome {
 namespace deep_sleep {

esphome/components/dht/dht.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "esphome/core/component.h"
+#include "esphome/core/esphal.h"
 #include "esphome/components/sensor/sensor.h"
 
 namespace esphome {

esphome/components/esp32_ble/ble_uuid.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "esphome/core/helpers.h"
+#include "esphome/core/esphal.h"
 
 #ifdef ARDUINO_ARCH_ESP32
 

esphome/components/gpio/binary_sensor/gpio_binary_sensor.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "esphome/core/component.h"
+#include "esphome/core/esphal.h"
 #include "esphome/components/binary_sensor/binary_sensor.h"
 
 namespace esphome {

esphome/components/gpio/switch/gpio_switch.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "esphome/core/component.h"
+#include "esphome/core/esphal.h"
 #include "esphome/components/switch/switch.h"
 
 namespace esphome {

esphome/components/nfc/nfc.cpp

@@ -1,4 +1,5 @@
 #include "nfc.h"
+#include <cstdio>
 #include "esphome/core/log.h"
 
 namespace esphome {

esphome/components/rc522/rc522.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "esphome/core/component.h"
+#include "esphome/core/esphal.h"
 #include "esphome/core/automation.h"
 #include "esphome/components/binary_sensor/binary_sensor.h"
 

esphome/components/remote_receiver/remote_receiver_esp8266.cpp

@@ -1,4 +1,5 @@
 #include "remote_receiver.h"
+#include "esphome/core/esphal.h"
 #include "esphome/core/log.h"
 #include "esphome/core/helpers.h"
 

esphome/components/sx1509/sx1509.h

@@ -2,6 +2,7 @@
 
 #include "esphome/components/i2c/i2c.h"
 #include "esphome/core/component.h"
+#include "esphome/core/esphal.h"
 #include "sx1509_gpio_pin.h"
 #include "sx1509_registers.h"
 

esphome/components/ttp229_bsf/ttp229_bsf.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "esphome/core/component.h"
+#include "esphome/core/esphal.h"
 #include "esphome/components/binary_sensor/binary_sensor.h"
 
 namespace esphome {

esphome/components/tx20/tx20.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "esphome/core/component.h"
+#include "esphome/core/esphal.h"
 #include "esphome/components/sensor/sensor.h"
 
 namespace esphome {

esphome/components/vl53l0x/vl53l0x_sensor.h

@@ -3,6 +3,7 @@
 #include <list>
 
 #include "esphome/core/component.h"
+#include "esphome/core/esphal.h"
 #include "esphome/components/sensor/sensor.h"
 #include "esphome/components/i2c/i2c.h"
 

esphome/core/esphal.h

@@ -1,9 +1,7 @@
 #pragma once
 
 #include "Arduino.h"
-#ifdef ARDUINO_ARCH_ESP32
-#include <esp32-hal.h>
-#endif
+
 // Fix some arduino defs
 #ifdef round
 #undef round

esphome/core/helpers.h

@@ -6,8 +6,11 @@
 #include <memory>
 #include <type_traits>
 
+#ifdef ARDUINO_ARCH_ESP32
+#include "esp32-hal-psram.h"
+#endif
+
 #include "esphome/core/optional.h"
-#include "esphome/core/esphal.h"
 
 #ifdef CLANG_TIDY
 #undef ICACHE_RAM_ATTR

esphome/core/log.h

@@ -3,18 +3,20 @@
 #include <cassert>
 #include <cstdarg>
 #include <string>
+
 #ifdef USE_STORE_LOG_STR_IN_FLASH
 #include "WString.h"
 #endif
 
-#include "esphome/core/macros.h"
-// avoid esp-idf redefining our macros
-#include "esphome/core/esphal.h"
-
+// Both the ESP-IDF and Arduino also define ESP_LOG* macros. Include them here, so that they won't
+// be reincluded later on and redefine our macros.
 #ifdef ARDUINO_ARCH_ESP32
-#include "esp_err.h"
+#include <esp_log.h>
+#include <esp32-hal-log.h>
 #endif
 
+#include "esphome/core/macros.h"
+
 namespace esphome {
 
 #define ESPHOME_LOG_LEVEL_NONE 0

esphome/core/preferences.h

@@ -1,8 +1,8 @@
 #pragma once
 
 #include <string>
+#include <cstring>
 
-#include "esphome/core/esphal.h"
 #include "esphome/core/defines.h"
 
 namespace esphome {