alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-09-20 20:56:01 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

change(ulp): added test for ulp adc init/deinit

Browse Source
This commit is contained in:
Marius Vikhammer 2023-12-14 19:02:32 +08:00 committed by BOT
parent 39a5f73a75
commit d7649cbc4d
3 changed files with 52 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
components/ulp/test_apps/ulp_riscv/main/test_ulp_riscv.c
View File

@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2010-2022 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2010-2023 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@ -13,6 +13,7 @@
#include "soc/rtc_periph.h"
#include "ulp_riscv.h"
#include "ulp_riscv_lock.h"
#include "ulp_adc.h"
#include "ulp_test_app.h"
#include "ulp_test_app2.h"
#include "ulp_test_shared.h"
@ -21,6 +22,7 @@
#include "freertos/FreeRTOS.h"
#include "freertos/task.h"
#include "freertos/semphr.h"
#include "esp_adc/adc_oneshot.h"
#define ULP_WAKEUP_PERIOD 1000000 // 1 second
@ -434,3 +436,42 @@ TEST_CASE("ULP-RISC-V interrupt signals can be handled via ISRs on the main core
firmware_loaded = false;
load_and_start_ulp_firmware(ulp_main_bin_start, ulp_main_bin_length);
}
#define ATTEN 3
#define WIDTH 0
#define CHANNEL 6
#define ADC_UNIT ADC_UNIT_1
TEST_CASE("ULP ADC can init-deinit-init", "[ulp]")
{
ulp_adc_cfg_t riscv_adc_cfg = {
.adc_n = ADC_UNIT,
.channel = CHANNEL,
.width = WIDTH,
.atten = ATTEN,
.ulp_mode = ADC_ULP_MODE_FSM,
};
TEST_ASSERT_EQUAL(ESP_OK, ulp_adc_init(&riscv_adc_cfg));
TEST_ASSERT_EQUAL(ESP_OK, ulp_adc_deinit());
/* Check that we can init one-shot ADC */
adc_oneshot_unit_handle_t adc1_handle;
adc_oneshot_unit_init_cfg_t init_config1 = {
.unit_id = ADC_UNIT,
};
TEST_ASSERT_EQUAL(ESP_OK, adc_oneshot_new_unit(&init_config1, &adc1_handle));
adc_oneshot_chan_cfg_t config = {
.bitwidth = WIDTH,
.atten = ATTEN,
};
TEST_ASSERT_EQUAL(ESP_OK, adc_oneshot_config_channel(adc1_handle, CHANNEL, &config));
TEST_ASSERT_EQUAL(ESP_OK, adc_oneshot_del_unit(adc1_handle));
/* Re-init ADC for ULP */
TEST_ASSERT_EQUAL(ESP_OK, ulp_adc_init(&riscv_adc_cfg));
TEST_ASSERT_EQUAL(ESP_OK, ulp_adc_deinit());
}

2
components/ulp/ulp_common/include/ulp_adc.h
View File

@ -34,7 +34,7 @@ esp_err_t ulp_adc_init(const ulp_adc_cfg_t *cfg);
*
* @return esp_err_t ESP_OK for successful.
*/
esp_err_t ulp_adc_deinit();
esp_err_t ulp_adc_deinit(void);
#ifdef __cplusplus
}

14
components/ulp/ulp_common/ulp_adc.c
View File

@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@ -37,7 +37,9 @@ esp_err_t ulp_adc_init(const ulp_adc_cfg_t *cfg)
}
ret = adc_oneshot_new_unit(&init_config1, &s_adc1_handle);
if (ret != ESP_OK) return ret;
if (ret != ESP_OK) {
return ret;
}
//-------------ADC1 Config---------------//
adc_oneshot_chan_cfg_t config = {
@ -45,7 +47,9 @@ esp_err_t ulp_adc_init(const ulp_adc_cfg_t *cfg)
.atten = cfg->atten,
};
ret = adc_oneshot_config_channel(s_adc1_handle, cfg->channel, &config);
if (ret != ESP_OK) return ret;
if (ret != ESP_OK) {
return ret;
}
//Calibrate the ADC
#if SOC_ADC_CALIBRATION_V1_SUPPORTED
@ -55,8 +59,8 @@ esp_err_t ulp_adc_init(const ulp_adc_cfg_t *cfg)
return ret;
}
esp_err_t ulp_adc_deinit()
esp_err_t ulp_adc_deinit(void)
{
// No need to check for null-pointer and stuff, oneshot driver already does that
return adc_oneshot_del_unit(s_adc1_handle);
}
}