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

Merge branch 'bugfix/fix_temp_sensor_affect_by_adc' into 'master'

Browse Source 
ADC: fix temp sensor affect by adc continuous reset

Closes IDFGH-14786

See merge request espressif/esp-idf!38921
This commit is contained in:
Gao Xu
2025-09-24 10:05:03 +08:00
parent e13699a652 e5c6b87c10
commit 3ec9502526
25 changed files with 696 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
components/bootloader_support/src/bootloader_random_esp32c5.c
View File

@@ -10,6 +10,8 @@
#include "hal/adc_types.h"
#include "esp_private/regi2c_ctrl.h"
#include "soc/lpperi_reg.h"
#include "hal/temperature_sensor_ll.h"
#include "esp_private/sar_periph_ctrl.h"
#define I2C_SAR_ADC_INIT_CODE_VAL 2150
#define ADC_RNG_CLKM_DIV_NUM 0
@@ -18,7 +20,18 @@
void bootloader_random_enable(void)
{
#ifndef BOOTLOADER_BUILD
sar_periph_ctrl_adc_reset();
#else
// Save temperature sensor related register values before ADC reset
tsens_ll_reg_values_t saved_tsens_regs = {};
tsens_ll_backup_registers(&saved_tsens_regs);
adc_ll_reset_register();
// Restore temperature sensor related register values after ADC reset
temperature_sensor_ll_reset_module();
tsens_ll_restore_registers(&saved_tsens_regs);
#endif
adc_ll_enable_bus_clock(true);
adc_ll_enable_func_clock(true);
adc_ll_digi_clk_sel(ADC_DIGI_CLK_SRC_XTAL);

12
components/bootloader_support/src/bootloader_random_esp32c6.c
View File

@@ -9,6 +9,8 @@
#include "hal/adc_ll.h"
#include "hal/adc_types.h"
#include "esp_private/regi2c_ctrl.h"
#include "hal/temperature_sensor_ll.h"
#include "esp_private/sar_periph_ctrl.h"
#define I2C_SAR_ADC_INIT_CODE_VAL 2150
#define ADC_RNG_CLKM_DIV_NUM 0
@@ -17,7 +19,17 @@
void bootloader_random_enable(void)
{
#ifndef BOOTLOADER_BUILD
sar_periph_ctrl_adc_reset();
#else
tsens_ll_reg_values_t saved_tsens_regs = {};
tsens_ll_backup_registers(&saved_tsens_regs);
adc_ll_reset_register();
// Restore temperature sensor related register values after ADC reset
temperature_sensor_ll_reset_module();
tsens_ll_restore_registers(&saved_tsens_regs);
#endif
adc_ll_enable_bus_clock(true);
adc_ll_enable_func_clock(true);
adc_ll_digi_clk_sel(ADC_DIGI_CLK_SRC_XTAL);

13
components/bootloader_support/src/bootloader_random_esp32c61.c
View File

@@ -9,6 +9,8 @@
#include "hal/adc_ll.h"
#include "hal/adc_types.h"
#include "esp_private/regi2c_ctrl.h"
#include "hal/temperature_sensor_ll.h"
#include "esp_private/sar_periph_ctrl.h"
#define I2C_SAR_ADC_INIT_CODE_VAL 2150
#define ADC_RNG_CLKM_DIV_NUM 0
@@ -17,7 +19,18 @@
void bootloader_random_enable(void)
{
#ifndef BOOTLOADER_BUILD
sar_periph_ctrl_adc_reset();
#else
// Save temperature sensor related register values before ADC reset
tsens_ll_reg_values_t saved_tsens_regs = {};
tsens_ll_backup_registers(&saved_tsens_regs);
adc_ll_reset_register();
// Restore temperature sensor related register values after ADC reset
temperature_sensor_ll_reset_module();
tsens_ll_restore_registers(&saved_tsens_regs);
#endif
adc_ll_enable_bus_clock(true);
adc_ll_enable_func_clock(true);
adc_ll_digi_clk_sel(ADC_DIGI_CLK_SRC_XTAL);

13
components/bootloader_support/src/bootloader_random_esp32h2.c
View File

@@ -9,6 +9,8 @@
#include "hal/adc_ll.h"
#include "hal/adc_types.h"
#include "esp_private/regi2c_ctrl.h"
#include "hal/temperature_sensor_ll.h"
#include "esp_private/sar_periph_ctrl.h"
#define I2C_SAR_ADC_INIT_CODE_VAL 2150
#define ADC_RNG_CLKM_DIV_NUM 0
@@ -17,7 +19,18 @@
void bootloader_random_enable(void)
{
#ifndef BOOTLOADER_BUILD
sar_periph_ctrl_adc_reset();
#else
// Save temperature sensor related register values before ADC reset
tsens_ll_reg_values_t saved_tsens_regs = {};
tsens_ll_backup_registers(&saved_tsens_regs);
adc_ll_reset_register();
// Restore temperature sensor related register values after ADC reset
temperature_sensor_ll_reset_module();
tsens_ll_restore_registers(&saved_tsens_regs);
#endif
adc_ll_enable_bus_clock(true);
adc_ll_enable_func_clock(true);
adc_ll_digi_clk_sel(ADC_DIGI_CLK_SRC_XTAL);

6
components/bootloader_support/src/bootloader_random_esp32p4.c
View File

@@ -11,6 +11,7 @@
#include "esp_private/periph_ctrl.h"
#include "esp_private/adc_share_hw_ctrl.h"
#include "esp_private/sar_periph_ctrl.h"
#define I2C_SAR_ADC_INIT_CODE_VAL 2166
#define ADC_RNG_CLKM_DIV_NUM 0
@@ -19,7 +20,12 @@
void bootloader_random_enable(void)
{
#ifndef BOOTLOADER_BUILD
sar_periph_ctrl_adc_reset();
#else
_adc_ll_reset_register();
#endif
_adc_ll_enable_bus_clock(true);
adc_ll_digi_clk_sel(ADC_DIGI_CLK_SRC_XTAL);

6
components/esp_adc/adc_continuous.c
View File

@@ -262,9 +262,7 @@ esp_err_t adc_continuous_start(adc_continuous_handle_t handle)
ANALOG_CLOCK_ENABLE();
//reset ADC digital part to reset ADC sampling EOF counter
ADC_BUS_CLK_ATOMIC() {
adc_ll_reset_register();
}
sar_periph_ctrl_adc_reset();
#if CONFIG_PM_ENABLE
if (handle->pm_lock) {
@@ -360,7 +358,7 @@ esp_err_t adc_continuous_stop(adc_continuous_handle_t handle)
adc_hal_digi_enable(false);
adc_hal_digi_connect(false);
#if ADC_LL_WORKAROUND_CLEAR_EOF_COUNTER
periph_module_reset(PERIPH_SARADC_MODULE);
sar_periph_ctrl_adc_reset();
adc_hal_digi_clr_eof();
#endif

162
components/esp_adc/test_apps/adc/main/test_adc_tsens.c
View File

@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -10,6 +10,7 @@
#include "esp_log.h"
#include "soc/adc_periph.h"
#include "esp_adc/adc_oneshot.h"
#include "esp_adc/adc_continuous.h"
#include "driver/gpio.h"
#include "driver/rtc_io.h"
#include "driver/temperature_sensor.h"
@@ -23,61 +24,142 @@
static const char *TAG = "adc_tsens";
#define EXAMPLE_ADC1_CHAN0 ADC_CHANNEL_2
#define EXAMPLE_ADC1_CHAN1 ADC_CHANNEL_3
#define EXAMPLE_ADC_ATTEN ADC_ATTEN_DB_12
#define TEST_ADC1_CHAN0 ADC_CHANNEL_2
#define TEST_ADC_ATTEN ADC_ATTEN_DB_12
static int adc_raw[2][10];
static int adc_raw;
static float tsens_value;
TEST_CASE("Test temperature sensor cannot be influenced by ADC", "[adc]")
static void temp_sensor_test(temperature_sensor_handle_t temp_sensor)
{
int cnt = 2;
while (cnt--) {
TEST_ESP_OK(temperature_sensor_get_celsius(temp_sensor, &tsens_value));
ESP_LOGI(TAG, "Temperature value %.02f ℃", tsens_value);
TEST_ASSERT_GREATER_THAN(0, tsens_value);
vTaskDelay(pdMS_TO_TICKS(100));
}
}
static void adc_oneshot_test(adc_oneshot_unit_handle_t adc_handle)
{
test_adc_set_io_level(ADC_UNIT_1, TEST_ADC1_CHAN0, 0);
TEST_ESP_OK(adc_oneshot_read(adc_handle, TEST_ADC1_CHAN0, &adc_raw));
ESP_LOGI(TAG, "low raw data: %d", adc_raw);
TEST_ASSERT_INT_WITHIN(ADC_TEST_LOW_THRESH, ADC_TEST_LOW_VAL, adc_raw);
test_adc_set_io_level(ADC_UNIT_1, TEST_ADC1_CHAN0, 1);
TEST_ESP_OK(adc_oneshot_read(adc_handle, TEST_ADC1_CHAN0, &adc_raw));
ESP_LOGI(TAG, "high raw data: %d", adc_raw);
TEST_ASSERT_INT_WITHIN(ADC_TEST_HIGH_THRESH, ADC_TEST_HIGH_VAL, adc_raw);
}
TEST_CASE("Test temperature sensor work with ADC oneshot", "[adc]")
{
ESP_LOGI(TAG, "Install temperature sensor, expected temp ranger range: 10~50 ℃");
temperature_sensor_handle_t temp_sensor = NULL;
temperature_sensor_config_t temp_sensor_config = TEMPERATURE_SENSOR_CONFIG_DEFAULT(-10, 80);
temperature_sensor_config_t temp_sensor_config = TEMPERATURE_SENSOR_CONFIG_DEFAULT(10, 50);
TEST_ESP_OK(temperature_sensor_install(&temp_sensor_config, &temp_sensor));
int cnt = 2;
float tsens_value;
while (cnt--) {
temperature_sensor_enable(temp_sensor);
TEST_ESP_OK(temperature_sensor_get_celsius(temp_sensor, &tsens_value));
ESP_LOGI(TAG, "Temperature value %.02f ℃", tsens_value);
vTaskDelay(pdMS_TO_TICKS(100));
TEST_ESP_OK(temperature_sensor_disable(temp_sensor));
}
TEST_ESP_OK(temperature_sensor_enable(temp_sensor));
adc_oneshot_unit_handle_t adc1_handle;
temp_sensor_test(temp_sensor);
//ADC oneshot work after temperature sensor
adc_oneshot_unit_handle_t adc_handle;
adc_oneshot_unit_init_cfg_t init_config1 = {
.unit_id = ADC_UNIT_1,
};
TEST_ESP_OK(adc_oneshot_new_unit(&init_config1, &adc1_handle));
//-------------ADC1 Config---------------//
TEST_ESP_OK(adc_oneshot_new_unit(&init_config1, &adc_handle));
adc_oneshot_chan_cfg_t config = {
.bitwidth = ADC_BITWIDTH_DEFAULT,
.atten = EXAMPLE_ADC_ATTEN,
.atten = TEST_ADC_ATTEN,
};
TEST_ESP_OK(adc_oneshot_config_channel(adc1_handle, EXAMPLE_ADC1_CHAN0, &config));
TEST_ESP_OK(adc_oneshot_config_channel(adc1_handle, EXAMPLE_ADC1_CHAN1, &config));
TEST_ESP_OK(adc_oneshot_config_channel(adc_handle, TEST_ADC1_CHAN0, &config));
adc_oneshot_test(adc_handle);
TEST_ESP_OK(adc_oneshot_del_unit(adc_handle));
cnt = 2;
while (cnt--) {
TEST_ESP_OK(adc_oneshot_read(adc1_handle, EXAMPLE_ADC1_CHAN0, &adc_raw[0][0]));
ESP_LOGI(TAG, "ADC%d Channel[%d] Raw Data: %d", ADC_UNIT_1 + 1, EXAMPLE_ADC1_CHAN0, adc_raw[0][0]);
vTaskDelay(pdMS_TO_TICKS(100));
}
TEST_ESP_OK(adc_oneshot_del_unit(adc1_handle));
cnt = 2;
while (cnt--) {
temperature_sensor_enable(temp_sensor);
TEST_ESP_OK(temperature_sensor_get_celsius(temp_sensor, &tsens_value));
ESP_LOGI(TAG, "Temperature value %.02f ℃", tsens_value);
vTaskDelay(pdMS_TO_TICKS(100));
TEST_ESP_OK(temperature_sensor_disable(temp_sensor));
}
//Temperature sensor work after ADC oneshot
temp_sensor_test(temp_sensor);
TEST_ESP_OK(temperature_sensor_disable(temp_sensor));
TEST_ESP_OK(temperature_sensor_uninstall(temp_sensor));
}
#if SOC_ADC_DMA_SUPPORTED
#if (SOC_ADC_DIGI_RESULT_BYTES == 2)
#define ADC_DRIVER_TEST_OUTPUT_TYPE ADC_DIGI_OUTPUT_FORMAT_TYPE1
#define ADC_DRIVER_TEST_GET_CHANNEL(p_data) ((p_data)->type1.channel)
#else
#define ADC_DRIVER_TEST_OUTPUT_TYPE ADC_DIGI_OUTPUT_FORMAT_TYPE2
#define ADC_DRIVER_TEST_GET_CHANNEL(p_data) ((p_data)->type2.channel)
#endif
#define TEST_ADC_BUF_SIZE 256
TEST_CASE("Test temperature sensor work with ADC continuous", "[adc]")
{
ESP_LOGI(TAG, "Install temperature sensor, expected temp ranger range: 10~50 ℃");
temperature_sensor_handle_t temp_sensor = NULL;
temperature_sensor_config_t temp_sensor_config = TEMPERATURE_SENSOR_CONFIG_DEFAULT(10, 50);
TEST_ESP_OK(temperature_sensor_install(&temp_sensor_config, &temp_sensor));
TEST_ESP_OK(temperature_sensor_enable(temp_sensor));
temp_sensor_test(temp_sensor);
adc_continuous_handle_t handle = NULL;
adc_continuous_handle_cfg_t adc_config = {
.max_store_buf_size = TEST_ADC_BUF_SIZE,
.conv_frame_size = TEST_ADC_BUF_SIZE,
};
TEST_ESP_OK(adc_continuous_new_handle(&adc_config, &handle));
adc_continuous_config_t dig_cfg = {
.sample_freq_hz = 50 * 1000,
.conv_mode = ADC_CONV_SINGLE_UNIT_1,
.format = ADC_DRIVER_TEST_OUTPUT_TYPE,
};
adc_digi_pattern_config_t adc_pattern[SOC_ADC_PATT_LEN_MAX] = {0};
adc_pattern[0].atten = ADC_ATTEN_DB_12;
adc_pattern[0].channel = TEST_ADC1_CHAN0;
adc_pattern[0].unit = ADC_UNIT_1;
adc_pattern[0].bit_width = SOC_ADC_DIGI_MAX_BITWIDTH;
dig_cfg.adc_pattern = adc_pattern;
dig_cfg.pattern_num = 1;
TEST_ESP_OK(adc_continuous_config(handle, &dig_cfg));
uint8_t* result = malloc(TEST_ADC_BUF_SIZE);
TEST_ASSERT(result);
uint32_t ret_num = 0;
TEST_ESP_OK(adc_continuous_start(handle));
temp_sensor_test(temp_sensor);
//ADC continuous work after temperature sensor
TEST_ESP_OK(adc_continuous_read(handle, result, TEST_ADC_BUF_SIZE, &ret_num, ADC_MAX_DELAY));
TEST_ASSERT_EQUAL(TEST_ADC_BUF_SIZE, ret_num);
for (int i = 0; i < ret_num; i += SOC_ADC_DIGI_RESULT_BYTES) {
adc_digi_output_data_t *p = (void*)&result[i];
uint32_t chan_num = ADC_DRIVER_TEST_GET_CHANNEL(p);
TEST_ASSERT(chan_num < SOC_ADC_CHANNEL_NUM(ADC_UNIT_1));
}
//Temperature sensor work after ADC continuous read
temp_sensor_test(temp_sensor);
TEST_ESP_OK(adc_continuous_stop(handle));
//Temperature sensor work after ADC continuous stop
temp_sensor_test(temp_sensor);
//Temperature sensor work after ADC continuous deinit
temp_sensor_test(temp_sensor);
TEST_ESP_OK(temperature_sensor_disable(temp_sensor));
TEST_ESP_OK(temperature_sensor_uninstall(temp_sensor));
TEST_ESP_OK(adc_continuous_deinit(handle));
free(result);
}
#endif // SOC_ADC_DMA_SUPPORTED
#endif // SOC_TEMP_SENSOR_SUPPORTED && SOC_ADC_SUPPORTED

2
components/esp_hw_support/adc_share_hw_ctrl.c
View File

@@ -211,7 +211,7 @@ void adc_apb_periph_claim(void)
#if SOC_RCC_IS_INDEPENDENT
adc_ll_enable_func_clock(true);
#endif
adc_ll_reset_register();
sar_periph_ctrl_adc_reset();
}
}

28
components/esp_hw_support/include/esp_private/sar_periph_ctrl.h
View File

@@ -95,6 +95,34 @@ void sar_periph_ctrl_power_enable(void);
*/
void sar_periph_ctrl_power_disable(void);
/*------------------------------------------------------------------------------
* ADC Reset
*----------------------------------------------------------------------------*/
/**
* @note For chips that temperature sensor uses part of ADC registers,
* ADC reset will reset these temperature sensor registers.
* So we need to backup and restore these temperature sensor registers when ADC reset.
* And in case temperature sensor result error during ADC reset,
* we need to acquire a lock to prevent temperature sensor readings during ADC reset.
*/
/**
* @brief Acquire ADC reset lock
*/
void adc_reset_lock_acquire(void);
/**
* @brief Release ADC reset lock
*/
void adc_reset_lock_release(void);
/**
* @brief Reset ADC module
*
*/
void sar_periph_ctrl_adc_reset(void);
#ifdef __cplusplus
}
#endif

22
components/esp_hw_support/port/esp32/sar_periph_ctrl.c
View File

@@ -19,7 +19,9 @@
#include "freertos/FreeRTOS.h"
#include "esp_private/sar_periph_ctrl.h"
#include "esp_private/critical_section.h"
#include "esp_private/adc_share_hw_ctrl.h"
#include "hal/sar_ctrl_ll.h"
#include "hal/adc_ll.h"
ESP_LOG_ATTR_TAG(TAG, "sar_periph_ctrl");
extern portMUX_TYPE rtc_spinlock;
@@ -116,3 +118,23 @@ void sar_periph_ctrl_adc_continuous_power_release(void)
{
s_sar_power_release();
}
/*------------------------------------------------------------------------------
* ADC Reset
*----------------------------------------------------------------------------*/
void sar_periph_ctrl_adc_reset(void)
{
ADC_BUS_CLK_ATOMIC() {
adc_ll_reset_register();
}
}
void adc_reset_lock_acquire(void)
{
// Empty implementation
}
void adc_reset_lock_release(void)
{
// Empty implementation
}

21
components/esp_hw_support/port/esp32c2/sar_periph_ctrl.c
View File

@@ -21,6 +21,7 @@
#include "esp_private/sar_periph_ctrl.h"
#include "esp_private/regi2c_ctrl.h"
#include "esp_private/critical_section.h"
#include "esp_private/adc_share_hw_ctrl.h"
#include "hal/sar_ctrl_ll.h"
#include "hal/adc_ll.h"
@@ -123,6 +124,26 @@ void sar_periph_ctrl_adc_oneshot_power_release(void)
s_sar_adc_power_release();
}
/*------------------------------------------------------------------------------
* ADC Reset
*----------------------------------------------------------------------------*/
void sar_periph_ctrl_adc_reset(void)
{
ADC_BUS_CLK_ATOMIC() {
adc_ll_reset_register();
}
}
void adc_reset_lock_acquire(void)
{
// Empty implementation
}
void adc_reset_lock_release(void)
{
// Empty implementation
}
void sar_periph_ctrl_adc_continuous_power_acquire(void)
{
abort(); //c2 not supported, should never reach here

36
components/esp_hw_support/port/esp32c3/sar_periph_ctrl.c
View File

@@ -15,17 +15,21 @@
* - Temp Sensor
*/
#include <sys/lock.h>
#include "sdkconfig.h"
#include "esp_log.h"
#include "freertos/FreeRTOS.h"
#include "esp_private/sar_periph_ctrl.h"
#include "esp_private/regi2c_ctrl.h"
#include "esp_private/critical_section.h"
#include "esp_private/adc_share_hw_ctrl.h"
#include "hal/sar_ctrl_ll.h"
#include "hal/adc_ll.h"
#include "hal/temperature_sensor_ll.h"
ESP_LOG_ATTR_TAG(TAG, "sar_periph_ctrl");
extern portMUX_TYPE rtc_spinlock;
static _lock_t adc_reset_lock;
void sar_periph_ctrl_init(void)
@@ -132,3 +136,35 @@ void sar_periph_ctrl_adc_continuous_power_release(void)
{
s_sar_adc_power_release();
}
/*------------------------------------------------------------------------------
* ADC Reset
*----------------------------------------------------------------------------*/
void sar_periph_ctrl_adc_reset(void)
{
// Acquire ADC reset lock to prevent temperature sensor readings during ADC reset
adc_reset_lock_acquire();
ADC_BUS_CLK_ATOMIC() {
// Save temperature sensor related register values before ADC reset
tsens_ll_reg_values_t saved_tsens_regs = {};
tsens_ll_backup_registers(&saved_tsens_regs);
adc_ll_reset_register();
// Restore temperature sensor related register values after ADC reset
temperature_sensor_ll_reset_module();
tsens_ll_restore_registers(&saved_tsens_regs);
}
// Release ADC reset lock after ADC reset is complete
adc_reset_lock_release();
}
void adc_reset_lock_acquire(void)
{
_lock_acquire(&adc_reset_lock);
}
void adc_reset_lock_release(void)
{
_lock_release(&adc_reset_lock);
}

37
components/esp_hw_support/port/esp32c5/sar_periph_ctrl.c
View File

@@ -14,6 +14,7 @@
* - PWDET
*/
#include <sys/lock.h>
#include "sdkconfig.h"
#include "esp_log.h"
#include "freertos/FreeRTOS.h"
@@ -21,10 +22,14 @@
#include "esp_private/regi2c_ctrl.h"
#include "esp_private/esp_modem_clock.h"
#include "esp_private/critical_section.h"
#include "esp_private/adc_share_hw_ctrl.h"
#include "hal/sar_ctrl_ll.h"
#include "hal/adc_ll.h"
#include "hal/temperature_sensor_ll.h"
ESP_LOG_ATTR_TAG(TAG, "sar_periph_ctrl");
extern portMUX_TYPE rtc_spinlock;
static _lock_t adc_reset_lock;
void sar_periph_ctrl_init(void)
{
@@ -120,3 +125,35 @@ void sar_periph_ctrl_adc_continuous_power_release(void)
{
s_sar_power_release();
}
/*------------------------------------------------------------------------------
* ADC Reset
*----------------------------------------------------------------------------*/
void sar_periph_ctrl_adc_reset(void)
{
// Acquire ADC reset lock to prevent temperature sensor readings during ADC reset
adc_reset_lock_acquire();
ADC_BUS_CLK_ATOMIC() {
// Save temperature sensor related register values before ADC reset
tsens_ll_reg_values_t saved_tsens_regs = {};
tsens_ll_backup_registers(&saved_tsens_regs);
adc_ll_reset_register();
// Restore temperature sensor related register values after ADC reset
temperature_sensor_ll_reset_module();
tsens_ll_restore_registers(&saved_tsens_regs);
}
// Release ADC reset lock after ADC reset is complete
adc_reset_lock_release();
}
void adc_reset_lock_acquire(void)
{
_lock_acquire(&adc_reset_lock);
}
void adc_reset_lock_release(void)
{
_lock_release(&adc_reset_lock);
}

37
components/esp_hw_support/port/esp32c6/sar_periph_ctrl.c
View File

@@ -14,6 +14,7 @@
* - PWDET
*/
#include <sys/lock.h>
#include "sdkconfig.h"
#include "esp_log.h"
#include "freertos/FreeRTOS.h"
@@ -21,10 +22,14 @@
#include "esp_private/regi2c_ctrl.h"
#include "esp_private/esp_modem_clock.h"
#include "esp_private/critical_section.h"
#include "esp_private/adc_share_hw_ctrl.h"
#include "hal/sar_ctrl_ll.h"
#include "hal/adc_ll.h"
#include "hal/temperature_sensor_ll.h"
ESP_LOG_ATTR_TAG(TAG, "sar_periph_ctrl");
extern portMUX_TYPE rtc_spinlock;
static _lock_t adc_reset_lock;
void sar_periph_ctrl_init(void)
@@ -121,3 +126,35 @@ void sar_periph_ctrl_adc_continuous_power_release(void)
{
s_sar_power_release();
}
/*------------------------------------------------------------------------------
* ADC Reset
*----------------------------------------------------------------------------*/
void sar_periph_ctrl_adc_reset(void)
{
// Acquire ADC reset lock to prevent temperature sensor readings during ADC reset
adc_reset_lock_acquire();
ADC_BUS_CLK_ATOMIC() {
// Save temperature sensor related register values before ADC reset
tsens_ll_reg_values_t saved_tsens_regs = {};
tsens_ll_backup_registers(&saved_tsens_regs);
adc_ll_reset_register();
// Restore temperature sensor related register values after ADC reset
temperature_sensor_ll_reset_module();
tsens_ll_restore_registers(&saved_tsens_regs);
}
// Release ADC reset lock after ADC reset is complete
adc_reset_lock_release();
}
void adc_reset_lock_acquire(void)
{
_lock_acquire(&adc_reset_lock);
}
void adc_reset_lock_release(void)
{
_lock_release(&adc_reset_lock);
}

37
components/esp_hw_support/port/esp32c61/sar_periph_ctrl.c
View File

@@ -14,6 +14,7 @@
* - PWDET
*/
#include <sys/lock.h>
#include "sdkconfig.h"
#include "esp_log.h"
#include "freertos/FreeRTOS.h"
@@ -21,10 +22,14 @@
#include "esp_private/regi2c_ctrl.h"
#include "esp_private/esp_modem_clock.h"
#include "esp_private/critical_section.h"
#include "esp_private/adc_share_hw_ctrl.h"
#include "hal/sar_ctrl_ll.h"
#include "hal/adc_ll.h"
#include "hal/temperature_sensor_ll.h"
ESP_LOG_ATTR_TAG(TAG, "sar_periph_ctrl");
extern portMUX_TYPE rtc_spinlock;
static _lock_t adc_reset_lock;
void sar_periph_ctrl_init(void)
{
@@ -120,3 +125,35 @@ void sar_periph_ctrl_adc_continuous_power_release(void)
{
s_sar_power_release();
}
/*------------------------------------------------------------------------------
* ADC Reset
*----------------------------------------------------------------------------*/
void sar_periph_ctrl_adc_reset(void)
{
// Acquire ADC reset lock to prevent temperature sensor readings during ADC reset
adc_reset_lock_acquire();
ADC_BUS_CLK_ATOMIC() {
// Save temperature sensor related register values before ADC reset
tsens_ll_reg_values_t saved_tsens_regs = {};
tsens_ll_backup_registers(&saved_tsens_regs);
adc_ll_reset_register();
// Restore temperature sensor related register values after ADC reset
temperature_sensor_ll_reset_module();
tsens_ll_restore_registers(&saved_tsens_regs);
}
// Release ADC reset lock after ADC reset is complete
adc_reset_lock_release();
}
void adc_reset_lock_acquire(void)
{
_lock_acquire(&adc_reset_lock);
}
void adc_reset_lock_release(void)
{
_lock_release(&adc_reset_lock);
}

37
components/esp_hw_support/port/esp32h2/sar_periph_ctrl.c
View File

@@ -14,16 +14,21 @@
* - PWDET
*/
#include <sys/lock.h>
#include "esp_log.h"
#include "freertos/FreeRTOS.h"
#include "esp_private/sar_periph_ctrl.h"
#include "esp_private/regi2c_ctrl.h"
#include "esp_private/esp_modem_clock.h"
#include "esp_private/critical_section.h"
#include "esp_private/adc_share_hw_ctrl.h"
#include "hal/sar_ctrl_ll.h"
#include "hal/adc_ll.h"
#include "hal/temperature_sensor_ll.h"
ESP_LOG_ATTR_TAG(TAG, "sar_periph_ctrl");
extern portMUX_TYPE rtc_spinlock;
static _lock_t adc_reset_lock;
void sar_periph_ctrl_init(void)
@@ -120,3 +125,35 @@ void sar_periph_ctrl_adc_continuous_power_release(void)
{
s_sar_power_release();
}
/*------------------------------------------------------------------------------
* ADC Reset
*----------------------------------------------------------------------------*/
void sar_periph_ctrl_adc_reset(void)
{
// Acquire ADC reset lock to prevent temperature sensor readings during ADC reset
adc_reset_lock_acquire();
ADC_BUS_CLK_ATOMIC() {
// Save temperature sensor related register values before ADC reset
tsens_ll_reg_values_t saved_tsens_regs = {};
tsens_ll_backup_registers(&saved_tsens_regs);
adc_ll_reset_register();
// Restore temperature sensor related register values after ADC reset
temperature_sensor_ll_reset_module();
tsens_ll_restore_registers(&saved_tsens_regs);
}
// Release ADC reset lock after ADC reset is complete
adc_reset_lock_release();
}
void adc_reset_lock_acquire(void)
{
_lock_acquire(&adc_reset_lock);
}
void adc_reset_lock_release(void)
{
_lock_release(&adc_reset_lock);
}

22
components/esp_hw_support/port/esp32p4/sar_periph_ctrl.c
View File

@@ -21,7 +21,9 @@
#include "esp_private/regi2c_ctrl.h"
#include "esp_private/esp_modem_clock.h"
#include "esp_private/critical_section.h"
#include "esp_private/adc_share_hw_ctrl.h"
#include "hal/sar_ctrl_ll.h"
#include "hal/adc_ll.h"
ESP_LOG_ATTR_TAG(TAG, "sar_periph_ctrl");
extern portMUX_TYPE rtc_spinlock;
@@ -118,3 +120,23 @@ void sar_periph_ctrl_adc_continuous_power_release(void)
{
s_sar_power_release();
}
/*------------------------------------------------------------------------------
* ADC Reset
*----------------------------------------------------------------------------*/
void sar_periph_ctrl_adc_reset(void)
{
ADC_BUS_CLK_ATOMIC() {
adc_ll_reset_register();
}
}
void adc_reset_lock_acquire(void)
{
// Empty implementation
}
void adc_reset_lock_release(void)
{
// Empty implementation
}

21
components/esp_hw_support/port/esp32s2/sar_periph_ctrl.c
View File

@@ -21,6 +21,7 @@
#include "esp_private/sar_periph_ctrl.h"
#include "esp_private/regi2c_ctrl.h"
#include "esp_private/critical_section.h"
#include "esp_private/adc_share_hw_ctrl.h"
#include "hal/sar_ctrl_ll.h"
#include "hal/adc_ll.h"
@@ -118,3 +119,23 @@ void sar_periph_ctrl_adc_continuous_power_release(void)
{
adc_ll_digi_set_power_manage(ADC_LL_POWER_BY_FSM);
}
/*------------------------------------------------------------------------------
* ADC Reset
*----------------------------------------------------------------------------*/
void sar_periph_ctrl_adc_reset(void)
{
ADC_BUS_CLK_ATOMIC() {
adc_ll_reset_register();
}
}
void adc_reset_lock_acquire(void)
{
// Empty implementation
}
void adc_reset_lock_release(void)
{
// Empty implementation
}

21
components/esp_hw_support/port/esp32s3/sar_periph_ctrl.c
View File

@@ -21,6 +21,7 @@
#include "esp_private/sar_periph_ctrl.h"
#include "esp_private/regi2c_ctrl.h"
#include "esp_private/critical_section.h"
#include "esp_private/adc_share_hw_ctrl.h"
#include "hal/sar_ctrl_ll.h"
#include "hal/adc_ll.h"
@@ -121,3 +122,23 @@ void sar_periph_ctrl_adc_continuous_power_release(void)
{
s_sar_power_release();
}
/*------------------------------------------------------------------------------
* ADC Reset
*----------------------------------------------------------------------------*/
void sar_periph_ctrl_adc_reset(void)
{
ADC_BUS_CLK_ATOMIC() {
adc_ll_reset_register();
}
}
void adc_reset_lock_acquire(void)
{
// Empty implementation
}
void adc_reset_lock_release(void)
{
// Empty implementation
}

3
components/esp_hw_support/sar_tsens_ctrl.c
View File

@@ -103,7 +103,10 @@ int16_t temp_sensor_get_raw_value(bool *range_changed)
s_first_temp_read = false;
}
adc_reset_lock_acquire();
result = temperature_sensor_hal_get_degree(range_changed);
adc_reset_lock_release();
esp_os_exit_critical(&rtc_spinlock);
return result;

30
components/hal/esp32c3/include/hal/temperature_sensor_ll.h
View File

@@ -172,6 +172,36 @@ static inline int temperature_sensor_ll_load_calib_param(void)
return tsens_cal;
}
/**
* @brief Structure for temperature sensor related register values
*/
typedef struct {
uint32_t tsens_ctrl; // Temperature sensor control register (APB_SARADC_APB_TSENS_CTRL_REG)
uint32_t tsens_ctrl2; // Temperature sensor control register 2 (APB_SARADC_THRES1_HIGH_INT_ST_M)
} tsens_ll_reg_values_t;
/**
* @brief Read temperature sensor related ADC register values for backup
*
* @param reg_values Output parameter, pointer to structure for storing register values
*/
static inline void tsens_ll_backup_registers(tsens_ll_reg_values_t *reg_values)
{
reg_values->tsens_ctrl = APB_SARADC.apb_tsens_ctrl.val;
reg_values->tsens_ctrl2 = APB_SARADC.apb_tsens_ctrl2.val;
}
/**
* @brief Restore temperature sensor related ADC register values from backup
*
* @param reg_values Input parameter, pointer to structure containing register values to restore
*/
static inline void tsens_ll_restore_registers(const tsens_ll_reg_values_t *reg_values)
{
APB_SARADC.apb_tsens_ctrl.val = reg_values->tsens_ctrl;
APB_SARADC.apb_tsens_ctrl2.val = reg_values->tsens_ctrl2;
}
#ifdef __cplusplus
}
#endif

36
components/hal/esp32c5/include/hal/temperature_sensor_ll.h
View File

@@ -284,6 +284,42 @@ static inline int temperature_sensor_ll_load_calib_param(void)
return tsens_cal;
}
/**
* @brief Structure for temperature sensor related register values
*/
typedef struct {
uint32_t tsens_ctrl; // Temperature sensor control register (APB_SARADC_APB_TSENS_CTRL_REG)
uint32_t tsens_ctrl2; // Temperature sensor control register 2 (APB_SARADC_TSENS_CTRL2_REG)
uint32_t tsens_wake; // Temperature sensor wake register (APB_TSENS_WAKE_REG)
uint32_t tsens_sample; // Temperature sensor sample register (APB_TSENS_SAMPLE_REG)
} tsens_ll_reg_values_t;
/**
* @brief Read temperature sensor related ADC register values for backup
*
* @param reg_values Output parameter, pointer to structure for storing register values
*/
static inline void tsens_ll_backup_registers(tsens_ll_reg_values_t *reg_values)
{
reg_values->tsens_ctrl = APB_SARADC.saradc_apb_tsens_ctrl.val;
reg_values->tsens_ctrl2 = APB_SARADC.saradc_tsens_ctrl2.val;
reg_values->tsens_wake = APB_SARADC.tsens_wake.val;
reg_values->tsens_sample = APB_SARADC.tsens_sample.val;
}
/**
* @brief Restore temperature sensor related ADC register values from backup
*
* @param reg_values Input parameter, pointer to structure containing register values to restore
*/
static inline void tsens_ll_restore_registers(const tsens_ll_reg_values_t *reg_values)
{
APB_SARADC.saradc_apb_tsens_ctrl.val = reg_values->tsens_ctrl;
APB_SARADC.saradc_tsens_ctrl2.val = reg_values->tsens_ctrl2;
APB_SARADC.tsens_wake.val = reg_values->tsens_wake;
APB_SARADC.tsens_sample.val = reg_values->tsens_sample;
}
#ifdef __cplusplus
}
#endif

54
components/hal/esp32c6/include/hal/temperature_sensor_ll.h
View File

@@ -284,6 +284,60 @@ static inline int temperature_sensor_ll_load_calib_param(void)
return tsens_cal;
}
/**
* @brief Structure for temperature sensor related register values
*/
typedef struct {
uint32_t tsens_ctrl; // Temperature sensor control register (APB_SARADC_APB_TSENS_CTRL_REG)
uint32_t tsens_ctrl2; // Temperature sensor control register 2 (APB_SARADC_TSENS_CTRL2_REG)
uint32_t tsens_wake; // Temperature sensor wake register (APB_TSENS_WAKE_REG)
uint32_t tsens_sample; // Temperature sensor sample register (APB_TSENS_SAMPLE_REG)
uint32_t cali; // ADC calibration register
uint32_t clkm_conf; // ADC clock configuration register
uint32_t int_ena; // ADC interrupt enable register
uint32_t int_raw; // ADC interrupt raw status register
uint32_t int_st; // ADC interrupt status register
uint32_t int_clr; // ADC interrupt clear register
} tsens_ll_reg_values_t;
/**
* @brief Read temperature sensor related ADC register values for backup
*
* @param reg_values Output parameter, pointer to structure for storing register values
*/
static inline void tsens_ll_backup_registers(tsens_ll_reg_values_t *reg_values)
{
reg_values->tsens_ctrl = APB_SARADC.saradc_apb_tsens_ctrl.val;
reg_values->tsens_ctrl2 = APB_SARADC.saradc_tsens_ctrl2.val;
reg_values->tsens_wake = APB_SARADC.tsens_wake.val;
reg_values->tsens_sample = APB_SARADC.tsens_sample.val;
reg_values->cali = APB_SARADC.saradc_cali.val;
reg_values->clkm_conf = APB_SARADC.saradc_clkm_conf.val;
reg_values->int_ena = APB_SARADC.saradc_int_ena.val;
reg_values->int_raw = APB_SARADC.saradc_int_raw.val;
reg_values->int_st = APB_SARADC.saradc_int_st.val;
reg_values->int_clr = APB_SARADC.saradc_int_clr.val;
}
/**
* @brief Restore temperature sensor related ADC register values from backup
*
* @param reg_values Input parameter, pointer to structure containing register values to restore
*/
static inline void tsens_ll_restore_registers(const tsens_ll_reg_values_t *reg_values)
{
APB_SARADC.saradc_apb_tsens_ctrl.val = reg_values->tsens_ctrl;
APB_SARADC.saradc_tsens_ctrl2.val = reg_values->tsens_ctrl2;
APB_SARADC.tsens_wake.val = reg_values->tsens_wake;
APB_SARADC.tsens_sample.val = reg_values->tsens_sample;
APB_SARADC.saradc_cali.val = reg_values->cali;
APB_SARADC.saradc_clkm_conf.val = reg_values->clkm_conf;
APB_SARADC.saradc_int_ena.val = reg_values->int_ena;
APB_SARADC.saradc_int_raw.val = reg_values->int_raw;
APB_SARADC.saradc_int_st.val = reg_values->int_st;
APB_SARADC.saradc_int_clr.val = reg_values->int_clr;
}
#ifdef __cplusplus
}
#endif

36
components/hal/esp32c61/include/hal/temperature_sensor_ll.h
View File

@@ -284,6 +284,42 @@ static inline int temperature_sensor_ll_load_calib_param(void)
return tsens_cal;
}
/**
* @brief Structure for temperature sensor related register values
*/
typedef struct {
uint32_t tsens_ctrl; // Temperature sensor control register (SARADC_APB_TSENS_CTRL_REG)
uint32_t tsens_ctrl2; // Temperature sensor control register 2 (SARADC_TSENS_CTRL2_REG)
uint32_t tsens_wake; // Temperature sensor wake register (APB_TSENS_WAKE_REG)
uint32_t tsens_sample; // Temperature sensor sample register (APB_TSENS_SAMPLE_REG)
} tsens_ll_reg_values_t;
/**
* @brief Read temperature sensor related ADC register values for backup
*
* @param reg_values Output parameter, pointer to structure for storing register values
*/
static inline void tsens_ll_backup_registers(tsens_ll_reg_values_t *reg_values)
{
reg_values->tsens_ctrl = ADC.saradc_apb_tsens_ctrl.val;
reg_values->tsens_ctrl2 = ADC.saradc_tsens_ctrl2.val;
reg_values->tsens_wake = ADC.tsens_wake.val;
reg_values->tsens_sample = ADC.tsens_sample.val;
}
/**
* @brief Restore temperature sensor related ADC register values from backup
*
* @param reg_values Input parameter, pointer to structure containing register values to restore
*/
static inline void tsens_ll_restore_registers(const tsens_ll_reg_values_t *reg_values)
{
ADC.saradc_apb_tsens_ctrl.val = reg_values->tsens_ctrl;
ADC.saradc_tsens_ctrl2.val = reg_values->tsens_ctrl2;
ADC.tsens_wake.val = reg_values->tsens_wake;
ADC.tsens_sample.val = reg_values->tsens_sample;
}
#ifdef __cplusplus
}
#endif

36
components/hal/esp32h2/include/hal/temperature_sensor_ll.h
View File

@@ -283,6 +283,42 @@ static inline int temperature_sensor_ll_load_calib_param(void)
return tsens_cal;
}
/**
* @brief Structure for temperature sensor related register values
*/
typedef struct {
uint32_t tsens_ctrl; // Temperature sensor control register (APB_SARADC_APB_TSENS_CTRL_REG)
uint32_t tsens_ctrl2; // Temperature sensor control register 2 (APB_SARADC_TSENS_CTRL2_REG)
uint32_t tsens_wake; // Temperature sensor wake register (APB_TSENS_WAKE_REG)
uint32_t tsens_sample; // Temperature sensor sample register (APB_TSENS_SAMPLE_REG)
} tsens_ll_reg_values_t;
/**
* @brief Read temperature sensor related ADC register values for backup
*
* @param reg_values Output parameter, pointer to structure for storing register values
*/
static inline void tsens_ll_backup_registers(tsens_ll_reg_values_t *reg_values)
{
reg_values->tsens_ctrl = APB_SARADC.saradc_apb_tsens_ctrl.val;
reg_values->tsens_ctrl2 = APB_SARADC.saradc_tsens_ctrl2.val;
reg_values->tsens_wake = APB_SARADC.tsens_wake.val;
reg_values->tsens_sample = APB_SARADC.tsens_sample.val;
}
/**
* @brief Restore temperature sensor related ADC register values from backup
*
* @param reg_values Input parameter, pointer to structure containing register values to restore
*/
static inline void tsens_ll_restore_registers(const tsens_ll_reg_values_t *reg_values)
{
APB_SARADC.saradc_apb_tsens_ctrl.val = reg_values->tsens_ctrl;
APB_SARADC.saradc_tsens_ctrl2.val = reg_values->tsens_ctrl2;
APB_SARADC.tsens_wake.val = reg_values->tsens_wake;
APB_SARADC.tsens_sample.val = reg_values->tsens_sample;
}
#ifdef __cplusplus
}
#endif