mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

no assertion when adc_config fails (#22696)

This commit is contained in:
Christian Baars 2024-12-21 18:38:06 +01:00 committed by GitHub
parent f59c1675eb
commit f3fcbea6d1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libesp32/berry_tasmota/src/be_ULP_lib.c
View File

@ -23,8 +23,8 @@ BE_FUNC_CTYPE_DECLARE(be_ULP_get_mem, "i", "i");
extern int32_t be_ULP_gpio_init(int32_t pin, int32_t mode); extern int32_t be_ULP_gpio_init(int32_t pin, int32_t mode);
BE_FUNC_CTYPE_DECLARE(be_ULP_gpio_init, "i", "ii"); BE_FUNC_CTYPE_DECLARE(be_ULP_gpio_init, "i", "ii");
extern void be_ULP_adc_config(struct bvm *vm, int32_t channel, int32_t attenuation, int32_t width); extern int32_t be_ULP_adc_config(struct bvm *vm, int32_t channel, int32_t attenuation, int32_t width);
BE_FUNC_CTYPE_DECLARE(be_ULP_adc_config, "", "@iii"); BE_FUNC_CTYPE_DECLARE(be_ULP_adc_config, "i", "@iii");
extern void be_ULP_sleep(int32_t wake_up_s); extern void be_ULP_sleep(int32_t wake_up_s);
BE_FUNC_CTYPE_DECLARE(be_ULP_sleep, "", "[i]"); // optional int arg BE_FUNC_CTYPE_DECLARE(be_ULP_sleep, "", "[i]"); // optional int arg

35
tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_ulp.ino
View File

@ -21,35 +21,20 @@
#ifdef USE_BERRY_ULP #ifdef USE_BERRY_ULP
#include <berry.h> #include <berry.h>
// #if defined(CONFIG_IDF_TARGET_ESP32) || defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3) || defined(CONFIG_ULP_COPROC_TYPE_LP_CORE)
#if defined(CONFIG_ULP_COPROC_ENABLED) #if defined(CONFIG_ULP_COPROC_ENABLED)
#if defined(CONFIG_IDF_TARGET_ESP32) #if defined(CONFIG_IDF_TARGET_ESP32)
#include "esp32/ulp.h" #include "esp32/ulp.h"
#endif // esp32 #endif // esp32
// #if ESP_IDF_VERSION_MAJOR < 5
// #if defined(CONFIG_IDF_TARGET_ESP32S2)
// #include "esp32s2/ulp.h"
// #include "esp32s2/ulp_riscv.h"
// #include "esp32s2/ulp_riscv_adc.h"
// #endif // s2
// #if defined(CONFIG_IDF_TARGET_ESP32S3)
// #include "esp32s3/ulp.h"
// #include "esp32s3/ulp_riscv.h"
// #include "esp32s3/ulp_riscv_adc.h"
// #endif //s3
// #endif // ESP_IDF_VERSION_MAJOR < 5
#include "driver/rtc_io.h" #include "driver/rtc_io.h"
#include "driver/gpio.h" #include "driver/gpio.h"
// #if ESP_IDF_VERSION_MAJOR >= 5
#include "esp_adc/adc_oneshot.h" #include "ulp_adc.h"
#include "ulp_adc.h" #if defined(CONFIG_ULP_COPROC_TYPE_RISCV) // S2 or S3
#if defined(CONFIG_ULP_COPROC_TYPE_RISCV) // S2 or S3
#include "ulp_riscv.h" #include "ulp_riscv.h"
#endif // defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3) #endif // defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3)
// #else
// #include "driver/adc.h"
// #endif // ESP_IDF_VERSION_MAJOR >= 5
#ifdef CONFIG_ULP_COPROC_TYPE_LP_CORE #ifdef CONFIG_ULP_COPROC_TYPE_LP_CORE
#include "ulp_lp_core.h" #include "ulp_lp_core.h"
ulp_lp_core_cfg_t be_ulp_lp_core_cfg; ulp_lp_core_cfg_t be_ulp_lp_core_cfg;
@ -109,10 +94,10 @@ extern "C" {
} }
} }
// `ULP.adc_config(channel:int, attenuation:int, width:int) -> nil` // `ULP.adc_config(channel:int, attenuation:int, width:int) -> error:int`
// //
// enums: channel 0-7, attenuation 0-3, width 0-3 // enums: channel 0-7, attenuation 0-3, width 0-3
void be_ULP_adc_config(struct bvm *vm, int32_t channel, int32_t attenuation, int32_t width) { int32_t be_ULP_adc_config(struct bvm *vm, int32_t channel, int32_t attenuation, int32_t width) {
#if defined(CONFIG_IDF_TARGET_ESP32) #if defined(CONFIG_IDF_TARGET_ESP32)
ulp_adc_cfg_t cfg = { ulp_adc_cfg_t cfg = {
.adc_n = ADC_UNIT_1, .adc_n = ADC_UNIT_1,
@ -141,9 +126,7 @@ extern "C" {
be_raisef(vm, "ulp_adc_config_error", "ULP: not supported before ESP-IDF 5.4"); be_raisef(vm, "ulp_adc_config_error", "ULP: not supported before ESP-IDF 5.4");
esp_err_t err = ESP_FAIL; esp_err_t err = ESP_FAIL;
#endif #endif
if (err != ESP_OK) { return err;
be_raisef(vm, "ulp_adc_config_error", "ULP: invalid code err=%i", err);
}
} }
/** /**