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

add lp_core to Berry ULP module (#22567)

This commit is contained in:
Christian Baars 2024-11-30 19:01:12 +01:00 committed by GitHub
parent fbb2c84f29
commit bed14174bc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 46 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libesp32/berry/default/be_modtab.c
View File

@ -178,7 +178,7 @@ BERRY_LOCAL const bntvmodule_t* const be_module_table[] = {
&be_native_module(partition_core), &be_native_module(partition_core),
&be_native_module(crc), &be_native_module(crc),
&be_native_module(crypto), &be_native_module(crypto),
#if defined(USE_BERRY_ULP) && ((CONFIG_IDF_TARGET_ESP32) || defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3)) #if defined(USE_BERRY_ULP) && defined(CONFIG_ULP_COPROC_ENABLED)
&be_native_module(ULP), &be_native_module(ULP),
#endif // USE_BERRY_ULP #endif // USE_BERRY_ULP
#if defined(USE_BERRY_TF_LITE) #if defined(USE_BERRY_TF_LITE)

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

@ -6,7 +6,7 @@
#include "be_constobj.h" #include "be_constobj.h"
#include "be_mapping.h" #include "be_mapping.h"
#if defined(USE_BERRY_ULP) && (defined(CONFIG_IDF_TARGET_ESP32) || defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3)) #if defined(USE_BERRY_ULP) && defined(CONFIG_ULP_COPROC_ENABLED)
extern void be_ULP_run(int32_t entry); extern void be_ULP_run(int32_t entry);
BE_FUNC_CTYPE_DECLARE(be_ULP_run, "", "[i]"); BE_FUNC_CTYPE_DECLARE(be_ULP_run, "", "[i]");

87
tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_ulp.ino
View File

@ -21,34 +21,39 @@
#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) // #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_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 ESP_IDF_VERSION_MAJOR < 5
#if defined(CONFIG_IDF_TARGET_ESP32S2) // #if defined(CONFIG_IDF_TARGET_ESP32S2)
#include "esp32s2/ulp.h" // #include "esp32s2/ulp.h"
#include "esp32s2/ulp_riscv.h" // #include "esp32s2/ulp_riscv.h"
#include "esp32s2/ulp_riscv_adc.h" // #include "esp32s2/ulp_riscv_adc.h"
#endif // s2 // #endif // s2
#if defined(CONFIG_IDF_TARGET_ESP32S3) // #if defined(CONFIG_IDF_TARGET_ESP32S3)
#include "esp32s3/ulp.h" // #include "esp32s3/ulp.h"
#include "esp32s3/ulp_riscv.h" // #include "esp32s3/ulp_riscv.h"
#include "esp32s3/ulp_riscv_adc.h" // #include "esp32s3/ulp_riscv_adc.h"
#endif //s3 // #endif //s3
#endif // ESP_IDF_VERSION_MAJOR < 5 // #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 // #if ESP_IDF_VERSION_MAJOR >= 5
#include "esp_adc/adc_oneshot.h" #include "esp_adc/adc_oneshot.h"
#include "ulp_adc.h" #include "ulp_adc.h"
#if defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3) #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 // #else
#include "driver/adc.h" // #include "driver/adc.h"
#endif // ESP_IDF_VERSION_MAJOR >= 5 // #endif // ESP_IDF_VERSION_MAJOR >= 5
#ifdef CONFIG_ULP_COPROC_TYPE_LP_CORE
#include "ulp_lp_core.h"
ulp_lp_core_cfg_t be_ulp_lp_core_cfg;
#endif //CONFIG_ULP_COPROC_TYPE_LP_CORE
#include "sdkconfig.h" #include "sdkconfig.h"
@ -60,14 +65,21 @@ extern "C" {
void be_ULP_run(int32_t entry) { void be_ULP_run(int32_t entry) {
#if defined(CONFIG_IDF_TARGET_ESP32) #if defined(CONFIG_IDF_TARGET_ESP32)
ulp_run(entry); // entry point should be at the beginning of program ulp_run(entry); // entry point should be at the beginning of program
#else // S2 or S3 #elif defined(CONFIG_ULP_COPROC_TYPE_RISCV) // S2 or S3
ulp_riscv_run(); ulp_riscv_run();
#else // lp_core
int err = ulp_lp_core_run(&be_ulp_lp_core_cfg);
#endif #endif
} }
// `ULP.wake_period(period_index:int, period_us:int) -> nil` // `ULP.wake_period(period_index:int, period_us:int) -> nil`
void be_ULP_wake_up_period(int32_t period_index, int32_t period_us) { void be_ULP_wake_up_period(int32_t period_index, int32_t period_us) {
#ifdef CONFIG_ULP_COPROC_TYPE_LP_CORE
be_ulp_lp_core_cfg.wakeup_source = ULP_LP_CORE_WAKEUP_SOURCE_LP_TIMER;
be_ulp_lp_core_cfg.lp_timer_sleep_duration_us = period_us;
#else
ulp_set_wakeup_period(period_index, period_us); ulp_set_wakeup_period(period_index, period_us);
#endif //CONFIG_ULP_COPROC_TYPE_LP_CORE
} }
// `ULP.set_mem(position:int, value:int) -> value:int` // `ULP.set_mem(position:int, value:int) -> value:int`
@ -102,7 +114,6 @@ extern "C" {
// 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) { void 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)
#if ESP_IDF_VERSION_MAJOR >= 5
ulp_adc_cfg_t cfg = { ulp_adc_cfg_t cfg = {
.adc_n = ADC_UNIT_1, .adc_n = ADC_UNIT_1,
.channel = (adc_channel_t)channel, .channel = (adc_channel_t)channel,
@ -111,20 +122,7 @@ extern "C" {
.ulp_mode = ADC_ULP_MODE_FSM, .ulp_mode = ADC_ULP_MODE_FSM,
}; };
esp_err_t err = ulp_adc_init(&cfg); esp_err_t err = ulp_adc_init(&cfg);
#else #elif defined(CONFIG_ULP_COPROC_TYPE_RISCV) // S2 or S3
esp_err_t err = adc1_config_channel_atten((adc1_channel_t)channel, (adc_atten_t)attenuation);
err += adc1_config_width((adc_bits_width_t)width);
#endif // ESP_IDF_VERSION_MAJOR >= 5
if (err != ESP_OK) {
be_raisef(vm, "ulp_adc_config_error", "ULP: invalid code err=%i", err);
}
#if ESP_IDF_VERSION_MAJOR < 5
else {
adc1_ulp_enable();
}
#endif // ESP_IDF_VERSION_MAJOR < 5
#else // S2 or S3
#if ESP_IDF_VERSION_MAJOR >= 5
ulp_adc_cfg_t cfg = { ulp_adc_cfg_t cfg = {
.adc_n = ADC_UNIT_1, .adc_n = ADC_UNIT_1,
.channel = (adc_channel_t)channel, .channel = (adc_channel_t)channel,
@ -134,17 +132,18 @@ extern "C" {
}; };
esp_err_t err = ulp_adc_init(&cfg); esp_err_t err = ulp_adc_init(&cfg);
#else #else
ulp_riscv_adc_cfg_t cfg = { // esp_err_t err = lp_core_lp_adc_init(ADC_UNIT_1);
.channel = (adc_channel_t)channel, // const lp_core_lp_adc_chan_cfg_t config = {
.atten = (adc_atten_t)attenuation, // .atten = (adc_atten_t)attenuation,
.width = (adc_bits_width_t)width // .bitwidth = (adc_bitwidth_t)width,
}; // };
esp_err_t err = ulp_riscv_adc_init(&cfg); // err += lp_core_lp_adc_config_channel(ADC_UNIT_1, (adc_channel_t)channel, &config);
#endif // ESP_IDF_VERSION_MAJOR >= 5 be_raisef(vm, "ulp_adc_config_error", "ULP: not supported before ESP-IDF 5.4");
esp_err_t err = ESP_FAIL;
#endif
if (err != ESP_OK) { if (err != ESP_OK) {
be_raisef(vm, "ulp_adc_config_error", "ULP: invalid code err=%i", err); be_raisef(vm, "ulp_adc_config_error", "ULP: invalid code err=%i", err);
} }
#endif
} }
/** /**
@ -156,8 +155,10 @@ extern "C" {
void be_ULP_load(struct bvm *vm, const uint8_t *buf, size_t size) { void be_ULP_load(struct bvm *vm, const uint8_t *buf, size_t size) {
#if defined(CONFIG_IDF_TARGET_ESP32) #if defined(CONFIG_IDF_TARGET_ESP32)
esp_err_t err = ulp_load_binary(0, buf, size / 4); // FSM type only, specific header, size in long words esp_err_t err = ulp_load_binary(0, buf, size / 4); // FSM type only, specific header, size in long words
#else // S2 or S3 #elif defined(CONFIG_ULP_COPROC_TYPE_RISCV) // S2 or S3
esp_err_t err = ulp_riscv_load_binary(buf, size); // there are no header bytes, just load and hope for a valid binary - size in bytes esp_err_t err = ulp_riscv_load_binary(buf, size); // there are no header bytes, just load and hope for a valid binary - size in bytes
#else
esp_err_t err = ulp_lp_core_load_binary(buf,size); // check valid size, size in bytes
#endif // defined(CONFIG_IDF_TARGET_ESP32) #endif // defined(CONFIG_IDF_TARGET_ESP32)
if (err != ESP_OK) { if (err != ESP_OK) {
be_raisef(vm, "ulp_load_error", "ULP: invalid code err=%i", err); be_raisef(vm, "ulp_load_error", "ULP: invalid code err=%i", err);