[internal_temperature] Move code into platform specific files (#15339)

esphome/components/internal_temperature/internal_temperature.h

@@ -1,18 +1,18 @@
 #pragma once
 
-#include "esphome/core/component.h"
 #include "esphome/components/sensor/sensor.h"
+#include "esphome/core/component.h"
 
-namespace esphome {
+namespace esphome::internal_temperature {
-namespace internal_temperature {
 
 class InternalTemperatureSensor : public sensor::Sensor, public PollingComponent {
  public:
+#if defined(USE_ESP32) || (defined(USE_ZEPHYR) && defined(USE_NRF52))
   void setup() override;
+#endif  // USE_ESP32 || (USE_ZEPHYR && USE_NRF52)
   void dump_config() override;
 
   void update() override;
 };
 
-}  // namespace internal_temperature
+}  // namespace esphome::internal_temperature
-}  // namespace esphome

esphome/components/internal_temperature/internal_temperature_bk72xx.cpp

@@ -0,0 +1,41 @@
+#ifdef USE_BK72XX
+
+#include "esphome/core/log.h"
+#include "internal_temperature.h"
+
+extern "C" {
+uint32_t temp_single_get_current_temperature(uint32_t *temp_value);
+}
+
+namespace esphome::internal_temperature {
+
+static const char *const TAG = "internal_temperature.bk72xx";
+
+void InternalTemperatureSensor::update() {
+  float temperature = NAN;
+  bool success = false;
+
+  uint32_t raw, result;
+  result = temp_single_get_current_temperature(&raw);
+  success = (result == 0);
+#if defined(USE_LIBRETINY_VARIANT_BK7231N)
+  temperature = raw * -0.38f + 156.0f;
+#elif defined(USE_LIBRETINY_VARIANT_BK7231T)
+  temperature = raw * 0.04f;
+#else   // USE_LIBRETINY_VARIANT
+  temperature = raw * 0.128f;
+#endif  // USE_LIBRETINY_VARIANT
+
+  if (success && std::isfinite(temperature)) {
+    this->publish_state(temperature);
+  } else {
+    ESP_LOGD(TAG, "Ignoring invalid temperature (success=%d, value=%.1f)", success, temperature);
+    if (!this->has_state()) {
+      this->publish_state(NAN);
+    }
+  }
+}
+
+}  // namespace esphome::internal_temperature
+
+#endif  // USE_BK72XX

esphome/components/internal_temperature/internal_temperature_common.cpp

@@ -0,0 +1,10 @@
+#include "esphome/core/log.h"
+#include "internal_temperature.h"
+
+namespace esphome::internal_temperature {
+
+static const char *const TAG = "internal_temperature";
+
+void InternalTemperatureSensor::dump_config() { LOG_SENSOR("", "Internal Temperature Sensor", this); }
+
+}  // namespace esphome::internal_temperature

esphome/components/internal_temperature/internal_temperature_esp32.cpp

@@ -1,7 +1,8 @@
-#include "internal_temperature.h"
-#include "esphome/core/log.h"
-
 #ifdef USE_ESP32
+
+#include "esphome/core/log.h"
+#include "internal_temperature.h"
+
 #if defined(USE_ESP32_VARIANT_ESP32)
 // there is no official API available on the original ESP32
 extern "C" {
@@ -13,70 +14,20 @@ uint8_t temprature_sens_read();
     defined(USE_ESP32_VARIANT_ESP32S3)
 #include "driver/temperature_sensor.h"
 #endif  // USE_ESP32_VARIANT
-#endif  // USE_ESP32
-#ifdef USE_RP2040
-#include "Arduino.h"
-#endif  // USE_RP2040
-#ifdef USE_BK72XX
-extern "C" {
-uint32_t temp_single_get_current_temperature(uint32_t *temp_value);
-}
-#endif  // USE_BK72XX
-#if defined(USE_ZEPHYR) && defined(USE_NRF52)
-#include <zephyr/device.h>
-#include <zephyr/drivers/sensor.h>
-#endif  // USE_ZEPHYR && USE_NRF52
 
-namespace esphome {
+namespace esphome::internal_temperature {
-namespace internal_temperature {
+
+static const char *const TAG = "internal_temperature.esp32";
 
-static const char *const TAG = "internal_temperature";
-#if defined(USE_ZEPHYR) && defined(USE_NRF52)
-static const struct device *const DIE_TEMPERATURE_SENSOR = DEVICE_DT_GET_ONE(nordic_nrf_temp);
-#endif  // USE_ZEPHYR && USE_NRF52
-#ifdef USE_ESP32
 #if defined(USE_ESP32_VARIANT_ESP32C2) || defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32C5) || \
     defined(USE_ESP32_VARIANT_ESP32C6) || defined(USE_ESP32_VARIANT_ESP32C61) || defined(USE_ESP32_VARIANT_ESP32H2) || \
     defined(USE_ESP32_VARIANT_ESP32P4) || defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
 static temperature_sensor_handle_t tsensNew = NULL;
 #endif  // USE_ESP32_VARIANT
-#endif  // USE_ESP32
 
 void InternalTemperatureSensor::update() {
-#if defined(USE_ZEPHYR) && defined(USE_NRF52)
-  struct sensor_value value;
-  int result = sensor_sample_fetch(DIE_TEMPERATURE_SENSOR);
-  if (result != 0) {
-    ESP_LOGE(TAG, "Failed to fetch nRF52 die temperature sample (%d)", result);
-    if (!this->has_state()) {
-      this->publish_state(NAN);
-    }
-    return;
-  }
-
-  result = sensor_channel_get(DIE_TEMPERATURE_SENSOR, SENSOR_CHAN_DIE_TEMP, &value);
-  if (result != 0) {
-    ESP_LOGE(TAG, "Failed to get nRF52 die temperature (%d)", result);
-    if (!this->has_state()) {
-      this->publish_state(NAN);
-    }
-    return;
-  }
-
-  const float temperature = value.val1 + (value.val2 / 1000000.0f);
-  if (std::isfinite(temperature)) {
-    this->publish_state(temperature);
-  } else {
-    ESP_LOGD(TAG, "Ignoring invalid nRF52 temperature (value=%.1f)", temperature);
-    if (!this->has_state()) {
-      this->publish_state(NAN);
-    }
-  }
-#else
-
   float temperature = NAN;
   bool success = false;
-#ifdef USE_ESP32
 #if defined(USE_ESP32_VARIANT_ESP32)
   uint8_t raw = temprature_sens_read();
   ESP_LOGV(TAG, "Raw temperature value: %d", raw);
@@ -92,23 +43,7 @@ void InternalTemperatureSensor::update() {
     ESP_LOGE(TAG, "Reading failed (%d)", result);
   }
 #endif  // USE_ESP32_VARIANT
-#endif  // USE_ESP32
+
-#ifdef USE_RP2040
-  temperature = analogReadTemp();
-  success = (temperature != 0.0f);
-#endif  // USE_RP2040
-#ifdef USE_BK72XX
-  uint32_t raw, result;
-  result = temp_single_get_current_temperature(&raw);
-  success = (result == 0);
-#if defined(USE_LIBRETINY_VARIANT_BK7231N)
-  temperature = raw * -0.38f + 156.0f;
-#elif defined(USE_LIBRETINY_VARIANT_BK7231T)
-  temperature = raw * 0.04f;
-#else   // USE_LIBRETINY_VARIANT
-  temperature = raw * 0.128f;
-#endif  // USE_LIBRETINY_VARIANT
-#endif  // USE_BK72XX
   if (success && std::isfinite(temperature)) {
     this->publish_state(temperature);
   } else {
@@ -117,18 +52,9 @@ void InternalTemperatureSensor::update() {
       this->publish_state(NAN);
     }
   }
-#endif  // USE_ZEPHYR && USE_NRF52
 }
 
 void InternalTemperatureSensor::setup() {
-#if defined(USE_ZEPHYR) && defined(USE_NRF52)
-  if (!device_is_ready(DIE_TEMPERATURE_SENSOR)) {
-    ESP_LOGE(TAG, "nRF52 die temperature sensor device %s not ready", DIE_TEMPERATURE_SENSOR->name);
-    this->mark_failed();
-    return;
-  }
-#endif  // USE_ZEPHYR && USE_NRF52
-#ifdef USE_ESP32
 #if defined(USE_ESP32_VARIANT_ESP32C2) || defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32C5) || \
     defined(USE_ESP32_VARIANT_ESP32C6) || defined(USE_ESP32_VARIANT_ESP32C61) || defined(USE_ESP32_VARIANT_ESP32H2) || \
     defined(USE_ESP32_VARIANT_ESP32P4) || defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
@@ -148,10 +74,8 @@ void InternalTemperatureSensor::setup() {
     return;
   }
 #endif  // USE_ESP32_VARIANT
-#endif  // USE_ESP32
 }
 
-void InternalTemperatureSensor::dump_config() { LOG_SENSOR("", "Internal Temperature Sensor", this); }
+}  // namespace esphome::internal_temperature
 
-}  // namespace internal_temperature
+#endif  // USE_ESP32
-}  // namespace esphome

esphome/components/internal_temperature/internal_temperature_rp2040.cpp

@@ -0,0 +1,31 @@
+#ifdef USE_RP2040
+
+#include "esphome/core/log.h"
+#include "internal_temperature.h"
+
+#include "Arduino.h"
+
+namespace esphome::internal_temperature {
+
+static const char *const TAG = "internal_temperature.rp2040";
+
+void InternalTemperatureSensor::update() {
+  float temperature = NAN;
+  bool success = false;
+
+  temperature = analogReadTemp();
+  success = (temperature != 0.0f);
+
+  if (success && std::isfinite(temperature)) {
+    this->publish_state(temperature);
+  } else {
+    ESP_LOGD(TAG, "Ignoring invalid temperature (success=%d, value=%.1f)", success, temperature);
+    if (!this->has_state()) {
+      this->publish_state(NAN);
+    }
+  }
+}
+
+}  // namespace esphome::internal_temperature
+
+#endif  // USE_RP2040

esphome/components/internal_temperature/internal_temperature_zephyr.cpp

@@ -0,0 +1,56 @@
+#if defined(USE_ZEPHYR) && defined(USE_NRF52)
+
+#include "esphome/core/log.h"
+#include "internal_temperature.h"
+
+#include <zephyr/device.h>
+#include <zephyr/drivers/sensor.h>
+
+namespace esphome::internal_temperature {
+
+static const char *const TAG = "internal_temperature.zephyr";
+
+static const struct device *const DIE_TEMPERATURE_SENSOR = DEVICE_DT_GET_ONE(nordic_nrf_temp);
+
+void InternalTemperatureSensor::update() {
+  struct sensor_value value;
+  int result = sensor_sample_fetch(DIE_TEMPERATURE_SENSOR);
+  if (result != 0) {
+    ESP_LOGE(TAG, "Failed to fetch nRF52 die temperature sample (%d)", result);
+    if (!this->has_state()) {
+      this->publish_state(NAN);
+    }
+    return;
+  }
+
+  result = sensor_channel_get(DIE_TEMPERATURE_SENSOR, SENSOR_CHAN_DIE_TEMP, &value);
+  if (result != 0) {
+    ESP_LOGE(TAG, "Failed to get nRF52 die temperature (%d)", result);
+    if (!this->has_state()) {
+      this->publish_state(NAN);
+    }
+    return;
+  }
+
+  const float temperature = value.val1 + (value.val2 / 1000000.0f);
+  if (std::isfinite(temperature)) {
+    this->publish_state(temperature);
+  } else {
+    ESP_LOGD(TAG, "Ignoring invalid nRF52 temperature (value=%.1f)", temperature);
+    if (!this->has_state()) {
+      this->publish_state(NAN);
+    }
+  }
+}
+
+void InternalTemperatureSensor::setup() {
+  if (!device_is_ready(DIE_TEMPERATURE_SENSOR)) {
+    ESP_LOGE(TAG, "nRF52 die temperature sensor device %s not ready", DIE_TEMPERATURE_SENSOR->name);
+    this->mark_failed();
+    return;
+  }
+}
+
+}  // namespace esphome::internal_temperature
+
+#endif  // USE_ZEPHYR && USE_NRF52

esphome/components/internal_temperature/sensor.py

@@ -1,6 +1,7 @@
 import esphome.codegen as cg
 from esphome.components import sensor
 from esphome.components.zephyr import zephyr_add_prj_conf
+from esphome.config_helpers import filter_source_files_from_platform
 import esphome.config_validation as cv
 from esphome.const import (
     DEVICE_CLASS_TEMPERATURE,
@@ -11,6 +12,7 @@ from esphome.const import (
     PLATFORM_RP2040,
     STATE_CLASS_MEASUREMENT,
     UNIT_CELSIUS,
+    PlatformFramework,
 )
 from esphome.core import CORE
 
@@ -39,3 +41,18 @@ async def to_code(config):
     if CORE.using_zephyr and CORE.is_nrf52:
         zephyr_add_prj_conf("SENSOR", True)
         zephyr_add_prj_conf("TEMP_NRF5", True)
+
+
+FILTER_SOURCE_FILES = filter_source_files_from_platform(
+    {
+        "internal_temperature_esp32.cpp": {
+            PlatformFramework.ESP32_ARDUINO,
+            PlatformFramework.ESP32_IDF,
+        },
+        "internal_temperature_rp2040.cpp": {PlatformFramework.RP2040_ARDUINO},
+        "internal_temperature_bk72xx.cpp": {
+            PlatformFramework.BK72XX_ARDUINO,
+        },
+        "internal_temperature_zephyr.cpp": {PlatformFramework.NRF52_ZEPHYR},
+    }
+)