From b5ad66ba351d48b2fd0f17dcc671fddaba434065 Mon Sep 17 00:00:00 2001 From: Larry Bernstone Date: Sun, 11 Apr 2021 10:40:42 -0600 Subject: [PATCH 1/4] esp32s2 temp sensor --- cores/esp32/esp32-hal-misc.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/cores/esp32/esp32-hal-misc.c b/cores/esp32/esp32-hal-misc.c index e640b36abbf..20e374a7670 100644 --- a/cores/esp32/esp32-hal-misc.c +++ b/cores/esp32/esp32-hal-misc.c @@ -40,6 +40,7 @@ #include "esp32/rom/rtc.h" #elif CONFIG_IDF_TARGET_ESP32S2 #include "esp32s2/rom/rtc.h" +#include "driver/temp_sensor.h" #else #error Target CONFIG_IDF_TARGET is not supported #endif @@ -49,12 +50,25 @@ //Undocumented!!! Get chip temperature in Farenheit //Source: https://github.com/pcbreflux/espressif/blob/master/esp32/arduino/sketchbook/ESP32_int_temp_sensor/ESP32_int_temp_sensor.ino +#ifdef CONFIG_IDF_TARGET_ESP32 uint8_t temprature_sens_read(); float temperatureRead() { return (temprature_sens_read() - 32) / 1.8; } +#else +float temperatureRead() +{ + float hold_temp = 32768; // a number obviously out of range + temp_sensor_config_t tsens = TSENS_CONFIG_DEFAULT(); + temp_sensor_set_config(tsens); + temp_sensor_start(); + temp_sensor_read_celsius(&hold_temp); + temp_sensor_stop(); + return hold_temp; +} +#endif void __yield() { From c50a9bd298692a7082df4c146f67d5ce1dfdf5e9 Mon Sep 17 00:00:00 2001 From: Larry Bernstone Date: Sun, 11 Apr 2021 11:29:15 -0600 Subject: [PATCH 2/4] Better to use NaN --- cores/esp32/esp32-hal-misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cores/esp32/esp32-hal-misc.c b/cores/esp32/esp32-hal-misc.c index 20e374a7670..78a021672dd 100644 --- a/cores/esp32/esp32-hal-misc.c +++ b/cores/esp32/esp32-hal-misc.c @@ -60,7 +60,7 @@ float temperatureRead() #else float temperatureRead() { - float hold_temp = 32768; // a number obviously out of range + float hold_temp = NAN; temp_sensor_config_t tsens = TSENS_CONFIG_DEFAULT(); temp_sensor_set_config(tsens); temp_sensor_start(); From 5cffe898039c26e9cf340c778ed2d2990093cdab Mon Sep 17 00:00:00 2001 From: Larry Bernstone Date: Sun, 11 Apr 2021 12:04:52 -0600 Subject: [PATCH 3/4] better variable name --- cores/esp32/esp32-hal-misc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cores/esp32/esp32-hal-misc.c b/cores/esp32/esp32-hal-misc.c index 78a021672dd..ca1a5794a11 100644 --- a/cores/esp32/esp32-hal-misc.c +++ b/cores/esp32/esp32-hal-misc.c @@ -60,13 +60,13 @@ float temperatureRead() #else float temperatureRead() { - float hold_temp = NAN; + float result = NAN; temp_sensor_config_t tsens = TSENS_CONFIG_DEFAULT(); temp_sensor_set_config(tsens); temp_sensor_start(); - temp_sensor_read_celsius(&hold_temp); + temp_sensor_read_celsius(&result); temp_sensor_stop(); - return hold_temp; + return result; } #endif From de589aa177859588f02e92aa018c3e4c2d618061 Mon Sep 17 00:00:00 2001 From: Larry Bernstone Date: Mon, 12 Apr 2021 16:28:52 -0600 Subject: [PATCH 4/4] Updated for esp32c3 --- cores/esp32/esp32-hal-misc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cores/esp32/esp32-hal-misc.c b/cores/esp32/esp32-hal-misc.c index ca1a5794a11..102ff6947a4 100644 --- a/cores/esp32/esp32-hal-misc.c +++ b/cores/esp32/esp32-hal-misc.c @@ -41,6 +41,9 @@ #elif CONFIG_IDF_TARGET_ESP32S2 #include "esp32s2/rom/rtc.h" #include "driver/temp_sensor.h" +#elif CONFIG_IDF_TARGET_ESP32C3 +#include "esp32c3/rom/rtc.h" +#include "driver/temp_sensor.h" #else #error Target CONFIG_IDF_TARGET is not supported #endif