Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-02 03:00:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'refactor/tsens_hal' into 'master'

Browse Source 
refactor(temperature_sensor): Move temperature calculation from hw_support to hal

See merge request espressif/esp-idf!40296
This commit is contained in:
C.S.M
2025-08-12 15:39:06 +08:00
parent 7aca8b8df2 0121a14699
commit bb554a74dd
17 changed files with 184 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_hw_support/CMakeLists.txt
+1 -1
View File
@@ -29,7 +29,7 @@ if(NOT non_os_build)
"rtc_module.c"
"regi2c_ctrl.c"
"esp_gpio_reserve.c"
"sar_periph_ctrl_common.c"
"sar_tsens_ctrl.c"
"port/${target}/io_mux.c"
"port/${target}/esp_clk_tree.c"
"dma/esp_dma_utils.c"
components/esp_hw_support/include/esp_private/sar_periph_ctrl.h
+1 -8
View File
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -85,13 +85,6 @@ void temperature_sensor_power_release(void);
*/
int16_t temp_sensor_get_raw_value(bool *range_changed);
/**
* @brief Synchronize the tsens_idx between sar_periph and driver
*
* @param tsens_idx index value of temperature sensor attribute
*/
void temp_sensor_sync_tsens_idx(int tsens_idx);
/**
* @brief Enable SAR power when system wakes up
*/
components/esp_hw_support/sar_periph_ctrl_common.c → components/esp_hw_support/sar_tsens_ctrl.c
+8 -66
View File
@@ -13,7 +13,7 @@
#if SOC_TEMP_SENSOR_SUPPORTED
#include "hal/temperature_sensor_ll.h"
#include "soc/temperature_sensor_periph.h"
#include "hal/temperature_sensor_hal.h"
#include "soc/periph_defs.h"
#include "esp_private/periph_ctrl.h"
#include "esp_private/adc_share_hw_ctrl.h"
@@ -35,20 +35,10 @@ static const char *TAG_TSENS = "temperature_sensor";
#define TSENS_RCC_ATOMIC()
#endif
#if CONFIG_PM_SLP_IRAM_OPT
# define SAR_PERIPH_CTRL_COMMON_FN_ATTR IRAM_ATTR
#else
# define SAR_PERIPH_CTRL_COMMON_FN_ATTR
#endif
#define TSENS_LINE_REGRESSION_US (200)
static int s_record_min = INT_NOT_USED;
static int s_record_max = INT_NOT_USED;
static int s_temperature_sensor_power_cnt;
static bool s_first_temp_read = false;
static uint8_t s_tsens_idx = 2; // Index for temperature attribute, set 2(middle) as default value
static int64_t timer1 = 0;
void temperature_sensor_power_acquire(void)
@@ -66,8 +56,8 @@ void temperature_sensor_power_acquire(void)
temperature_sensor_ll_reset_module();
}
temperature_sensor_ll_enable(true);
// Set the range as recorded.
temperature_sensor_ll_set_range(temperature_sensor_attributes[s_tsens_idx].reg_val);
// Initialize HAL layer with the same tsens_idx
temperature_sensor_hal_init();
timer1 = esp_timer_get_time();
}
esp_os_exit_critical(&rtc_spinlock);
@@ -95,19 +85,10 @@ void temperature_sensor_power_release(void)
esp_os_exit_critical(&rtc_spinlock);
}
static SAR_PERIPH_CTRL_COMMON_FN_ATTR int temperature_sensor_get_raw_value(void)
{
int raw_value = temperature_sensor_ll_get_raw_value();
return (TEMPERATURE_SENSOR_LL_ADC_FACTOR * raw_value - TEMPERATURE_SENSOR_LL_DAC_FACTOR * temperature_sensor_attributes[s_tsens_idx].offset - TEMPERATURE_SENSOR_LL_OFFSET_FACTOR);
}
void temp_sensor_sync_tsens_idx(int tsens_idx)
{
s_tsens_idx = tsens_idx;
}
int16_t temp_sensor_get_raw_value(bool *range_changed)
{
int16_t result;
esp_os_enter_critical(&rtc_spinlock);
// When this is the first time reading a value, check whether the time here minus the
@@ -122,49 +103,10 @@ int16_t temp_sensor_get_raw_value(bool *range_changed)
s_first_temp_read = false;
}
int degree = temperature_sensor_get_raw_value();
uint8_t temperature_dac;
// 1. Check whether temperature value is in range
if (s_record_min != INT_NOT_USED && degree >= s_record_min && degree <= s_record_max) {
// If degree is in range, not needed to do any check to save time. Otherwise, choose proper range and record.
if (range_changed != NULL) {
*range_changed = false;
}
esp_os_exit_critical(&rtc_spinlock);
return degree;
}
// 2. If temperature value is not in range, adjust to proper range
if (degree >= temperature_sensor_attributes[1].range_max) {
s_tsens_idx = 0;
} else if (degree >= temperature_sensor_attributes[2].range_max && degree < temperature_sensor_attributes[1].range_max) {
s_tsens_idx = 1;
} else if (degree <= temperature_sensor_attributes[2].range_min && degree > temperature_sensor_attributes[3].range_min) {
s_tsens_idx = 3;
} else if (degree <= temperature_sensor_attributes[3].range_min) {
s_tsens_idx = 4;
} else {
s_tsens_idx = 2;
}
ESP_EARLY_LOGD(TAG_TSENS, "range changed, change to index %d", s_tsens_idx);
temperature_dac = temperature_sensor_attributes[s_tsens_idx].reg_val;
s_record_min = temperature_sensor_attributes[s_tsens_idx].range_min;
s_record_max = temperature_sensor_attributes[s_tsens_idx].range_max;
temperature_sensor_ll_set_range(temperature_dac);
// 3. Then, read value again
// Before reading the temperature value, ticks need to be delayed, otherwise a wrong value will be returned.
// As what has been recommended and tested, 300us is a good interval to get the correct value after adjust range.
esp_rom_delay_us(300);
degree = temperature_sensor_get_raw_value();
if (range_changed != NULL) {
*range_changed = true;
}
result = temperature_sensor_hal_get_degree(range_changed);
esp_os_exit_critical(&rtc_spinlock);
return degree;
return result;
}
#endif