From e5454c55f3a4848b44d7b844e806b3361d47f1d8 Mon Sep 17 00:00:00 2001 From: NDJ-Ezlo Date: Tue, 2 Apr 2024 13:07:12 +0545 Subject: [PATCH 1/7] Device status BLE characteristics added --- .../ezlopi-service-ble/ezlopi_service_ble.h | 2 + .../ezlopi_service_ble_device_info.c | 73 +++++++++++++++++++ .../ezlopi_service_ble_provisioning.c | 3 +- sdkconfig | 4 +- sdkconfig.old | 6 +- 5 files changed, 83 insertions(+), 5 deletions(-) diff --git a/ezlopi-services/ezlopi-service-ble/ezlopi_service_ble.h b/ezlopi-services/ezlopi-service-ble/ezlopi_service_ble.h index f941f1f70..ea5bde30b 100644 --- a/ezlopi-services/ezlopi-service-ble/ezlopi_service_ble.h +++ b/ezlopi-services/ezlopi-service-ble/ezlopi_service_ble.h @@ -29,10 +29,12 @@ #define BLE_DEVICE_INFO_ID_HANDLE 3 #define BLE_DEVICE_INFO_SERVICE_UUID 0x00E4 #define BLE_DEVICE_INFO_CHAR_UUID 0xE401 +#define BLE_DEVICE_STATUS_CHAR_NET_INFO_UUDI 0xE402 #define BLE_DYNAMIC_CONFIG_HANDLE 4 #define BLE_DYNAMIC_CONFIG_SERVICE_UUID 0x00E5 #define BLE_DYNAMIC_CONFIG_CHAR_UUID 0xE501 + void ezlopi_ble_service_init(void); diff --git a/ezlopi-services/ezlopi-service-ble/ezlopi_service_ble_device_info.c b/ezlopi-services/ezlopi-service-ble/ezlopi_service_ble_device_info.c index c8465553d..3077bbbc6 100644 --- a/ezlopi-services/ezlopi-service-ble/ezlopi_service_ble_device_info.c +++ b/ezlopi-services/ezlopi-service-ble/ezlopi_service_ble_device_info.c @@ -17,6 +17,7 @@ #include "ezlopi_core_ble_buffer.h" #include "ezlopi_core_ble_profile.h" #include "ezlopi_core_factory_info.h" +#include "ezlopi_core_event_group.h" #include "ezlopi_hal_system_info.h" @@ -24,11 +25,16 @@ #include "ezlopi_service_ble.h" +#define AND && +#define OR || + static s_gatt_service_t* g_device_info_service = NULL; +static s_gatt_char_t* g_device_status_notify_characteristics = NULL; static char* device_info_jsonify(void); static void __add_factory_info_to_root(cJSON* root, char* key, char* value); static void device_info_read_func(esp_gatt_value_t* value, esp_ble_gatts_cb_param_t* param); +static void device_status_read_func(esp_gatt_value_t* value, esp_ble_gatts_cb_param_t* param); void ezlopi_ble_service_device_info_init(void) { @@ -47,8 +53,75 @@ void ezlopi_ble_service_device_info_init(void) properties = ESP_GATT_CHAR_PROP_BIT_READ; ezlopi_ble_gatt_add_characteristic(g_device_info_service, &uuid, permission, properties, device_info_read_func, NULL, NULL); TRACE_W("'provisioning_service' character added to ezlopi-ble-stack"); + + uuid.uuid.uuid16 = BLE_DEVICE_STATUS_CHAR_NET_INFO_UUDI; + uuid.len = ESP_UUID_LEN_16; + permission = ESP_GATT_PERM_READ; + properties = ESP_GATT_CHAR_PROP_BIT_NOTIFY | ESP_GATT_CHAR_PROP_BIT_READ; + g_device_status_notify_characteristics = ezlopi_ble_gatt_add_characteristic(g_device_info_service, &uuid, permission, properties, device_status_read_func, NULL, NULL); +} + +static void device_status_read_func(esp_gatt_value_t* value, esp_ble_gatts_cb_param_t* param) +{ + if (value) + { + cJSON* cj_device_status = cJSON_CreateObject(); + if (cj_device_status) + { + e_ezlopi_event_t event = ezlopi_get_event_bit_status(); + + bool wifi_conn_status = (event & EZLOPI_EVENT_WIFI_CONNECTED) == EZLOPI_EVENT_WIFI_CONNECTED; + cJSON_AddStringToObject(cj_device_status, "wifi_status", (true == wifi_conn_status) ? "Connected" : "Disconnected"); + cJSON_AddStringToObject(cj_device_status, "internet_status", (true == wifi_conn_status) ? "Connected" : "Disconnected"); + + bool cloud_status = (event & EZLOPI_EVENT_NMA_REG) == EZLOPI_EVENT_NMA_REG; + cJSON_AddStringToObject(cj_device_status, "cloud_status", (true == cloud_status) ? "Connected" : "Disconnected"); + cJSON_AddStringToObject(cj_device_status, "provision_status", (true == cloud_status) ? "Provisioned" : "Not Provisioned"); + + cJSON_AddTrueToObject(cj_device_status, "powered_on"); + + char* send_data = cJSON_Print(cj_device_status); + if (send_data) + { + cJSON_Minify(send_data); + + uint32_t total_data_len = strlen(send_data); + uint32_t max_data_buffer_size = ezlopi_ble_gatt_get_max_data_size(); + uint32_t copy_size = ((total_data_len - param->read.offset) < max_data_buffer_size) ? (total_data_len - param->read.offset) : max_data_buffer_size; + + if ((0 != total_data_len) && (total_data_len > param->read.offset)) + { + strncpy((char*)value->value, send_data + param->read.offset, copy_size); + value->len = copy_size; + } + if ((param->read.offset + copy_size) >= total_data_len) + { + free(send_data); + send_data = NULL; + } + + free(send_data); + } + else + { + TRACE_E("No data to send"); + value->len = 1; + value->value[0] = 0; // Read 0 if the device not provisioned yet. + } + cJSON_Delete(cj_device_status); + } + else + { + TRACE_E("Couldn't allocate memory for device status"); + } + } + else + { + TRACE_E("Value is NULL"); + } } + static void device_info_read_func(esp_gatt_value_t* value, esp_ble_gatts_cb_param_t* param) { static char* json_str_device_info; diff --git a/ezlopi-services/ezlopi-service-ble/ezlopi_service_ble_provisioning.c b/ezlopi-services/ezlopi-service-ble/ezlopi_service_ble_provisioning.c index 41b0b8165..bb93ddfd6 100644 --- a/ezlopi-services/ezlopi-service-ble/ezlopi_service_ble_provisioning.c +++ b/ezlopi-services/ezlopi-service-ble/ezlopi_service_ble_provisioning.c @@ -17,6 +17,7 @@ #include "ezlopi_core_ble_profile.h" #include "ezlopi_core_factory_info.h" #include "ezlopi_core_cjson_macros.h" +#include "ezlopi_core_event_group.h" #include "ezlopi_cloud_constants.h" @@ -38,7 +39,6 @@ static void __provisioning_info_read_func(esp_gatt_value_t* value, esp_ble_gatts static void __provisioning_status_read_func(esp_gatt_value_t* value, esp_ble_gatts_cb_param_t* param); - void ezlopi_ble_service_provisioning_init(void) { esp_bt_uuid_t uuid; @@ -63,6 +63,7 @@ void ezlopi_ble_service_provisioning_init(void) } + #if 1 static char* __provisioning_status_jsonify(void) { diff --git a/sdkconfig b/sdkconfig index 47b914cc9..b30d3e59e 100644 --- a/sdkconfig +++ b/sdkconfig @@ -152,7 +152,9 @@ CONFIG_EZPI_UTIL_ENABLE_TRACE=y # CONFIG_EZPI_CORE_ENABLE_ETH is not set # CONFIG_EZPI_SERV_ENABLE_MESHBOTS is not set # CONFIG_EZLPI_SERV_ENABLE_MODES is not set -# CONFIG_EZLOPI_BLE_ENABLE is not set +CONFIG_EZLOPI_BLE_ENABLE=y +# CONFIG_EZLOPI_BLE_ENALBE_PASSKEY is not set +CONFIG_EZLOPI_BLE_ENALBE_PAIRING=y # # EzloPi mDNS config diff --git a/sdkconfig.old b/sdkconfig.old index ca7654803..f28e8c26c 100644 --- a/sdkconfig.old +++ b/sdkconfig.old @@ -147,10 +147,10 @@ CONFIG_PARTITION_TABLE_MD5=y # # EzloPi User Config # -CONFIG_EZPI_DEV_TYPE_TEST=y -CONFIG_EZPI_UTIL_ENABLE_TRACE=y +# CONFIG_EZPI_DEV_TYPE_TEST is not set +# CONFIG_EZPI_UTIL_ENABLE_TRACE is not set # CONFIG_EZPI_CORE_ENABLE_ETH is not set -# CONFIG_EZPI_SERV_ENABLE_MESHBOTS is not set +CONFIG_EZPI_SERV_ENABLE_MESHBOTS=y CONFIG_EZLPI_SERV_ENABLE_MODES=y # CONFIG_EZLOPI_BLE_ENABLE is not set From 4e5903b583ce146f2846bd9673a7aa7258035ed4 Mon Sep 17 00:00:00 2001 From: NDJ-Ezlo Date: Tue, 2 Apr 2024 13:27:19 +0545 Subject: [PATCH 2/7] Modified device from string to boolean based --- .../ezlopi_service_ble_device_info.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/ezlopi-services/ezlopi-service-ble/ezlopi_service_ble_device_info.c b/ezlopi-services/ezlopi-service-ble/ezlopi_service_ble_device_info.c index 3077bbbc6..cdcb20dda 100644 --- a/ezlopi-services/ezlopi-service-ble/ezlopi_service_ble_device_info.c +++ b/ezlopi-services/ezlopi-service-ble/ezlopi_service_ble_device_info.c @@ -70,13 +70,11 @@ static void device_status_read_func(esp_gatt_value_t* value, esp_ble_gatts_cb_pa { e_ezlopi_event_t event = ezlopi_get_event_bit_status(); - bool wifi_conn_status = (event & EZLOPI_EVENT_WIFI_CONNECTED) == EZLOPI_EVENT_WIFI_CONNECTED; - cJSON_AddStringToObject(cj_device_status, "wifi_status", (true == wifi_conn_status) ? "Connected" : "Disconnected"); - cJSON_AddStringToObject(cj_device_status, "internet_status", (true == wifi_conn_status) ? "Connected" : "Disconnected"); + cJSON_AddBoolToObject(cj_device_status, "wifi_connection_status", (event & EZLOPI_EVENT_WIFI_CONNECTED) == EZLOPI_EVENT_WIFI_CONNECTED); + cJSON_AddBoolToObject(cj_device_status, "internet_connection_status", (event & EZLOPI_EVENT_WIFI_CONNECTED) == EZLOPI_EVENT_WIFI_CONNECTED); - bool cloud_status = (event & EZLOPI_EVENT_NMA_REG) == EZLOPI_EVENT_NMA_REG; - cJSON_AddStringToObject(cj_device_status, "cloud_status", (true == cloud_status) ? "Connected" : "Disconnected"); - cJSON_AddStringToObject(cj_device_status, "provision_status", (true == cloud_status) ? "Provisioned" : "Not Provisioned"); + cJSON_AddBoolToObject(cj_device_status, "cloud_connection_status", (event & EZLOPI_EVENT_NMA_REG) == EZLOPI_EVENT_NMA_REG); + cJSON_AddBoolToObject(cj_device_status, "provision_completion_status", (event & EZLOPI_EVENT_NMA_REG) == EZLOPI_EVENT_NMA_REG); cJSON_AddTrueToObject(cj_device_status, "powered_on"); @@ -99,8 +97,6 @@ static void device_status_read_func(esp_gatt_value_t* value, esp_ble_gatts_cb_pa free(send_data); send_data = NULL; } - - free(send_data); } else { From f931a4554d40065115c6dbeff53b03a9ad175a18 Mon Sep 17 00:00:00 2001 From: NDJ-Ezlo Date: Wed, 3 Apr 2024 18:33:09 +0545 Subject: [PATCH 3/7] Implemented indicator logic for addressable RGB and on/off led --- ezlopi-main/CMakeLists.txt | 1 + ezlopi-main/Kconfig.projbuild | 11 +- ezlopi-main/ezlopi_main.c | 34 +- .../CMakeLists.txt | 12 + .../ezlopi_service_led_indicator.c | 263 +++++++++++ .../ezlopi_service_led_indicator.h | 18 + sdkconfig | 420 +++++++++--------- sdkconfig.old | 375 +++++++--------- 8 files changed, 683 insertions(+), 451 deletions(-) create mode 100644 ezlopi-services/ezlopi-service-led-indicator/CMakeLists.txt create mode 100644 ezlopi-services/ezlopi-service-led-indicator/ezlopi_service_led_indicator.c create mode 100644 ezlopi-services/ezlopi-service-led-indicator/ezlopi_service_led_indicator.h diff --git a/ezlopi-main/CMakeLists.txt b/ezlopi-main/CMakeLists.txt index bf40c5962..a93fb8d97 100644 --- a/ezlopi-main/CMakeLists.txt +++ b/ezlopi-main/CMakeLists.txt @@ -47,6 +47,7 @@ ezlopi-service-ble ezlopi-service-meshbot ezlopi-service-ws-server ezlopi-service-broadcast + ezlopi-service-led-indicator ) # Register the components diff --git a/ezlopi-main/Kconfig.projbuild b/ezlopi-main/Kconfig.projbuild index 5b009d56f..b7fb78b6f 100644 --- a/ezlopi-main/Kconfig.projbuild +++ b/ezlopi-main/Kconfig.projbuild @@ -34,7 +34,7 @@ menu "EzloPi User Config" config EZLOPI_BLE_ENABLE bool "Enable BLE" - default n + default y help Enable BLE @@ -101,6 +101,15 @@ menu "EzloPi User Config" endmenu + choice + prompt "Select the indicator LED available in the device" + default EZPI_ON_OFF_LED + config EZPI_ON_OFF_LED + bool "Buildin LED for ESP32 dev board" + config EZPI_RGB_LED + bool "Builtin addressable RGB LED for ESP32S3 and ESP32C3" + endchoice + endmenu diff --git a/ezlopi-main/ezlopi_main.c b/ezlopi-main/ezlopi_main.c index 9ada56d56..018c85635 100644 --- a/ezlopi-main/ezlopi_main.c +++ b/ezlopi-main/ezlopi_main.c @@ -9,12 +9,13 @@ #include #include "ezlopi_util_trace.h" +#include "EZLOPI_USER_CONFIG.h" #include "ezlopi_core_ezlopi.h" #include "ezlopi_service_ota.h" -#if CONFIG_EZLOPI_BLE_ENABLE == 1 #include "ezlopi_service_ble.h" +#if CONFIG_EZLOPI_BLE_ENABLE == 1 #endif #include "ezlopi_service_uart.h" @@ -25,6 +26,7 @@ #include "ezlopi_service_webprov.h" #include "ezlopi_service_ws_server.h" #include "ezlopi_service_broadcast.h" +#include "ezlopi_service_led_indicator.h" #include "pt.h" @@ -41,7 +43,8 @@ PT_THREAD(example(struct pt* pt)) static uint32_t curr_ticks; PT_BEGIN(pt); - while (1) { + while (1) + { curr_ticks = xTaskGetTickCount(); PT_WAIT_UNTIL(pt, (xTaskGetTickCount() - curr_ticks) > 1000); __toggle_heartbeat_led(); @@ -52,6 +55,7 @@ PT_THREAD(example(struct pt* pt)) void app_main(void) { + ezlopi_service_led_indicator_init(); gpio_install_isr_service(0); gpio_isr_service_init(); @@ -59,32 +63,33 @@ void app_main(void) ezlopi_init(); EZPI_SERVICE_uart_init(); - + timer_service_init(); + #if CONFIG_EZLOPI_BLE_ENABLE == 1 ezlopi_ble_service_init(); #endif - ezlopi_service_modes_init(); - + ezlopi_service_broadcast_init(); ezlopi_service_ws_server_start(); ezlopi_service_web_provisioning_init(); ezlopi_service_ota_init(); - ezlopi_service_broadcast_init(); +#if CONFIG_EZLPI_SERV_ENABLE_MODES + ezlopi_service_modes_init(); +#endif #if CONFIG_EZPI_SERV_ENABLE_MESHBOTS - TRACE_D("starting meshbot-service"); ezlopi_scenes_meshbot_init(); #endif - xTaskCreate(__blinky, "__blinky", 2 * 2048, NULL, 1, NULL); + xTaskCreate(__blinky, "__blinky", 2 * 2048, NULL, 0, NULL); } static void __init_heartbeat_led(void) { #if (1 == ENABLE_HEARTBIT_LED) gpio_config_t io_conf = { - .pin_bit_mask = (1ULL << GPIO_NUM_1), + .pin_bit_mask = (1ULL << GPIO_NUM_2), .mode = GPIO_MODE_OUTPUT, .pull_up_en = GPIO_PULLUP_DISABLE, .pull_down_en = GPIO_PULLDOWN_DISABLE, @@ -95,20 +100,21 @@ static void __init_heartbeat_led(void) #endif } -static void __toggle_heartbeat_led(void) { +static void __toggle_heartbeat_led(void) +{ #if (1 == ENABLE_HEARTBIT_LED) static uint32_t state = 0; state ^= 1; - gpio_set_level(GPIO_NUM_1, state); + gpio_set_level(GPIO_NUM_2, state); #endif } static void __blinky(void* pv) { - __init_heartbeat_led(); + // __init_heartbeat_led(); - PT_INIT(&pt1); + // PT_INIT(&pt1); uint32_t count = 0; while (1) @@ -124,6 +130,6 @@ static void __blinky(void* pv) } vTaskDelay(5 / portTICK_PERIOD_MS); - example(&pt1); + // example(&pt1); } } diff --git a/ezlopi-services/ezlopi-service-led-indicator/CMakeLists.txt b/ezlopi-services/ezlopi-service-led-indicator/CMakeLists.txt new file mode 100644 index 000000000..cad274fcb --- /dev/null +++ b/ezlopi-services/ezlopi-service-led-indicator/CMakeLists.txt @@ -0,0 +1,12 @@ + + + +idf_component_register(SRCS "ezlopi_service_led_indicator.c" + INCLUDE_DIRS "." + REQUIRES ezlopi-util-trace + led_strip + ezlopi-core-event-group + ezlopi-core-ping +) + + diff --git a/ezlopi-services/ezlopi-service-led-indicator/ezlopi_service_led_indicator.c b/ezlopi-services/ezlopi-service-led-indicator/ezlopi_service_led_indicator.c new file mode 100644 index 000000000..6125d3440 --- /dev/null +++ b/ezlopi-services/ezlopi-service-led-indicator/ezlopi_service_led_indicator.c @@ -0,0 +1,263 @@ + + +#include "driver/rmt.h" +#include "led_strip.h" +#include "esp_err.h" +#include "color_codes.h" +#include "freertos/FreeRTOS.h" +#include "freertos/task.h" +#include "driver/gpio.h" + +#include "ezlopi_util_trace.h" + +#include "ezlopi_core_event_group.h" +#include "ezlopi_core_ping.h" + +#include "ezlopi_service_led_indicator.h" + +#ifdef CONFIG_EZPI_RGB_LED +#define COLOR_GET_RED(x) ( 0xFF & ( x >> 16 )) +#define COLOR_GET_GREEN(x) ( 0xFF & ( x >> 8 ) ) +#define COLOR_GET_BLUE(x) ( 0xFF & x ) + +#define DEVICE_POWERED_ON_LED_COLOR 0xFFFFFF + +#define INDICATOR_LED_FADE_TIME_MS 20 + +#define INDICATOR_LED_PIN 8 +#define RMT_TX_CHANNEL RMT_CHANNEL_1 + +static led_strip_t indicator_led; +#endif // #ifdef CONFIG_EZPI_RGB_LED + +#ifdef CONFIG_EZPI_ON_OFF_LED +#define INDICATOR_LED_PIN 2 + +#define INDICATTOR_LED_POWER_STATUS_BLINK_MS 20 +#define INDICATTOR_LED_WIFI_STATUS_BLINK_MS 50 +#define INDICATTOR_LED_INTERNET_STATUS_BLINK_MS 100 +#define INDICATTOR_LED_CLOUD_STATUS_BLINK_MS 200 +static bool indicator_led_status = false; +#endif + +static e_indicator_led_priority_t indicator_priority = PRIORITY_CLOUD; + +#ifdef CONFIG_EZPI_RGB_LED +static void indicator_RGB_led_fade_out(uint16_t fade_time_ms) +{ + for (int i = 255; i >= 0; i -= 5) + { + led_strip_set_brightness(&indicator_led, i); + led_strip_flush(&indicator_led); + vTaskDelay(fade_time_ms / portTICK_PERIOD_MS); + } +} + +static void indicator_RGB_led_fade_up(uint16_t fade_time_ms) +{ + for (int i = 0; i < 255; i += 5) + { + led_strip_set_brightness(&indicator_led, i); + led_strip_flush(&indicator_led); + vTaskDelay(fade_time_ms / portTICK_PERIOD_MS); + } +} + +static void indicator_LED_fade_red(uint16_t fade_time_ms) +{ + rgb_t color = { + .red = COLOR_GET_RED(DEVICE_POWERED_ON_LED_COLOR), + .green = 0, + .blue = 0, + }; + led_strip_fill(&indicator_led, 0, indicator_led.length, color); + indicator_RGB_led_fade_out(fade_time_ms); + indicator_RGB_led_fade_up(fade_time_ms); +} + +static void indicator_LED_fade_green(uint16_t fade_time_ms) +{ + rgb_t color = { + .red = 0, + .green = COLOR_GET_GREEN(DEVICE_POWERED_ON_LED_COLOR), + .blue = 0, + }; + led_strip_fill(&indicator_led, 0, indicator_led.length, color); + indicator_RGB_led_fade_out(fade_time_ms); + indicator_RGB_led_fade_up(fade_time_ms); +} + +static void indicator_LED_fade_blue(uint16_t fade_time_ms) +{ + rgb_t color = { + .red = 0, + .green = 0, + .blue = COLOR_GET_BLUE(DEVICE_POWERED_ON_LED_COLOR), + }; + led_strip_fill(&indicator_led, 0, indicator_led.length, color); + indicator_RGB_led_fade_out(fade_time_ms); + indicator_RGB_led_fade_up(fade_time_ms); +} +#endif // #ifdef CONFIG_EZPI_RGB_LED + +static void indicator_LED_power_on_effect() +{ +#ifdef CONFIG_EZPI_ON_OFF_LED + indicator_led_status = !indicator_led_status; + gpio_set_level(INDICATOR_LED_PIN, indicator_led_status); + vTaskDelay(INDICATTOR_LED_POWER_STATUS_BLINK_MS / portTICK_PERIOD_MS); +#endif +#ifdef CONFIG_EZPI_RGB_LED + indicator_LED_fade_red(INDICATOR_LED_FADE_TIME_MS); + indicator_LED_fade_green(INDICATOR_LED_FADE_TIME_MS); + indicator_LED_fade_blue(INDICATOR_LED_FADE_TIME_MS); +#endif // #ifdef CONFIG_EZPI_RGB_LED +} + +static void indicator_LED_wifi_connected_effect() +{ +#ifdef CONFIG_EZPI_ON_OFF_LED + indicator_led_status = !indicator_led_status; + gpio_set_level(INDICATOR_LED_PIN, indicator_led_status); + vTaskDelay(INDICATTOR_LED_WIFI_STATUS_BLINK_MS / portTICK_PERIOD_MS); +#endif +#ifdef CONFIG_EZPI_RGB_LED + indicator_LED_fade_red(INDICATOR_LED_FADE_TIME_MS); +#endif // #ifdef CONFIG_EZPI_RGB_LED +} + +static void indicator_LED_internet_connected_effect() +{ +#ifdef CONFIG_EZPI_ON_OFF_LED + indicator_led_status = !indicator_led_status; + gpio_set_level(INDICATOR_LED_PIN, indicator_led_status); + vTaskDelay(INDICATTOR_LED_INTERNET_STATUS_BLINK_MS / portTICK_PERIOD_MS); +#endif +#ifdef CONFIG_EZPI_RGB_LED + indicator_LED_fade_blue(INDICATOR_LED_FADE_TIME_MS); +#endif // #ifdef CONFIG_EZPI_RGB_LED +} + +static void indicator_LED_cloud_connected_effect() +{ +#ifdef CONFIG_EZPI_ON_OFF_LED + indicator_led_status = !indicator_led_status; + gpio_set_level(INDICATOR_LED_PIN, indicator_led_status); + vTaskDelay(INDICATTOR_LED_CLOUD_STATUS_BLINK_MS / portTICK_PERIOD_MS); +#endif // #ifdef CONFIG_EZPI_ON_OFF_LED +#ifdef CONFIG_EZPI_RGB_LED + indicator_LED_fade_green(INDICATOR_LED_FADE_TIME_MS); +#endif // #ifdef CONFIG_EZPI_RGB_LED +} + +#ifdef CONFIG_EZPI_ON_OFF_LED +static const gpio_config_t indicator_led_configuration = { + .pin_bit_mask = (1ULL << INDICATOR_LED_PIN), + .mode = GPIO_MODE_OUTPUT, + .pull_up_en = GPIO_PULLUP_DISABLE, + .pull_down_en = GPIO_PULLDOWN_ENABLE, + .intr_type = GPIO_INTR_DISABLE, +}; +#endif // #ifdef CONFIG_EZPI_ON_OFF_LED + + +static void process_event() +{ + e_ezlopi_event_t event = ezlopi_get_event_bit_status(); + indicator_priority = PRIORITY_POWER; + if ((event & EZLOPI_EVENT_WIFI_CONNECTED) == EZLOPI_EVENT_WIFI_CONNECTED) + { + indicator_priority = PRIORITY_WIFI; + e_ping_status_t ping_status = ezlopi_ping_get_internet_status(); + if (EZLOPI_PING_STATUS_LIVE == ping_status) + { + indicator_priority = PRIORITY_INTERNET; + if ((event & EZLOPI_EVENT_NMA_REG) == EZLOPI_EVENT_NMA_REG) + { + indicator_priority = PRIORITY_CLOUD; + } + } + } +} + +static void indicator_LED_blinker(void* params) +{ + while (1) + { + process_event(); + switch (indicator_priority) + { + case PRIORITY_POWER: + { + indicator_LED_power_on_effect(); + break; + } + case PRIORITY_WIFI: + { + indicator_LED_wifi_connected_effect(); + break; + } + case PRIORITY_INTERNET: + { + indicator_LED_internet_connected_effect(); + break; + } + case PRIORITY_CLOUD: + { + indicator_LED_cloud_connected_effect(); + break; + } + default: + { + break; + } + } + vTaskDelay(1 / portTICK_PERIOD_MS); + } + vTaskDelete(NULL); +} + +int ezlopi_service_led_indicator_init() +{ + int ret = 0; + +#ifdef CONFIG_EZPI_RGB_LED + indicator_led.type = LED_STRIP_WS2812; + indicator_led.length = 1; + indicator_led.gpio = INDICATOR_LED_PIN; + indicator_led.buf = NULL; + indicator_led.brightness = 255; + indicator_led.channel = RMT_TX_CHANNEL; + + led_strip_install(); + if (ESP_OK == led_strip_init(&indicator_led)) + { + rgb_t color = { + .red = COLOR_GET_RED(DEVICE_POWERED_ON_LED_COLOR), + .green = COLOR_GET_GREEN(DEVICE_POWERED_ON_LED_COLOR), + .blue = COLOR_GET_BLUE(DEVICE_POWERED_ON_LED_COLOR), + }; + esp_err_t err = led_strip_fill(&indicator_led, 0, indicator_led.length, color); + if (ESP_OK == (err = led_strip_set_brightness(&indicator_led, 255))) + { + if (ESP_OK == (err = led_strip_flush(&indicator_led))) + { + xTaskCreate(indicator_LED_blinker, "indicator_task", 2048 * 2, NULL, tskIDLE_PRIORITY, NULL); + ret = 1; + } + } + } +#endif // #ifdef CONFIG_EZPI_RGB_LED + +#ifdef CONFIG_EZPI_ON_OFF_LED + + ESP_ERROR_CHECK(gpio_config(&indicator_led_configuration)); + gpio_set_level(INDICATOR_LED_PIN, indicator_led_status); + xTaskCreate(indicator_LED_blinker, "indicator_task", 2048 * 2, NULL, tskIDLE_PRIORITY, NULL); + +#endif // #ifdef CONFIG_EZPI_ON_OFF_LED + + return ret; +} + + diff --git a/ezlopi-services/ezlopi-service-led-indicator/ezlopi_service_led_indicator.h b/ezlopi-services/ezlopi-service-led-indicator/ezlopi_service_led_indicator.h new file mode 100644 index 000000000..31f408c0c --- /dev/null +++ b/ezlopi-services/ezlopi-service-led-indicator/ezlopi_service_led_indicator.h @@ -0,0 +1,18 @@ + + +#ifndef _EZLOPI_SERVICE_LED_INDICATOR_H_ +#define _EZLOPI_SERVICE_LED_INDICATOR_H_ + +typedef enum { + PRIORITY_POWER = 0, + PRIORITY_WIFI, + PRIORITY_INTERNET, + PRIORITY_CLOUD, + PRIORITY_MAX, +}e_indicator_led_priority_t; + +int ezlopi_service_led_indicator_init(); + + +#endif // _EZLOPI_SERVICE_LED_INDICATOR_H_ + diff --git a/sdkconfig b/sdkconfig index b30d3e59e..b023f8a37 100644 --- a/sdkconfig +++ b/sdkconfig @@ -4,9 +4,9 @@ # CONFIG_IDF_CMAKE=y CONFIG_IDF_TARGET_ARCH_XTENSA=y -CONFIG_IDF_TARGET="esp32s3" -CONFIG_IDF_TARGET_ESP32S3=y -CONFIG_IDF_FIRMWARE_CHIP_ID=0x0009 +CONFIG_IDF_TARGET="esp32" +CONFIG_IDF_TARGET_ESP32=y +CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000 # # SDK tool configuration @@ -38,7 +38,7 @@ CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16 # # Bootloader config # -CONFIG_BOOTLOADER_OFFSET_IN_FLASH=0x0 +CONFIG_BOOTLOADER_OFFSET_IN_FLASH=0x1000 CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y # CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_DEBUG is not set # CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_PERF is not set @@ -70,48 +70,36 @@ CONFIG_BOOTLOADER_FLASH_XMC_SUPPORT=y # # Security features # -CONFIG_SECURE_BOOT_SUPPORTS_RSA=y -CONFIG_SECURE_TARGET_HAS_SECURE_ROM_DL_MODE=y # CONFIG_SECURE_SIGNED_APPS_NO_SECURE_BOOT is not set # CONFIG_SECURE_BOOT is not set # CONFIG_SECURE_FLASH_ENC_ENABLED is not set # end of Security features -# -# Boot ROM Behavior -# -CONFIG_BOOT_ROM_LOG_ALWAYS_ON=y -# CONFIG_BOOT_ROM_LOG_ALWAYS_OFF is not set -# CONFIG_BOOT_ROM_LOG_ON_GPIO_HIGH is not set -# CONFIG_BOOT_ROM_LOG_ON_GPIO_LOW is not set -# end of Boot ROM Behavior - # # Serial flasher config # CONFIG_ESPTOOLPY_BAUD_OTHER_VAL=115200 # CONFIG_ESPTOOLPY_NO_STUB is not set -# CONFIG_ESPTOOLPY_OCT_FLASH is not set # CONFIG_ESPTOOLPY_FLASHMODE_QIO is not set # CONFIG_ESPTOOLPY_FLASHMODE_QOUT is not set CONFIG_ESPTOOLPY_FLASHMODE_DIO=y # CONFIG_ESPTOOLPY_FLASHMODE_DOUT is not set CONFIG_ESPTOOLPY_FLASH_SAMPLE_MODE_STR=y CONFIG_ESPTOOLPY_FLASHMODE="dio" -# CONFIG_ESPTOOLPY_FLASHFREQ_120M is not set # CONFIG_ESPTOOLPY_FLASHFREQ_80M is not set CONFIG_ESPTOOLPY_FLASHFREQ_40M=y +# CONFIG_ESPTOOLPY_FLASHFREQ_26M is not set # CONFIG_ESPTOOLPY_FLASHFREQ_20M is not set CONFIG_ESPTOOLPY_FLASHFREQ="40m" # CONFIG_ESPTOOLPY_FLASHSIZE_1MB is not set # CONFIG_ESPTOOLPY_FLASHSIZE_2MB is not set -# CONFIG_ESPTOOLPY_FLASHSIZE_4MB is not set -CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y +CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y +# CONFIG_ESPTOOLPY_FLASHSIZE_8MB is not set # CONFIG_ESPTOOLPY_FLASHSIZE_16MB is not set # CONFIG_ESPTOOLPY_FLASHSIZE_32MB is not set # CONFIG_ESPTOOLPY_FLASHSIZE_64MB is not set # CONFIG_ESPTOOLPY_FLASHSIZE_128MB is not set -CONFIG_ESPTOOLPY_FLASHSIZE="8MB" +CONFIG_ESPTOOLPY_FLASHSIZE="4MB" CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y CONFIG_ESPTOOLPY_BEFORE_RESET=y # CONFIG_ESPTOOLPY_BEFORE_NORESET is not set @@ -151,7 +139,7 @@ CONFIG_EZPI_DEV_TYPE_TEST=y CONFIG_EZPI_UTIL_ENABLE_TRACE=y # CONFIG_EZPI_CORE_ENABLE_ETH is not set # CONFIG_EZPI_SERV_ENABLE_MESHBOTS is not set -# CONFIG_EZLPI_SERV_ENABLE_MODES is not set +CONFIG_EZLPI_SERV_ENABLE_MODES=y CONFIG_EZLOPI_BLE_ENABLE=y # CONFIG_EZLOPI_BLE_ENALBE_PASSKEY is not set CONFIG_EZLOPI_BLE_ENALBE_PAIRING=y @@ -161,12 +149,11 @@ CONFIG_EZLOPI_BLE_ENALBE_PAIRING=y # CONFIG_EZPI_MDNS_HOSTNAME="ezlopi_device" CONFIG_EZPI_MDNS_INSTANCE_NAME="ezlopi_serial" -CONFIG_EZPI_MDNS_ENABLE_EXTRA_SERVICES=y -CONFIG_EZPI_MDNS_ENABLE_MANUFACTURER_SERVICE=y -CONFIG_EZPI_MDNS_ENABLE_BRAND_SERVICE=y -CONFIG_EZPI_MDNS_ENABLE_MODEL_SERVICE=y -CONFIG_EZPI_MDNS_ENABLE_NAME_SERVICE=y +# CONFIG_EZPI_MDNS_ENABLE_EXTRA_SERVICES is not set # end of EzloPi mDNS config + +CONFIG_EZPI_ON_OFF_LED=y +# CONFIG_EZPI_RGB_LED is not set # end of EzloPi User Config # @@ -215,81 +202,51 @@ CONFIG_APPTRACE_LOCK_ENABLE=y # Bluetooth # CONFIG_BT_ENABLED=y -CONFIG_BT_SOC_SUPPORT_5_0=y # # Bluetooth controller # -CONFIG_BT_CTRL_MODE_EFF=1 -CONFIG_BT_CTRL_BLE_MAX_ACT=10 -CONFIG_BT_CTRL_BLE_MAX_ACT_EFF=10 -CONFIG_BT_CTRL_BLE_STATIC_ACL_TX_BUF_NB=0 -CONFIG_BT_CTRL_PINNED_TO_CORE_0=y -# CONFIG_BT_CTRL_PINNED_TO_CORE_1 is not set -CONFIG_BT_CTRL_PINNED_TO_CORE=0 -CONFIG_BT_CTRL_HCI_MODE_VHCI=y -# CONFIG_BT_CTRL_HCI_MODE_UART_H4 is not set -CONFIG_BT_CTRL_HCI_TL=1 -CONFIG_BT_CTRL_ADV_DUP_FILT_MAX=30 -CONFIG_BT_BLE_CCA_MODE_NONE=y -# CONFIG_BT_BLE_CCA_MODE_HW is not set -# CONFIG_BT_BLE_CCA_MODE_SW is not set -CONFIG_BT_BLE_CCA_MODE=0 -CONFIG_BT_CTRL_HW_CCA_VAL=20 -CONFIG_BT_CTRL_HW_CCA_EFF=0 -CONFIG_BT_CTRL_CE_LENGTH_TYPE_ORIG=y -# CONFIG_BT_CTRL_CE_LENGTH_TYPE_CE is not set -# CONFIG_BT_CTRL_CE_LENGTH_TYPE_SD is not set -CONFIG_BT_CTRL_CE_LENGTH_TYPE_EFF=0 -CONFIG_BT_CTRL_TX_ANTENNA_INDEX_0=y -# CONFIG_BT_CTRL_TX_ANTENNA_INDEX_1 is not set -CONFIG_BT_CTRL_TX_ANTENNA_INDEX_EFF=0 -CONFIG_BT_CTRL_RX_ANTENNA_INDEX_0=y -# CONFIG_BT_CTRL_RX_ANTENNA_INDEX_1 is not set -CONFIG_BT_CTRL_RX_ANTENNA_INDEX_EFF=0 -# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N24 is not set -# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N21 is not set -# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N18 is not set -# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N15 is not set -# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N12 is not set -# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N9 is not set -# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N6 is not set -# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N3 is not set -# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N0 is not set -# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_P3 is not set -# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_P6 is not set -# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_P9 is not set -# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_P12 is not set -# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_P15 is not set -# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_P18 is not set -CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_P21=y -CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_EFF=15 -CONFIG_BT_CTRL_BLE_ADV_REPORT_FLOW_CTRL_SUPP=y -CONFIG_BT_CTRL_BLE_ADV_REPORT_FLOW_CTRL_NUM=100 -CONFIG_BT_CTRL_BLE_ADV_REPORT_DISCARD_THRSHOLD=20 -CONFIG_BT_CTRL_BLE_SCAN_DUPL=y -CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DEVICE=y -# CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA is not set -# CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE is not set -CONFIG_BT_CTRL_SCAN_DUPL_TYPE=0 -CONFIG_BT_CTRL_SCAN_DUPL_CACHE_SIZE=100 -CONFIG_BT_CTRL_DUPL_SCAN_CACHE_REFRESH_PERIOD=0 -# CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN is not set -# CONFIG_BT_CTRL_COEX_PHY_CODED_TX_RX_TLIM_EN is not set -CONFIG_BT_CTRL_COEX_PHY_CODED_TX_RX_TLIM_DIS=y -CONFIG_BT_CTRL_COEX_PHY_CODED_TX_RX_TLIM_EFF=0 +CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y +# CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY is not set +# CONFIG_BTDM_CTRL_MODE_BTDM is not set +CONFIG_BTDM_CTRL_BLE_MAX_CONN=3 +CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0 +CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0 +CONFIG_BTDM_CTRL_PCM_POLAR_EFF=0 +CONFIG_BTDM_CTRL_BLE_MAX_CONN_EFF=3 +CONFIG_BTDM_CTRL_BR_EDR_MAX_ACL_CONN_EFF=0 +CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN_EFF=0 +CONFIG_BTDM_CTRL_PINNED_TO_CORE_0=y +# CONFIG_BTDM_CTRL_PINNED_TO_CORE_1 is not set +CONFIG_BTDM_CTRL_PINNED_TO_CORE=0 +CONFIG_BTDM_CTRL_HCI_MODE_VHCI=y +# CONFIG_BTDM_CTRL_HCI_MODE_UART_H4 is not set # # MODEM SLEEP Options # -# CONFIG_BT_CTRL_MODEM_SLEEP is not set +CONFIG_BTDM_CTRL_MODEM_SLEEP=y +CONFIG_BTDM_CTRL_MODEM_SLEEP_MODE_ORIG=y +# CONFIG_BTDM_CTRL_MODEM_SLEEP_MODE_EVED is not set +CONFIG_BTDM_CTRL_LPCLK_SEL_MAIN_XTAL=y # end of MODEM SLEEP Options -CONFIG_BT_CTRL_SLEEP_MODE_EFF=0 -CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0 -CONFIG_BT_CTRL_HCI_TL_EFF=1 -# CONFIG_BT_CTRL_AGC_RECORRECT_EN is not set -# CONFIG_BT_CTRL_SCAN_BACKOFF_UPPERLIMITMAX is not set +CONFIG_BTDM_BLE_DEFAULT_SCA_250PPM=y +CONFIG_BTDM_BLE_SLEEP_CLOCK_ACCURACY_INDEX_EFF=1 +CONFIG_BTDM_BLE_SCAN_DUPL=y +CONFIG_BTDM_SCAN_DUPL_TYPE_DEVICE=y +# CONFIG_BTDM_SCAN_DUPL_TYPE_DATA is not set +# CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE is not set +CONFIG_BTDM_SCAN_DUPL_TYPE=0 +CONFIG_BTDM_SCAN_DUPL_CACHE_SIZE=100 +CONFIG_BTDM_SCAN_DUPL_CACHE_REFRESH_PERIOD=0 +# CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN is not set +CONFIG_BTDM_CTRL_FULL_SCAN_SUPPORTED=y +CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP=y +CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100 +CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20 +CONFIG_BTDM_RESERVE_DRAM=0xdb5c +CONFIG_BTDM_CTRL_HLI=y # end of Bluetooth controller CONFIG_BT_BLUEDROID_ENABLED=y @@ -305,6 +262,7 @@ CONFIG_BT_BLUEDROID_PINNED_TO_CORE_0=y CONFIG_BT_BLUEDROID_PINNED_TO_CORE=0 CONFIG_BT_BTU_TASK_STACK_SIZE=4096 # CONFIG_BT_BLUEDROID_MEM_DEBUG is not set +# CONFIG_BT_CLASSIC_ENABLED is not set CONFIG_BT_BLE_ENABLED=y CONFIG_BT_GATTS_ENABLE=y # CONFIG_BT_GATTS_PPCP_CHAR_GAP is not set @@ -508,9 +466,8 @@ CONFIG_BT_SMP_ENABLE=y # CONFIG_BT_BLE_ACT_SCAN_REP_ADV_SCAN is not set CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30 CONFIG_BT_MAX_DEVICE_NAME_LEN=32 +# CONFIG_BT_BLE_RPA_SUPPORTED is not set CONFIG_BT_BLE_RPA_TIMEOUT=900 -# CONFIG_BT_BLE_50_FEATURES_SUPPORTED is not set -CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y # CONFIG_BT_BLE_HIGH_DUTY_ADV_INTERVAL is not set # end of Bluedroid Options # end of Bluetooth @@ -535,7 +492,6 @@ CONFIG_COAP_LOG_DEFAULT_LEVEL=0 # # CONFIG_ADC_FORCE_XPD_FSM is not set CONFIG_ADC_DISABLE_DAC=y -# CONFIG_ADC_CONTINUOUS_FORCE_USE_ADC2_ON_C3_S3 is not set # end of ADC configuration # @@ -557,6 +513,10 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y # TWAI configuration # # CONFIG_TWAI_ISR_IN_IRAM is not set +# CONFIG_TWAI_ERRATA_FIX_BUS_OFF_REC is not set +# CONFIG_TWAI_ERRATA_FIX_TX_INTR_LOST is not set +# CONFIG_TWAI_ERRATA_FIX_RX_FRAME_INVALID is not set +# CONFIG_TWAI_ERRATA_FIX_RX_FIFO_CORRUPT is not set # CONFIG_TWAI_ERRATA_FIX_LISTEN_ONLY_DOM is not set # end of TWAI configuration @@ -566,6 +526,18 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y CONFIG_UART_ISR_IN_IRAM=y # end of UART configuration +# +# RTCIO configuration +# +# CONFIG_RTCIO_SUPPORT_RTC_GPIO_DESC is not set +# end of RTCIO configuration + +# +# GPIO Configuration +# +# CONFIG_GPIO_ESP32_SUPPORT_SWITCH_SLP_PULL is not set +# end of GPIO Configuration + # # GDMA Configuration # @@ -579,95 +551,87 @@ CONFIG_UART_ISR_IN_IRAM=y # # CONFIG_EFUSE_CUSTOM_TABLE is not set # CONFIG_EFUSE_VIRTUAL is not set -CONFIG_EFUSE_MAX_BLK_LEN=256 +# CONFIG_EFUSE_CODE_SCHEME_COMPAT_NONE is not set +CONFIG_EFUSE_CODE_SCHEME_COMPAT_3_4=y +# CONFIG_EFUSE_CODE_SCHEME_COMPAT_REPEAT is not set +CONFIG_EFUSE_MAX_BLK_LEN=192 # end of eFuse Bit Manager # # ESP-TLS # CONFIG_ESP_TLS_USING_MBEDTLS=y -CONFIG_ESP_TLS_USE_DS_PERIPHERAL=y +# CONFIG_ESP_TLS_USE_SECURE_ELEMENT is not set # CONFIG_ESP_TLS_CLIENT_SESSION_TICKETS is not set # CONFIG_ESP_TLS_SERVER is not set # CONFIG_ESP_TLS_PSK_VERIFICATION is not set -# CONFIG_ESP_TLS_INSECURE is not set +CONFIG_ESP_TLS_INSECURE=y +# CONFIG_ESP_TLS_SKIP_SERVER_CERT_VERIFY is not set # end of ESP-TLS # -# ESP32S3-Specific +# ESP32-specific # -CONFIG_ESP32S3_REV_MIN_0=y -# CONFIG_ESP32S3_REV_MIN_1 is not set -# CONFIG_ESP32S3_REV_MIN_2 is not set -CONFIG_ESP32S3_REV_MIN_FULL=0 +CONFIG_ESP32_REV_MIN_0=y +# CONFIG_ESP32_REV_MIN_1 is not set +# CONFIG_ESP32_REV_MIN_1_1 is not set +# CONFIG_ESP32_REV_MIN_2 is not set +# CONFIG_ESP32_REV_MIN_3 is not set +# CONFIG_ESP32_REV_MIN_3_1 is not set +CONFIG_ESP32_REV_MIN=0 +CONFIG_ESP32_REV_MIN_FULL=0 CONFIG_ESP_REV_MIN_FULL=0 -CONFIG_ESP32S3_REV_MAX_FULL_STR_OPT=y -CONFIG_ESP32S3_REV_MAX_FULL=99 -CONFIG_ESP_REV_MAX_FULL=99 -# CONFIG_ESP32S3_DEFAULT_CPU_FREQ_80 is not set -# CONFIG_ESP32S3_DEFAULT_CPU_FREQ_160 is not set -CONFIG_ESP32S3_DEFAULT_CPU_FREQ_240=y -CONFIG_ESP32S3_DEFAULT_CPU_FREQ_MHZ=240 - -# -# Cache config -# -CONFIG_ESP32S3_INSTRUCTION_CACHE_16KB=y -# CONFIG_ESP32S3_INSTRUCTION_CACHE_32KB is not set -CONFIG_ESP32S3_INSTRUCTION_CACHE_SIZE=0x4000 -# CONFIG_ESP32S3_INSTRUCTION_CACHE_4WAYS is not set -CONFIG_ESP32S3_INSTRUCTION_CACHE_8WAYS=y -CONFIG_ESP32S3_ICACHE_ASSOCIATED_WAYS=8 -# CONFIG_ESP32S3_INSTRUCTION_CACHE_LINE_16B is not set -CONFIG_ESP32S3_INSTRUCTION_CACHE_LINE_32B=y -CONFIG_ESP32S3_INSTRUCTION_CACHE_LINE_SIZE=32 -# CONFIG_ESP32S3_INSTRUCTION_CACHE_WRAP is not set -# CONFIG_ESP32S3_DATA_CACHE_16KB is not set -CONFIG_ESP32S3_DATA_CACHE_32KB=y -# CONFIG_ESP32S3_DATA_CACHE_64KB is not set -CONFIG_ESP32S3_DATA_CACHE_SIZE=0x8000 -# CONFIG_ESP32S3_DATA_CACHE_4WAYS is not set -CONFIG_ESP32S3_DATA_CACHE_8WAYS=y -CONFIG_ESP32S3_DCACHE_ASSOCIATED_WAYS=8 -# CONFIG_ESP32S3_DATA_CACHE_LINE_16B is not set -CONFIG_ESP32S3_DATA_CACHE_LINE_32B=y -# CONFIG_ESP32S3_DATA_CACHE_LINE_64B is not set -CONFIG_ESP32S3_DATA_CACHE_LINE_SIZE=32 -# CONFIG_ESP32S3_DATA_CACHE_WRAP is not set -# end of Cache config - -# CONFIG_ESP32S3_SPIRAM_SUPPORT is not set -# CONFIG_ESP32S3_TRAX is not set -CONFIG_ESP32S3_TRACEMEM_RESERVE_DRAM=0x0 -# CONFIG_ESP32S3_ULP_COPROC_ENABLED is not set -CONFIG_ESP32S3_ULP_COPROC_RESERVE_MEM=0 -CONFIG_ESP32S3_DEBUG_OCDAWARE=y -CONFIG_ESP32S3_BROWNOUT_DET=y -CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL_7=y -# CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL_6 is not set -# CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL_5 is not set -# CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL_4 is not set -# CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL_3 is not set -# CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL_2 is not set -# CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL_1 is not set -CONFIG_ESP32S3_BROWNOUT_DET_LVL=7 -CONFIG_ESP32S3_TIME_SYSCALL_USE_RTC_FRC1=y -# CONFIG_ESP32S3_TIME_SYSCALL_USE_RTC is not set -# CONFIG_ESP32S3_TIME_SYSCALL_USE_FRC1 is not set -# CONFIG_ESP32S3_TIME_SYSCALL_USE_NONE is not set -CONFIG_ESP32S3_RTC_CLK_SRC_INT_RC=y -# CONFIG_ESP32S3_RTC_CLK_SRC_EXT_CRYS is not set -# CONFIG_ESP32S3_RTC_CLK_SRC_EXT_OSC is not set -# CONFIG_ESP32S3_RTC_CLK_SRC_INT_8MD256 is not set -CONFIG_ESP32S3_RTC_CLK_CAL_CYCLES=1024 -CONFIG_ESP32S3_DEEP_SLEEP_WAKEUP_DELAY=2000 -# CONFIG_ESP32S3_RTCDATA_IN_FAST_MEM is not set -# CONFIG_ESP32S3_USE_FIXED_STATIC_RAM_SIZE is not set -# end of ESP32S3-Specific +CONFIG_ESP32_REV_MAX_FULL_STR_OPT=y +CONFIG_ESP32_REV_MAX_FULL=399 +CONFIG_ESP_REV_MAX_FULL=399 +CONFIG_ESP32_DPORT_WORKAROUND=y +# CONFIG_ESP32_DEFAULT_CPU_FREQ_80 is not set +CONFIG_ESP32_DEFAULT_CPU_FREQ_160=y +# CONFIG_ESP32_DEFAULT_CPU_FREQ_240 is not set +CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=160 +# CONFIG_ESP32_SPIRAM_SUPPORT is not set +# CONFIG_ESP32_TRAX is not set +CONFIG_ESP32_TRACEMEM_RESERVE_DRAM=0x0 +# CONFIG_ESP32_ULP_COPROC_ENABLED is not set +CONFIG_ESP32_ULP_COPROC_RESERVE_MEM=0 +CONFIG_ESP32_DEBUG_OCDAWARE=y +CONFIG_ESP32_BROWNOUT_DET=y +CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_0=y +# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_1 is not set +# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_2 is not set +# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_3 is not set +# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_4 is not set +# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_5 is not set +# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_6 is not set +# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_7 is not set +CONFIG_ESP32_BROWNOUT_DET_LVL=0 +CONFIG_ESP32_TIME_SYSCALL_USE_RTC_FRC1=y +# CONFIG_ESP32_TIME_SYSCALL_USE_RTC is not set +# CONFIG_ESP32_TIME_SYSCALL_USE_FRC1 is not set +# CONFIG_ESP32_TIME_SYSCALL_USE_NONE is not set +CONFIG_ESP32_RTC_CLK_SRC_INT_RC=y +# CONFIG_ESP32_RTC_CLK_SRC_EXT_CRYS is not set +# CONFIG_ESP32_RTC_CLK_SRC_EXT_OSC is not set +# CONFIG_ESP32_RTC_CLK_SRC_INT_8MD256 is not set +CONFIG_ESP32_RTC_CLK_CAL_CYCLES=1024 +CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY=2000 +CONFIG_ESP32_XTAL_FREQ_40=y +# CONFIG_ESP32_XTAL_FREQ_26 is not set +# CONFIG_ESP32_XTAL_FREQ_AUTO is not set +CONFIG_ESP32_XTAL_FREQ=40 +# CONFIG_ESP32_DISABLE_BASIC_ROM_CONSOLE is not set +# CONFIG_ESP32_COMPATIBLE_PRE_V2_1_BOOTLOADERS is not set +# CONFIG_ESP32_COMPATIBLE_PRE_V3_1_BOOTLOADERS is not set +# CONFIG_ESP32_USE_FIXED_STATIC_RAM_SIZE is not set +CONFIG_ESP32_DPORT_DIS_INTERRUPT_LVL=5 +# end of ESP32-specific # # ADC-Calibration # +CONFIG_ADC_CAL_EFUSE_TP_ENABLE=y +CONFIG_ADC_CAL_EFUSE_VREF_ENABLE=y +CONFIG_ADC_CAL_LUT_ENABLE=y # end of ADC-Calibration # @@ -680,6 +644,14 @@ CONFIG_ESP_ERR_TO_NAME_LOOKUP=y # Ethernet # CONFIG_ETH_ENABLED=y +CONFIG_ETH_USE_ESP32_EMAC=y +CONFIG_ETH_PHY_INTERFACE_RMII=y +CONFIG_ETH_RMII_CLK_INPUT=y +# CONFIG_ETH_RMII_CLK_OUTPUT is not set +CONFIG_ETH_RMII_CLK_IN_GPIO=0 +CONFIG_ETH_DMA_BUFFER_SIZE=512 +CONFIG_ETH_DMA_RX_BUFFER_NUM=10 +CONFIG_ETH_DMA_TX_BUFFER_NUM=10 CONFIG_ETH_USE_SPI_ETHERNET=y # CONFIG_ETH_SPI_ETHERNET_DM9051 is not set CONFIG_ETH_SPI_ETHERNET_W5500=y @@ -742,9 +714,10 @@ CONFIG_ESP_MAC_ADDR_UNIVERSE_WIFI_STA=y CONFIG_ESP_MAC_ADDR_UNIVERSE_WIFI_AP=y CONFIG_ESP_MAC_ADDR_UNIVERSE_BT=y CONFIG_ESP_MAC_ADDR_UNIVERSE_ETH=y -# CONFIG_ESP32S3_UNIVERSAL_MAC_ADDRESSES_TWO is not set -CONFIG_ESP32S3_UNIVERSAL_MAC_ADDRESSES_FOUR=y -CONFIG_ESP32S3_UNIVERSAL_MAC_ADDRESSES=4 +# CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES_TWO is not set +CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES_FOUR=y +CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES=4 +# CONFIG_ESP_MAC_IGNORE_MAC_CRC_ERROR is not set # end of MAC Config # @@ -760,7 +733,6 @@ CONFIG_ESP_SLEEP_GPIO_ENABLE_INTERNAL_RESISTORS=y # # RTC Clock Config # -CONFIG_RTC_CLOCK_BBPLL_POWER_ON_WITH_USB=y # end of RTC Clock Config # end of Hardware Settings @@ -780,7 +752,6 @@ CONFIG_ESP_IPC_ISR_ENABLE=y # LCD Peripheral Configuration # CONFIG_LCD_PANEL_IO_FORMAT_BUF_SIZE=32 -# CONFIG_LCD_RGB_ISR_IRAM_SAFE is not set # end of LCD Peripheral Configuration # end of LCD and Touch Panel @@ -801,7 +772,6 @@ CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE=y CONFIG_ESP_PHY_MAX_WIFI_TX_POWER=20 CONFIG_ESP_PHY_MAX_TX_POWER=20 # CONFIG_ESP_PHY_REDUCE_TX_POWER is not set -CONFIG_ESP_PHY_ENABLE_USB=y CONFIG_ESP_PHY_RF_CAL_PARTIAL=y # CONFIG_ESP_PHY_RF_CAL_NONE is not set # CONFIG_ESP_PHY_RF_CAL_FULL is not set @@ -812,8 +782,6 @@ CONFIG_ESP_PHY_CALIBRATION_MODE=0 # Power Management # # CONFIG_PM_ENABLE is not set -CONFIG_PM_POWER_DOWN_CPU_IN_LIGHT_SLEEP=y -CONFIG_PM_POWER_DOWN_TAGMEM_IN_LIGHT_SLEEP=y # end of Power Management # @@ -831,8 +799,6 @@ CONFIG_ESP_SYSTEM_PANIC_PRINT_REBOOT=y # CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set # CONFIG_ESP_SYSTEM_PANIC_GDBSTUB is not set # CONFIG_ESP_SYSTEM_GDBSTUB_RUNTIME is not set -CONFIG_ESP_SYSTEM_RTC_FAST_MEM_AS_HEAP_DEPCHECK=y -CONFIG_ESP_SYSTEM_ALLOW_RTC_FAST_MEM_AS_HEAP=y # # Memory protection @@ -848,12 +814,8 @@ CONFIG_ESP_MAIN_TASK_AFFINITY_CPU0=y CONFIG_ESP_MAIN_TASK_AFFINITY=0x0 CONFIG_ESP_MINIMAL_SHARED_STACK_SIZE=2048 CONFIG_ESP_CONSOLE_UART_DEFAULT=y -# CONFIG_ESP_CONSOLE_USB_CDC is not set -# CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG is not set # CONFIG_ESP_CONSOLE_UART_CUSTOM is not set # CONFIG_ESP_CONSOLE_NONE is not set -# CONFIG_ESP_CONSOLE_SECONDARY_NONE is not set -CONFIG_ESP_CONSOLE_SECONDARY_USB_SERIAL_JTAG=y CONFIG_ESP_CONSOLE_UART=y CONFIG_ESP_CONSOLE_MULTIPLE_UART=y CONFIG_ESP_CONSOLE_UART_NUM=0 @@ -868,7 +830,7 @@ CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0=y CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1=y # CONFIG_ESP_PANIC_HANDLER_IRAM is not set # CONFIG_ESP_DEBUG_STUBS_ENABLE is not set -CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_4=y +CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5=y # end of ESP System Settings # @@ -880,7 +842,8 @@ CONFIG_ESP_TIME_FUNCS_USE_ESP_TIMER=y CONFIG_ESP_TIMER_TASK_STACK_SIZE=3584 CONFIG_ESP_TIMER_INTERRUPT_LEVEL=1 # CONFIG_ESP_TIMER_SUPPORTS_ISR_DISPATCH_METHOD is not set -CONFIG_ESP_TIMER_IMPL_SYSTIMER=y +# CONFIG_ESP_TIMER_IMPL_FRC2 is not set +CONFIG_ESP_TIMER_IMPL_TG0_LAC=y # end of High resolution timer (esp_timer) # @@ -904,13 +867,11 @@ CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0=y # CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1 is not set CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752 CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32 -CONFIG_ESP32_WIFI_IRAM_OPT=y -CONFIG_ESP32_WIFI_RX_IRAM_OPT=y +# CONFIG_ESP32_WIFI_IRAM_OPT is not set +# CONFIG_ESP32_WIFI_RX_IRAM_OPT is not set CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE=y # CONFIG_ESP_WIFI_SLP_IRAM_OPT is not set -# CONFIG_ESP_WIFI_FTM_ENABLE is not set # CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE is not set -# CONFIG_ESP_WIFI_GCMP_SUPPORT is not set # CONFIG_ESP_WIFI_GMAC_SUPPORT is not set CONFIG_ESP_WIFI_SOFTAP_SUPPORT=y # CONFIG_ESP_WIFI_SLP_BEACON_LOST_OPT is not set @@ -996,10 +957,10 @@ CONFIG_FMB_EVENT_QUEUE_TIMEOUT=20 # # CONFIG_FREERTOS_UNICORE is not set CONFIG_FREERTOS_NO_AFFINITY=0x7FFFFFFF -CONFIG_FREERTOS_TICK_SUPPORT_SYSTIMER=y -CONFIG_FREERTOS_CORETIMER_SYSTIMER_LVL1=y -# CONFIG_FREERTOS_CORETIMER_SYSTIMER_LVL3 is not set -CONFIG_FREERTOS_SYSTICK_USES_SYSTIMER=y +CONFIG_FREERTOS_TICK_SUPPORT_CORETIMER=y +CONFIG_FREERTOS_CORETIMER_0=y +# CONFIG_FREERTOS_CORETIMER_1 is not set +CONFIG_FREERTOS_SYSTICK_USES_CCOUNT=y CONFIG_FREERTOS_HZ=1000 CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION=y # CONFIG_FREERTOS_CHECK_STACKOVERFLOW_NONE is not set @@ -1028,6 +989,7 @@ CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=y # CONFIG_FREERTOS_CHECK_PORT_CRITICAL_COMPLIANCE is not set # CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH is not set CONFIG_FREERTOS_DEBUG_OCDAWARE=y +# CONFIG_FREERTOS_FPU_IN_ISR is not set CONFIG_FREERTOS_ENABLE_TASK_SNAPSHOT=y # CONFIG_FREERTOS_PLACE_SNAPSHOT_FUNS_INTO_FLASH is not set # end of FreeRTOS @@ -1098,7 +1060,7 @@ CONFIG_LWIP_TCPIP_TASK_PRIO=18 # CONFIG_LWIP_CHECK_THREAD_SAFETY is not set CONFIG_LWIP_DNS_SUPPORT_MDNS_QUERIES=y # CONFIG_LWIP_L2_TO_L3_COPY is not set -CONFIG_LWIP_IRAM_OPTIMIZATION=y +# CONFIG_LWIP_IRAM_OPTIMIZATION is not set CONFIG_LWIP_TIMERS_ONDEMAND=y CONFIG_LWIP_MAX_SOCKETS=10 # CONFIG_LWIP_USE_ONLY_LWIP_SELECT is not set @@ -1243,7 +1205,7 @@ CONFIG_MBEDTLS_INTERNAL_MEM_ALLOC=y # CONFIG_MBEDTLS_DEFAULT_MEM_ALLOC is not set # CONFIG_MBEDTLS_CUSTOM_MEM_ALLOC is not set CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN=y -CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=16384 +CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=8192 CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=2048 CONFIG_MBEDTLS_DYNAMIC_BUFFER=y CONFIG_MBEDTLS_DYNAMIC_FREE_PEER_CERT=y @@ -1264,8 +1226,8 @@ CONFIG_MBEDTLS_ECDH_LEGACY_CONTEXT=y # Certificate Bundle # CONFIG_MBEDTLS_CERTIFICATE_BUNDLE=y -CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_FULL=y -# CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_CMN is not set +# CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_FULL is not set +CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_CMN=y # CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_NONE is not set # CONFIG_MBEDTLS_CUSTOM_CERTIFICATE_BUNDLE is not set CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_MAX_CERTS=200 @@ -1274,7 +1236,6 @@ CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_MAX_CERTS=200 CONFIG_MBEDTLS_ECP_RESTARTABLE=y CONFIG_MBEDTLS_CMAC_C=y CONFIG_MBEDTLS_HARDWARE_AES=y -CONFIG_MBEDTLS_AES_USE_INTERRUPT=y CONFIG_MBEDTLS_HARDWARE_MPI=y CONFIG_MBEDTLS_HARDWARE_SHA=y CONFIG_MBEDTLS_ROM_MD5=y @@ -1454,7 +1415,6 @@ CONFIG_PTHREAD_TASK_NAME_DEFAULT="pthread" # CONFIG_SPI_FLASH_VERIFY_WRITE is not set # CONFIG_SPI_FLASH_ENABLE_COUNTERS is not set CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=y -# CONFIG_SPI_FLASH_ROM_IMPL is not set CONFIG_SPI_FLASH_DANGEROUS_WRITE_ABORTS=y # CONFIG_SPI_FLASH_DANGEROUS_WRITE_FAILS is not set # CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED is not set @@ -1478,7 +1438,6 @@ CONFIG_SPI_FLASH_SUPPORT_GD_CHIP=y CONFIG_SPI_FLASH_SUPPORT_WINBOND_CHIP=y CONFIG_SPI_FLASH_SUPPORT_BOYA_CHIP=y CONFIG_SPI_FLASH_SUPPORT_TH_CHIP=y -CONFIG_SPI_FLASH_SUPPORT_MXIC_OPI_CHIP=y # end of Auto-detect flash chips CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE=y @@ -1532,12 +1491,6 @@ CONFIG_WS_BUFFER_SIZE=1024 # end of Websocket # end of TCP Transport -# -# TinyUSB Stack -# -# CONFIG_TINYUSB is not set -# end of TinyUSB Stack - # # Unity unit testing library # @@ -1550,24 +1503,10 @@ CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER=y # CONFIG_UNITY_ENABLE_BACKTRACE_ON_FAIL is not set # end of Unity unit testing library -# -# USB-OTG -# -CONFIG_USB_OTG_SUPPORTED=y -CONFIG_USB_HOST_CONTROL_TRANSFER_MAX_SIZE=256 -CONFIG_USB_HOST_HW_BUFFER_BIAS_BALANCED=y -# CONFIG_USB_HOST_HW_BUFFER_BIAS_IN is not set -# CONFIG_USB_HOST_HW_BUFFER_BIAS_PERIODIC_OUT is not set - # # Root Hub configuration # -CONFIG_USB_HOST_DEBOUNCE_DELAY_MS=250 -CONFIG_USB_HOST_RESET_HOLD_MS=30 -CONFIG_USB_HOST_RESET_RECOVERY_MS=30 -CONFIG_USB_HOST_SET_ADDR_RECOVERY_MS=10 # end of Root Hub configuration -# end of USB-OTG # # Virtual file system @@ -1679,6 +1618,28 @@ CONFIG_STACK_CHECK_NONE=y # CONFIG_ESP32_APPTRACE_DEST_TRAX is not set CONFIG_ESP32_APPTRACE_DEST_NONE=y CONFIG_ESP32_APPTRACE_LOCK_ENABLE=y +CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y +# CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY is not set +# CONFIG_BTDM_CONTROLLER_MODE_BTDM is not set +CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN=3 +CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN_EFF=3 +CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_EFF=0 +CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN_EFF=0 +CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE=0 +CONFIG_BTDM_CONTROLLER_HCI_MODE_VHCI=y +# CONFIG_BTDM_CONTROLLER_HCI_MODE_UART_H4 is not set +CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=y +CONFIG_BLE_SCAN_DUPLICATE=y +CONFIG_SCAN_DUPLICATE_BY_DEVICE_ADDR=y +# CONFIG_SCAN_DUPLICATE_BY_ADV_DATA is not set +# CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR is not set +CONFIG_SCAN_DUPLICATE_TYPE=0 +CONFIG_DUPLICATE_SCAN_CACHE_SIZE=100 +# CONFIG_BLE_MESH_SCAN_DUPLICATE_EN is not set +CONFIG_BTDM_CONTROLLER_FULL_SCAN_SUPPORTED=y +CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_SUPPORTED=y +CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_NUM=100 +CONFIG_BLE_ADV_REPORT_DISCARD_THRSHOLD=20 CONFIG_BLUEDROID_ENABLED=y # CONFIG_NIMBLE_ENABLED is not set CONFIG_BTC_TASK_STACK_SIZE=3072 @@ -1687,6 +1648,7 @@ CONFIG_BLUEDROID_PINNED_TO_CORE_0=y CONFIG_BLUEDROID_PINNED_TO_CORE=0 CONFIG_BTU_TASK_STACK_SIZE=4096 # CONFIG_BLUEDROID_MEM_DEBUG is not set +# CONFIG_CLASSIC_BT_ENABLED is not set CONFIG_GATTS_ENABLE=y # CONFIG_GATTS_SEND_SERVICE_CHANGE_MANUAL is not set CONFIG_GATTS_SEND_SERVICE_CHANGE_AUTO=y @@ -1861,9 +1823,32 @@ CONFIG_SMP_ENABLE=y # CONFIG_BLE_ACTIVE_SCAN_REPORT_ADV_SCAN_RSP_INDIVIDUALLY is not set CONFIG_BLE_ESTABLISH_LINK_CONNECTION_TIMEOUT=30 CONFIG_ADC2_DISABLE_DAC=y +# CONFIG_SPIRAM_SUPPORT is not set +CONFIG_TRACEMEM_RESERVE_DRAM=0x0 +# CONFIG_ULP_COPROC_ENABLED is not set +CONFIG_ULP_COPROC_RESERVE_MEM=0 +CONFIG_BROWNOUT_DET=y +CONFIG_BROWNOUT_DET_LVL_SEL_0=y +# CONFIG_BROWNOUT_DET_LVL_SEL_1 is not set +# CONFIG_BROWNOUT_DET_LVL_SEL_2 is not set +# CONFIG_BROWNOUT_DET_LVL_SEL_3 is not set +# CONFIG_BROWNOUT_DET_LVL_SEL_4 is not set +# CONFIG_BROWNOUT_DET_LVL_SEL_5 is not set +# CONFIG_BROWNOUT_DET_LVL_SEL_6 is not set +# CONFIG_BROWNOUT_DET_LVL_SEL_7 is not set +CONFIG_BROWNOUT_DET_LVL=0 +CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC=y +# CONFIG_ESP32_RTC_CLOCK_SOURCE_EXTERNAL_CRYSTAL is not set +# CONFIG_ESP32_RTC_CLOCK_SOURCE_EXTERNAL_OSC is not set +# CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_8MD256 is not set +# CONFIG_DISABLE_BASIC_ROM_CONSOLE is not set +# CONFIG_COMPATIBLE_PRE_V2_1_BOOTLOADERS is not set # CONFIG_EVENT_LOOP_PROFILING is not set CONFIG_POST_EVENTS_FROM_ISR=y CONFIG_POST_EVENTS_FROM_IRAM_ISR=y +# CONFIG_TWO_UNIVERSAL_MAC_ADDRESS is not set +CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS=y +CONFIG_NUMBER_OF_UNIVERSAL_MAC_ADDRESS=4 CONFIG_ESP_SYSTEM_PD_FLASH=y CONFIG_ESP32C3_LIGHTSLEEP_GPIO_RESET_WORKAROUND=y CONFIG_IPC_TASK_STACK_SIZE=1536 @@ -1872,12 +1857,10 @@ CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE=y CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER=20 CONFIG_ESP32_PHY_MAX_TX_POWER=20 # CONFIG_ESP32_REDUCE_PHY_TX_POWER is not set -CONFIG_ESP_SYSTEM_PM_POWER_DOWN_CPU=y # CONFIG_ESP32S2_PANIC_PRINT_HALT is not set CONFIG_ESP32S2_PANIC_PRINT_REBOOT=y # CONFIG_ESP32S2_PANIC_SILENT_REBOOT is not set # CONFIG_ESP32S2_PANIC_GDBSTUB is not set -CONFIG_ESP32S2_ALLOW_RTC_FAST_MEM_AS_HEAP=y CONFIG_SYSTEM_EVENT_QUEUE_SIZE=32 CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=3072 CONFIG_MAIN_TASK_STACK_SIZE=3584 @@ -1953,7 +1936,6 @@ CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT="pthread" CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ABORTS=y # CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_FAILS is not set # CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ALLOWED is not set -# CONFIG_USB_ENABLED is not set CONFIG_SUPPRESS_SELECT_DEBUG_OUTPUT=y CONFIG_SUPPORT_TERMIOS=y CONFIG_SEMIHOSTFS_MAX_MOUNT_POINTS=1 diff --git a/sdkconfig.old b/sdkconfig.old index f28e8c26c..a6b556965 100644 --- a/sdkconfig.old +++ b/sdkconfig.old @@ -4,9 +4,9 @@ # CONFIG_IDF_CMAKE=y CONFIG_IDF_TARGET_ARCH_XTENSA=y -CONFIG_IDF_TARGET="esp32s3" -CONFIG_IDF_TARGET_ESP32S3=y -CONFIG_IDF_FIRMWARE_CHIP_ID=0x0009 +CONFIG_IDF_TARGET="esp32" +CONFIG_IDF_TARGET_ESP32=y +CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000 # # SDK tool configuration @@ -38,7 +38,7 @@ CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16 # # Bootloader config # -CONFIG_BOOTLOADER_OFFSET_IN_FLASH=0x0 +CONFIG_BOOTLOADER_OFFSET_IN_FLASH=0x1000 CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y # CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_DEBUG is not set # CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_PERF is not set @@ -70,48 +70,36 @@ CONFIG_BOOTLOADER_FLASH_XMC_SUPPORT=y # # Security features # -CONFIG_SECURE_BOOT_SUPPORTS_RSA=y -CONFIG_SECURE_TARGET_HAS_SECURE_ROM_DL_MODE=y # CONFIG_SECURE_SIGNED_APPS_NO_SECURE_BOOT is not set # CONFIG_SECURE_BOOT is not set # CONFIG_SECURE_FLASH_ENC_ENABLED is not set # end of Security features -# -# Boot ROM Behavior -# -CONFIG_BOOT_ROM_LOG_ALWAYS_ON=y -# CONFIG_BOOT_ROM_LOG_ALWAYS_OFF is not set -# CONFIG_BOOT_ROM_LOG_ON_GPIO_HIGH is not set -# CONFIG_BOOT_ROM_LOG_ON_GPIO_LOW is not set -# end of Boot ROM Behavior - # # Serial flasher config # CONFIG_ESPTOOLPY_BAUD_OTHER_VAL=115200 # CONFIG_ESPTOOLPY_NO_STUB is not set -# CONFIG_ESPTOOLPY_OCT_FLASH is not set # CONFIG_ESPTOOLPY_FLASHMODE_QIO is not set # CONFIG_ESPTOOLPY_FLASHMODE_QOUT is not set CONFIG_ESPTOOLPY_FLASHMODE_DIO=y # CONFIG_ESPTOOLPY_FLASHMODE_DOUT is not set CONFIG_ESPTOOLPY_FLASH_SAMPLE_MODE_STR=y CONFIG_ESPTOOLPY_FLASHMODE="dio" -# CONFIG_ESPTOOLPY_FLASHFREQ_120M is not set # CONFIG_ESPTOOLPY_FLASHFREQ_80M is not set CONFIG_ESPTOOLPY_FLASHFREQ_40M=y +# CONFIG_ESPTOOLPY_FLASHFREQ_26M is not set # CONFIG_ESPTOOLPY_FLASHFREQ_20M is not set CONFIG_ESPTOOLPY_FLASHFREQ="40m" # CONFIG_ESPTOOLPY_FLASHSIZE_1MB is not set # CONFIG_ESPTOOLPY_FLASHSIZE_2MB is not set -# CONFIG_ESPTOOLPY_FLASHSIZE_4MB is not set -CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y +CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y +# CONFIG_ESPTOOLPY_FLASHSIZE_8MB is not set # CONFIG_ESPTOOLPY_FLASHSIZE_16MB is not set # CONFIG_ESPTOOLPY_FLASHSIZE_32MB is not set # CONFIG_ESPTOOLPY_FLASHSIZE_64MB is not set # CONFIG_ESPTOOLPY_FLASHSIZE_128MB is not set -CONFIG_ESPTOOLPY_FLASHSIZE="8MB" +CONFIG_ESPTOOLPY_FLASHSIZE="4MB" CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y CONFIG_ESPTOOLPY_BEFORE_RESET=y # CONFIG_ESPTOOLPY_BEFORE_NORESET is not set @@ -148,23 +136,24 @@ CONFIG_PARTITION_TABLE_MD5=y # EzloPi User Config # # CONFIG_EZPI_DEV_TYPE_TEST is not set -# CONFIG_EZPI_UTIL_ENABLE_TRACE is not set +CONFIG_EZPI_UTIL_ENABLE_TRACE=y # CONFIG_EZPI_CORE_ENABLE_ETH is not set CONFIG_EZPI_SERV_ENABLE_MESHBOTS=y CONFIG_EZLPI_SERV_ENABLE_MODES=y -# CONFIG_EZLOPI_BLE_ENABLE is not set +CONFIG_EZLOPI_BLE_ENABLE=y +# CONFIG_EZLOPI_BLE_ENALBE_PASSKEY is not set +CONFIG_EZLOPI_BLE_ENALBE_PAIRING=y # # EzloPi mDNS config # CONFIG_EZPI_MDNS_HOSTNAME="ezlopi_device" CONFIG_EZPI_MDNS_INSTANCE_NAME="ezlopi_serial" -CONFIG_EZPI_MDNS_ENABLE_EXTRA_SERVICES=y -CONFIG_EZPI_MDNS_ENABLE_MANUFACTURER_SERVICE=y -CONFIG_EZPI_MDNS_ENABLE_BRAND_SERVICE=y -CONFIG_EZPI_MDNS_ENABLE_MODEL_SERVICE=y -CONFIG_EZPI_MDNS_ENABLE_NAME_SERVICE=y +# CONFIG_EZPI_MDNS_ENABLE_EXTRA_SERVICES is not set # end of EzloPi mDNS config + +CONFIG_EZPI_ON_OFF_LED=y +# CONFIG_EZPI_RGB_LED is not set # end of EzloPi User Config # @@ -213,81 +202,51 @@ CONFIG_APPTRACE_LOCK_ENABLE=y # Bluetooth # CONFIG_BT_ENABLED=y -CONFIG_BT_SOC_SUPPORT_5_0=y # # Bluetooth controller # -CONFIG_BT_CTRL_MODE_EFF=1 -CONFIG_BT_CTRL_BLE_MAX_ACT=10 -CONFIG_BT_CTRL_BLE_MAX_ACT_EFF=10 -CONFIG_BT_CTRL_BLE_STATIC_ACL_TX_BUF_NB=0 -CONFIG_BT_CTRL_PINNED_TO_CORE_0=y -# CONFIG_BT_CTRL_PINNED_TO_CORE_1 is not set -CONFIG_BT_CTRL_PINNED_TO_CORE=0 -CONFIG_BT_CTRL_HCI_MODE_VHCI=y -# CONFIG_BT_CTRL_HCI_MODE_UART_H4 is not set -CONFIG_BT_CTRL_HCI_TL=1 -CONFIG_BT_CTRL_ADV_DUP_FILT_MAX=30 -CONFIG_BT_BLE_CCA_MODE_NONE=y -# CONFIG_BT_BLE_CCA_MODE_HW is not set -# CONFIG_BT_BLE_CCA_MODE_SW is not set -CONFIG_BT_BLE_CCA_MODE=0 -CONFIG_BT_CTRL_HW_CCA_VAL=20 -CONFIG_BT_CTRL_HW_CCA_EFF=0 -CONFIG_BT_CTRL_CE_LENGTH_TYPE_ORIG=y -# CONFIG_BT_CTRL_CE_LENGTH_TYPE_CE is not set -# CONFIG_BT_CTRL_CE_LENGTH_TYPE_SD is not set -CONFIG_BT_CTRL_CE_LENGTH_TYPE_EFF=0 -CONFIG_BT_CTRL_TX_ANTENNA_INDEX_0=y -# CONFIG_BT_CTRL_TX_ANTENNA_INDEX_1 is not set -CONFIG_BT_CTRL_TX_ANTENNA_INDEX_EFF=0 -CONFIG_BT_CTRL_RX_ANTENNA_INDEX_0=y -# CONFIG_BT_CTRL_RX_ANTENNA_INDEX_1 is not set -CONFIG_BT_CTRL_RX_ANTENNA_INDEX_EFF=0 -# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N24 is not set -# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N21 is not set -# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N18 is not set -# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N15 is not set -# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N12 is not set -# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N9 is not set -# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N6 is not set -# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N3 is not set -# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N0 is not set -# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_P3 is not set -# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_P6 is not set -# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_P9 is not set -# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_P12 is not set -# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_P15 is not set -# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_P18 is not set -CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_P21=y -CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_EFF=15 -CONFIG_BT_CTRL_BLE_ADV_REPORT_FLOW_CTRL_SUPP=y -CONFIG_BT_CTRL_BLE_ADV_REPORT_FLOW_CTRL_NUM=100 -CONFIG_BT_CTRL_BLE_ADV_REPORT_DISCARD_THRSHOLD=20 -CONFIG_BT_CTRL_BLE_SCAN_DUPL=y -CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DEVICE=y -# CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA is not set -# CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE is not set -CONFIG_BT_CTRL_SCAN_DUPL_TYPE=0 -CONFIG_BT_CTRL_SCAN_DUPL_CACHE_SIZE=100 -CONFIG_BT_CTRL_DUPL_SCAN_CACHE_REFRESH_PERIOD=0 -# CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN is not set -# CONFIG_BT_CTRL_COEX_PHY_CODED_TX_RX_TLIM_EN is not set -CONFIG_BT_CTRL_COEX_PHY_CODED_TX_RX_TLIM_DIS=y -CONFIG_BT_CTRL_COEX_PHY_CODED_TX_RX_TLIM_EFF=0 +CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y +# CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY is not set +# CONFIG_BTDM_CTRL_MODE_BTDM is not set +CONFIG_BTDM_CTRL_BLE_MAX_CONN=3 +CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0 +CONFIG_BTDM_CTRL_PCM_ROLE_EFF=0 +CONFIG_BTDM_CTRL_PCM_POLAR_EFF=0 +CONFIG_BTDM_CTRL_BLE_MAX_CONN_EFF=3 +CONFIG_BTDM_CTRL_BR_EDR_MAX_ACL_CONN_EFF=0 +CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN_EFF=0 +CONFIG_BTDM_CTRL_PINNED_TO_CORE_0=y +# CONFIG_BTDM_CTRL_PINNED_TO_CORE_1 is not set +CONFIG_BTDM_CTRL_PINNED_TO_CORE=0 +CONFIG_BTDM_CTRL_HCI_MODE_VHCI=y +# CONFIG_BTDM_CTRL_HCI_MODE_UART_H4 is not set # # MODEM SLEEP Options # -# CONFIG_BT_CTRL_MODEM_SLEEP is not set +CONFIG_BTDM_CTRL_MODEM_SLEEP=y +CONFIG_BTDM_CTRL_MODEM_SLEEP_MODE_ORIG=y +# CONFIG_BTDM_CTRL_MODEM_SLEEP_MODE_EVED is not set +CONFIG_BTDM_CTRL_LPCLK_SEL_MAIN_XTAL=y # end of MODEM SLEEP Options -CONFIG_BT_CTRL_SLEEP_MODE_EFF=0 -CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0 -CONFIG_BT_CTRL_HCI_TL_EFF=1 -# CONFIG_BT_CTRL_AGC_RECORRECT_EN is not set -# CONFIG_BT_CTRL_SCAN_BACKOFF_UPPERLIMITMAX is not set +CONFIG_BTDM_BLE_DEFAULT_SCA_250PPM=y +CONFIG_BTDM_BLE_SLEEP_CLOCK_ACCURACY_INDEX_EFF=1 +CONFIG_BTDM_BLE_SCAN_DUPL=y +CONFIG_BTDM_SCAN_DUPL_TYPE_DEVICE=y +# CONFIG_BTDM_SCAN_DUPL_TYPE_DATA is not set +# CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE is not set +CONFIG_BTDM_SCAN_DUPL_TYPE=0 +CONFIG_BTDM_SCAN_DUPL_CACHE_SIZE=100 +CONFIG_BTDM_SCAN_DUPL_CACHE_REFRESH_PERIOD=0 +# CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN is not set +CONFIG_BTDM_CTRL_FULL_SCAN_SUPPORTED=y +CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP=y +CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100 +CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20 +CONFIG_BTDM_RESERVE_DRAM=0xdb5c +CONFIG_BTDM_CTRL_HLI=y # end of Bluetooth controller CONFIG_BT_BLUEDROID_ENABLED=y @@ -303,6 +262,7 @@ CONFIG_BT_BLUEDROID_PINNED_TO_CORE_0=y CONFIG_BT_BLUEDROID_PINNED_TO_CORE=0 CONFIG_BT_BTU_TASK_STACK_SIZE=4096 # CONFIG_BT_BLUEDROID_MEM_DEBUG is not set +# CONFIG_BT_CLASSIC_ENABLED is not set CONFIG_BT_BLE_ENABLED=y CONFIG_BT_GATTS_ENABLE=y # CONFIG_BT_GATTS_PPCP_CHAR_GAP is not set @@ -506,9 +466,8 @@ CONFIG_BT_SMP_ENABLE=y # CONFIG_BT_BLE_ACT_SCAN_REP_ADV_SCAN is not set CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30 CONFIG_BT_MAX_DEVICE_NAME_LEN=32 +# CONFIG_BT_BLE_RPA_SUPPORTED is not set CONFIG_BT_BLE_RPA_TIMEOUT=900 -# CONFIG_BT_BLE_50_FEATURES_SUPPORTED is not set -CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y # CONFIG_BT_BLE_HIGH_DUTY_ADV_INTERVAL is not set # end of Bluedroid Options # end of Bluetooth @@ -533,7 +492,6 @@ CONFIG_COAP_LOG_DEFAULT_LEVEL=0 # # CONFIG_ADC_FORCE_XPD_FSM is not set CONFIG_ADC_DISABLE_DAC=y -# CONFIG_ADC_CONTINUOUS_FORCE_USE_ADC2_ON_C3_S3 is not set # end of ADC configuration # @@ -555,6 +513,10 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y # TWAI configuration # # CONFIG_TWAI_ISR_IN_IRAM is not set +# CONFIG_TWAI_ERRATA_FIX_BUS_OFF_REC is not set +# CONFIG_TWAI_ERRATA_FIX_TX_INTR_LOST is not set +# CONFIG_TWAI_ERRATA_FIX_RX_FRAME_INVALID is not set +# CONFIG_TWAI_ERRATA_FIX_RX_FIFO_CORRUPT is not set # CONFIG_TWAI_ERRATA_FIX_LISTEN_ONLY_DOM is not set # end of TWAI configuration @@ -564,6 +526,18 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y CONFIG_UART_ISR_IN_IRAM=y # end of UART configuration +# +# RTCIO configuration +# +# CONFIG_RTCIO_SUPPORT_RTC_GPIO_DESC is not set +# end of RTCIO configuration + +# +# GPIO Configuration +# +# CONFIG_GPIO_ESP32_SUPPORT_SWITCH_SLP_PULL is not set +# end of GPIO Configuration + # # GDMA Configuration # @@ -577,95 +551,87 @@ CONFIG_UART_ISR_IN_IRAM=y # # CONFIG_EFUSE_CUSTOM_TABLE is not set # CONFIG_EFUSE_VIRTUAL is not set -CONFIG_EFUSE_MAX_BLK_LEN=256 +# CONFIG_EFUSE_CODE_SCHEME_COMPAT_NONE is not set +CONFIG_EFUSE_CODE_SCHEME_COMPAT_3_4=y +# CONFIG_EFUSE_CODE_SCHEME_COMPAT_REPEAT is not set +CONFIG_EFUSE_MAX_BLK_LEN=192 # end of eFuse Bit Manager # # ESP-TLS # CONFIG_ESP_TLS_USING_MBEDTLS=y -CONFIG_ESP_TLS_USE_DS_PERIPHERAL=y +# CONFIG_ESP_TLS_USE_SECURE_ELEMENT is not set # CONFIG_ESP_TLS_CLIENT_SESSION_TICKETS is not set # CONFIG_ESP_TLS_SERVER is not set # CONFIG_ESP_TLS_PSK_VERIFICATION is not set -# CONFIG_ESP_TLS_INSECURE is not set +CONFIG_ESP_TLS_INSECURE=y +# CONFIG_ESP_TLS_SKIP_SERVER_CERT_VERIFY is not set # end of ESP-TLS # -# ESP32S3-Specific +# ESP32-specific # -CONFIG_ESP32S3_REV_MIN_0=y -# CONFIG_ESP32S3_REV_MIN_1 is not set -# CONFIG_ESP32S3_REV_MIN_2 is not set -CONFIG_ESP32S3_REV_MIN_FULL=0 +CONFIG_ESP32_REV_MIN_0=y +# CONFIG_ESP32_REV_MIN_1 is not set +# CONFIG_ESP32_REV_MIN_1_1 is not set +# CONFIG_ESP32_REV_MIN_2 is not set +# CONFIG_ESP32_REV_MIN_3 is not set +# CONFIG_ESP32_REV_MIN_3_1 is not set +CONFIG_ESP32_REV_MIN=0 +CONFIG_ESP32_REV_MIN_FULL=0 CONFIG_ESP_REV_MIN_FULL=0 -CONFIG_ESP32S3_REV_MAX_FULL_STR_OPT=y -CONFIG_ESP32S3_REV_MAX_FULL=99 -CONFIG_ESP_REV_MAX_FULL=99 -# CONFIG_ESP32S3_DEFAULT_CPU_FREQ_80 is not set -# CONFIG_ESP32S3_DEFAULT_CPU_FREQ_160 is not set -CONFIG_ESP32S3_DEFAULT_CPU_FREQ_240=y -CONFIG_ESP32S3_DEFAULT_CPU_FREQ_MHZ=240 - -# -# Cache config -# -CONFIG_ESP32S3_INSTRUCTION_CACHE_16KB=y -# CONFIG_ESP32S3_INSTRUCTION_CACHE_32KB is not set -CONFIG_ESP32S3_INSTRUCTION_CACHE_SIZE=0x4000 -# CONFIG_ESP32S3_INSTRUCTION_CACHE_4WAYS is not set -CONFIG_ESP32S3_INSTRUCTION_CACHE_8WAYS=y -CONFIG_ESP32S3_ICACHE_ASSOCIATED_WAYS=8 -# CONFIG_ESP32S3_INSTRUCTION_CACHE_LINE_16B is not set -CONFIG_ESP32S3_INSTRUCTION_CACHE_LINE_32B=y -CONFIG_ESP32S3_INSTRUCTION_CACHE_LINE_SIZE=32 -# CONFIG_ESP32S3_INSTRUCTION_CACHE_WRAP is not set -# CONFIG_ESP32S3_DATA_CACHE_16KB is not set -CONFIG_ESP32S3_DATA_CACHE_32KB=y -# CONFIG_ESP32S3_DATA_CACHE_64KB is not set -CONFIG_ESP32S3_DATA_CACHE_SIZE=0x8000 -# CONFIG_ESP32S3_DATA_CACHE_4WAYS is not set -CONFIG_ESP32S3_DATA_CACHE_8WAYS=y -CONFIG_ESP32S3_DCACHE_ASSOCIATED_WAYS=8 -# CONFIG_ESP32S3_DATA_CACHE_LINE_16B is not set -CONFIG_ESP32S3_DATA_CACHE_LINE_32B=y -# CONFIG_ESP32S3_DATA_CACHE_LINE_64B is not set -CONFIG_ESP32S3_DATA_CACHE_LINE_SIZE=32 -# CONFIG_ESP32S3_DATA_CACHE_WRAP is not set -# end of Cache config - -# CONFIG_ESP32S3_SPIRAM_SUPPORT is not set -# CONFIG_ESP32S3_TRAX is not set -CONFIG_ESP32S3_TRACEMEM_RESERVE_DRAM=0x0 -# CONFIG_ESP32S3_ULP_COPROC_ENABLED is not set -CONFIG_ESP32S3_ULP_COPROC_RESERVE_MEM=0 -CONFIG_ESP32S3_DEBUG_OCDAWARE=y -CONFIG_ESP32S3_BROWNOUT_DET=y -CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL_7=y -# CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL_6 is not set -# CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL_5 is not set -# CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL_4 is not set -# CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL_3 is not set -# CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL_2 is not set -# CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL_1 is not set -CONFIG_ESP32S3_BROWNOUT_DET_LVL=7 -CONFIG_ESP32S3_TIME_SYSCALL_USE_RTC_FRC1=y -# CONFIG_ESP32S3_TIME_SYSCALL_USE_RTC is not set -# CONFIG_ESP32S3_TIME_SYSCALL_USE_FRC1 is not set -# CONFIG_ESP32S3_TIME_SYSCALL_USE_NONE is not set -CONFIG_ESP32S3_RTC_CLK_SRC_INT_RC=y -# CONFIG_ESP32S3_RTC_CLK_SRC_EXT_CRYS is not set -# CONFIG_ESP32S3_RTC_CLK_SRC_EXT_OSC is not set -# CONFIG_ESP32S3_RTC_CLK_SRC_INT_8MD256 is not set -CONFIG_ESP32S3_RTC_CLK_CAL_CYCLES=1024 -CONFIG_ESP32S3_DEEP_SLEEP_WAKEUP_DELAY=2000 -# CONFIG_ESP32S3_RTCDATA_IN_FAST_MEM is not set -# CONFIG_ESP32S3_USE_FIXED_STATIC_RAM_SIZE is not set -# end of ESP32S3-Specific +CONFIG_ESP32_REV_MAX_FULL_STR_OPT=y +CONFIG_ESP32_REV_MAX_FULL=399 +CONFIG_ESP_REV_MAX_FULL=399 +CONFIG_ESP32_DPORT_WORKAROUND=y +# CONFIG_ESP32_DEFAULT_CPU_FREQ_80 is not set +CONFIG_ESP32_DEFAULT_CPU_FREQ_160=y +# CONFIG_ESP32_DEFAULT_CPU_FREQ_240 is not set +CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=160 +# CONFIG_ESP32_SPIRAM_SUPPORT is not set +# CONFIG_ESP32_TRAX is not set +CONFIG_ESP32_TRACEMEM_RESERVE_DRAM=0x0 +# CONFIG_ESP32_ULP_COPROC_ENABLED is not set +CONFIG_ESP32_ULP_COPROC_RESERVE_MEM=0 +CONFIG_ESP32_DEBUG_OCDAWARE=y +CONFIG_ESP32_BROWNOUT_DET=y +CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_0=y +# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_1 is not set +# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_2 is not set +# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_3 is not set +# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_4 is not set +# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_5 is not set +# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_6 is not set +# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_7 is not set +CONFIG_ESP32_BROWNOUT_DET_LVL=0 +CONFIG_ESP32_TIME_SYSCALL_USE_RTC_FRC1=y +# CONFIG_ESP32_TIME_SYSCALL_USE_RTC is not set +# CONFIG_ESP32_TIME_SYSCALL_USE_FRC1 is not set +# CONFIG_ESP32_TIME_SYSCALL_USE_NONE is not set +CONFIG_ESP32_RTC_CLK_SRC_INT_RC=y +# CONFIG_ESP32_RTC_CLK_SRC_EXT_CRYS is not set +# CONFIG_ESP32_RTC_CLK_SRC_EXT_OSC is not set +# CONFIG_ESP32_RTC_CLK_SRC_INT_8MD256 is not set +CONFIG_ESP32_RTC_CLK_CAL_CYCLES=1024 +CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY=2000 +CONFIG_ESP32_XTAL_FREQ_40=y +# CONFIG_ESP32_XTAL_FREQ_26 is not set +# CONFIG_ESP32_XTAL_FREQ_AUTO is not set +CONFIG_ESP32_XTAL_FREQ=40 +# CONFIG_ESP32_DISABLE_BASIC_ROM_CONSOLE is not set +# CONFIG_ESP32_COMPATIBLE_PRE_V2_1_BOOTLOADERS is not set +# CONFIG_ESP32_COMPATIBLE_PRE_V3_1_BOOTLOADERS is not set +# CONFIG_ESP32_USE_FIXED_STATIC_RAM_SIZE is not set +CONFIG_ESP32_DPORT_DIS_INTERRUPT_LVL=5 +# end of ESP32-specific # # ADC-Calibration # +CONFIG_ADC_CAL_EFUSE_TP_ENABLE=y +CONFIG_ADC_CAL_EFUSE_VREF_ENABLE=y +CONFIG_ADC_CAL_LUT_ENABLE=y # end of ADC-Calibration # @@ -678,6 +644,14 @@ CONFIG_ESP_ERR_TO_NAME_LOOKUP=y # Ethernet # CONFIG_ETH_ENABLED=y +CONFIG_ETH_USE_ESP32_EMAC=y +CONFIG_ETH_PHY_INTERFACE_RMII=y +CONFIG_ETH_RMII_CLK_INPUT=y +# CONFIG_ETH_RMII_CLK_OUTPUT is not set +CONFIG_ETH_RMII_CLK_IN_GPIO=0 +CONFIG_ETH_DMA_BUFFER_SIZE=512 +CONFIG_ETH_DMA_RX_BUFFER_NUM=10 +CONFIG_ETH_DMA_TX_BUFFER_NUM=10 CONFIG_ETH_USE_SPI_ETHERNET=y # CONFIG_ETH_SPI_ETHERNET_DM9051 is not set CONFIG_ETH_SPI_ETHERNET_W5500=y @@ -740,9 +714,10 @@ CONFIG_ESP_MAC_ADDR_UNIVERSE_WIFI_STA=y CONFIG_ESP_MAC_ADDR_UNIVERSE_WIFI_AP=y CONFIG_ESP_MAC_ADDR_UNIVERSE_BT=y CONFIG_ESP_MAC_ADDR_UNIVERSE_ETH=y -# CONFIG_ESP32S3_UNIVERSAL_MAC_ADDRESSES_TWO is not set -CONFIG_ESP32S3_UNIVERSAL_MAC_ADDRESSES_FOUR=y -CONFIG_ESP32S3_UNIVERSAL_MAC_ADDRESSES=4 +# CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES_TWO is not set +CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES_FOUR=y +CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES=4 +# CONFIG_ESP_MAC_IGNORE_MAC_CRC_ERROR is not set # end of MAC Config # @@ -758,7 +733,6 @@ CONFIG_ESP_SLEEP_GPIO_ENABLE_INTERNAL_RESISTORS=y # # RTC Clock Config # -CONFIG_RTC_CLOCK_BBPLL_POWER_ON_WITH_USB=y # end of RTC Clock Config # end of Hardware Settings @@ -778,7 +752,6 @@ CONFIG_ESP_IPC_ISR_ENABLE=y # LCD Peripheral Configuration # CONFIG_LCD_PANEL_IO_FORMAT_BUF_SIZE=32 -# CONFIG_LCD_RGB_ISR_IRAM_SAFE is not set # end of LCD Peripheral Configuration # end of LCD and Touch Panel @@ -799,7 +772,6 @@ CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE=y CONFIG_ESP_PHY_MAX_WIFI_TX_POWER=20 CONFIG_ESP_PHY_MAX_TX_POWER=20 # CONFIG_ESP_PHY_REDUCE_TX_POWER is not set -CONFIG_ESP_PHY_ENABLE_USB=y CONFIG_ESP_PHY_RF_CAL_PARTIAL=y # CONFIG_ESP_PHY_RF_CAL_NONE is not set # CONFIG_ESP_PHY_RF_CAL_FULL is not set @@ -810,8 +782,6 @@ CONFIG_ESP_PHY_CALIBRATION_MODE=0 # Power Management # # CONFIG_PM_ENABLE is not set -CONFIG_PM_POWER_DOWN_CPU_IN_LIGHT_SLEEP=y -CONFIG_PM_POWER_DOWN_TAGMEM_IN_LIGHT_SLEEP=y # end of Power Management # @@ -829,8 +799,6 @@ CONFIG_ESP_SYSTEM_PANIC_PRINT_REBOOT=y # CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set # CONFIG_ESP_SYSTEM_PANIC_GDBSTUB is not set # CONFIG_ESP_SYSTEM_GDBSTUB_RUNTIME is not set -CONFIG_ESP_SYSTEM_RTC_FAST_MEM_AS_HEAP_DEPCHECK=y -CONFIG_ESP_SYSTEM_ALLOW_RTC_FAST_MEM_AS_HEAP=y # # Memory protection @@ -846,12 +814,8 @@ CONFIG_ESP_MAIN_TASK_AFFINITY_CPU0=y CONFIG_ESP_MAIN_TASK_AFFINITY=0x0 CONFIG_ESP_MINIMAL_SHARED_STACK_SIZE=2048 CONFIG_ESP_CONSOLE_UART_DEFAULT=y -# CONFIG_ESP_CONSOLE_USB_CDC is not set -# CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG is not set # CONFIG_ESP_CONSOLE_UART_CUSTOM is not set # CONFIG_ESP_CONSOLE_NONE is not set -# CONFIG_ESP_CONSOLE_SECONDARY_NONE is not set -CONFIG_ESP_CONSOLE_SECONDARY_USB_SERIAL_JTAG=y CONFIG_ESP_CONSOLE_UART=y CONFIG_ESP_CONSOLE_MULTIPLE_UART=y CONFIG_ESP_CONSOLE_UART_NUM=0 @@ -866,7 +830,7 @@ CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0=y CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1=y # CONFIG_ESP_PANIC_HANDLER_IRAM is not set # CONFIG_ESP_DEBUG_STUBS_ENABLE is not set -CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_4=y +CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5=y # end of ESP System Settings # @@ -878,7 +842,8 @@ CONFIG_ESP_TIME_FUNCS_USE_ESP_TIMER=y CONFIG_ESP_TIMER_TASK_STACK_SIZE=3584 CONFIG_ESP_TIMER_INTERRUPT_LEVEL=1 # CONFIG_ESP_TIMER_SUPPORTS_ISR_DISPATCH_METHOD is not set -CONFIG_ESP_TIMER_IMPL_SYSTIMER=y +# CONFIG_ESP_TIMER_IMPL_FRC2 is not set +CONFIG_ESP_TIMER_IMPL_TG0_LAC=y # end of High resolution timer (esp_timer) # @@ -902,13 +867,11 @@ CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0=y # CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1 is not set CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752 CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32 -CONFIG_ESP32_WIFI_IRAM_OPT=y -CONFIG_ESP32_WIFI_RX_IRAM_OPT=y +# CONFIG_ESP32_WIFI_IRAM_OPT is not set +# CONFIG_ESP32_WIFI_RX_IRAM_OPT is not set CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE=y # CONFIG_ESP_WIFI_SLP_IRAM_OPT is not set -# CONFIG_ESP_WIFI_FTM_ENABLE is not set # CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE is not set -# CONFIG_ESP_WIFI_GCMP_SUPPORT is not set # CONFIG_ESP_WIFI_GMAC_SUPPORT is not set CONFIG_ESP_WIFI_SOFTAP_SUPPORT=y # CONFIG_ESP_WIFI_SLP_BEACON_LOST_OPT is not set @@ -994,10 +957,10 @@ CONFIG_FMB_EVENT_QUEUE_TIMEOUT=20 # # CONFIG_FREERTOS_UNICORE is not set CONFIG_FREERTOS_NO_AFFINITY=0x7FFFFFFF -CONFIG_FREERTOS_TICK_SUPPORT_SYSTIMER=y -CONFIG_FREERTOS_CORETIMER_SYSTIMER_LVL1=y -# CONFIG_FREERTOS_CORETIMER_SYSTIMER_LVL3 is not set -CONFIG_FREERTOS_SYSTICK_USES_SYSTIMER=y +CONFIG_FREERTOS_TICK_SUPPORT_CORETIMER=y +CONFIG_FREERTOS_CORETIMER_0=y +# CONFIG_FREERTOS_CORETIMER_1 is not set +CONFIG_FREERTOS_SYSTICK_USES_CCOUNT=y CONFIG_FREERTOS_HZ=1000 CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION=y # CONFIG_FREERTOS_CHECK_STACKOVERFLOW_NONE is not set @@ -1026,6 +989,7 @@ CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=y # CONFIG_FREERTOS_CHECK_PORT_CRITICAL_COMPLIANCE is not set # CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH is not set CONFIG_FREERTOS_DEBUG_OCDAWARE=y +# CONFIG_FREERTOS_FPU_IN_ISR is not set CONFIG_FREERTOS_ENABLE_TASK_SNAPSHOT=y # CONFIG_FREERTOS_PLACE_SNAPSHOT_FUNS_INTO_FLASH is not set # end of FreeRTOS @@ -1096,7 +1060,7 @@ CONFIG_LWIP_TCPIP_TASK_PRIO=18 # CONFIG_LWIP_CHECK_THREAD_SAFETY is not set CONFIG_LWIP_DNS_SUPPORT_MDNS_QUERIES=y # CONFIG_LWIP_L2_TO_L3_COPY is not set -CONFIG_LWIP_IRAM_OPTIMIZATION=y +# CONFIG_LWIP_IRAM_OPTIMIZATION is not set CONFIG_LWIP_TIMERS_ONDEMAND=y CONFIG_LWIP_MAX_SOCKETS=10 # CONFIG_LWIP_USE_ONLY_LWIP_SELECT is not set @@ -1241,7 +1205,7 @@ CONFIG_MBEDTLS_INTERNAL_MEM_ALLOC=y # CONFIG_MBEDTLS_DEFAULT_MEM_ALLOC is not set # CONFIG_MBEDTLS_CUSTOM_MEM_ALLOC is not set CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN=y -CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=16384 +CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=8192 CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=2048 CONFIG_MBEDTLS_DYNAMIC_BUFFER=y CONFIG_MBEDTLS_DYNAMIC_FREE_PEER_CERT=y @@ -1262,8 +1226,8 @@ CONFIG_MBEDTLS_ECDH_LEGACY_CONTEXT=y # Certificate Bundle # CONFIG_MBEDTLS_CERTIFICATE_BUNDLE=y -CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_FULL=y -# CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_CMN is not set +# CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_FULL is not set +CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_CMN=y # CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_NONE is not set # CONFIG_MBEDTLS_CUSTOM_CERTIFICATE_BUNDLE is not set CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_MAX_CERTS=200 @@ -1272,7 +1236,6 @@ CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_MAX_CERTS=200 CONFIG_MBEDTLS_ECP_RESTARTABLE=y CONFIG_MBEDTLS_CMAC_C=y CONFIG_MBEDTLS_HARDWARE_AES=y -CONFIG_MBEDTLS_AES_USE_INTERRUPT=y CONFIG_MBEDTLS_HARDWARE_MPI=y CONFIG_MBEDTLS_HARDWARE_SHA=y CONFIG_MBEDTLS_ROM_MD5=y @@ -1452,7 +1415,6 @@ CONFIG_PTHREAD_TASK_NAME_DEFAULT="pthread" # CONFIG_SPI_FLASH_VERIFY_WRITE is not set # CONFIG_SPI_FLASH_ENABLE_COUNTERS is not set CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=y -# CONFIG_SPI_FLASH_ROM_IMPL is not set CONFIG_SPI_FLASH_DANGEROUS_WRITE_ABORTS=y # CONFIG_SPI_FLASH_DANGEROUS_WRITE_FAILS is not set # CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED is not set @@ -1476,7 +1438,6 @@ CONFIG_SPI_FLASH_SUPPORT_GD_CHIP=y CONFIG_SPI_FLASH_SUPPORT_WINBOND_CHIP=y CONFIG_SPI_FLASH_SUPPORT_BOYA_CHIP=y CONFIG_SPI_FLASH_SUPPORT_TH_CHIP=y -CONFIG_SPI_FLASH_SUPPORT_MXIC_OPI_CHIP=y # end of Auto-detect flash chips CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE=y @@ -1530,12 +1491,6 @@ CONFIG_WS_BUFFER_SIZE=1024 # end of Websocket # end of TCP Transport -# -# TinyUSB Stack -# -# CONFIG_TINYUSB is not set -# end of TinyUSB Stack - # # Unity unit testing library # @@ -1548,24 +1503,10 @@ CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER=y # CONFIG_UNITY_ENABLE_BACKTRACE_ON_FAIL is not set # end of Unity unit testing library -# -# USB-OTG -# -CONFIG_USB_OTG_SUPPORTED=y -CONFIG_USB_HOST_CONTROL_TRANSFER_MAX_SIZE=256 -CONFIG_USB_HOST_HW_BUFFER_BIAS_BALANCED=y -# CONFIG_USB_HOST_HW_BUFFER_BIAS_IN is not set -# CONFIG_USB_HOST_HW_BUFFER_BIAS_PERIODIC_OUT is not set - # # Root Hub configuration # -CONFIG_USB_HOST_DEBOUNCE_DELAY_MS=250 -CONFIG_USB_HOST_RESET_HOLD_MS=30 -CONFIG_USB_HOST_RESET_RECOVERY_MS=30 -CONFIG_USB_HOST_SET_ADDR_RECOVERY_MS=10 # end of Root Hub configuration -# end of USB-OTG # # Virtual file system From 582907b91b4f172f8e810e9c0be2b2767f23d2ca Mon Sep 17 00:00:00 2001 From: NDJ-Ezlo Date: Wed, 3 Apr 2024 20:28:42 +0545 Subject: [PATCH 4/7] Edited names --- ezlopi-core/ezlopi-core-nvs/ezlopi_core_nvs.c | 2 +- .../ezlopi_service_led_indicator.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ezlopi-core/ezlopi-core-nvs/ezlopi_core_nvs.c b/ezlopi-core/ezlopi-core-nvs/ezlopi_core_nvs.c index 86dbd4c01..f3e35b9bd 100644 --- a/ezlopi-core/ezlopi-core-nvs/ezlopi_core_nvs.c +++ b/ezlopi-core/ezlopi-core-nvs/ezlopi_core_nvs.c @@ -847,7 +847,7 @@ uint8_t EZPI_CORE_nvs_read_frame_size(uint8_t* frame_size) if (0 == err) { ret = -1; - *frame_size = 3; + *frame_size = 8; } return ret; } diff --git a/ezlopi-services/ezlopi-service-led-indicator/ezlopi_service_led_indicator.c b/ezlopi-services/ezlopi-service-led-indicator/ezlopi_service_led_indicator.c index 6125d3440..4ef016fa0 100644 --- a/ezlopi-services/ezlopi-service-led-indicator/ezlopi_service_led_indicator.c +++ b/ezlopi-services/ezlopi-service-led-indicator/ezlopi_service_led_indicator.c @@ -25,7 +25,7 @@ #define INDICATOR_LED_FADE_TIME_MS 20 #define INDICATOR_LED_PIN 8 -#define RMT_TX_CHANNEL RMT_CHANNEL_1 +#define INDICATOR_RGB_RMT_TX_CHANNEL RMT_CHANNEL_1 static led_strip_t indicator_led; #endif // #ifdef CONFIG_EZPI_RGB_LED @@ -227,7 +227,7 @@ int ezlopi_service_led_indicator_init() indicator_led.gpio = INDICATOR_LED_PIN; indicator_led.buf = NULL; indicator_led.brightness = 255; - indicator_led.channel = RMT_TX_CHANNEL; + indicator_led.channel = INDICATOR_RGB_RMT_TX_CHANNEL; led_strip_install(); if (ESP_OK == led_strip_init(&indicator_led)) From cbed73e8daab41a7ab0e61eabad516c73b7e2839 Mon Sep 17 00:00:00 2001 From: NDJ-Ezlo Date: Thu, 4 Apr 2024 09:25:08 +0545 Subject: [PATCH 5/7] Adding ble mac service --- .../ezlopi-service-ble/CMakeLists.txt | 1 + .../ezlopi-service-ble/ezlopi_service_ble.h | 1 + .../ezlopi_service_ble_device_info.c | 38 +++++++++++++++---- 3 files changed, 33 insertions(+), 7 deletions(-) diff --git a/ezlopi-services/ezlopi-service-ble/CMakeLists.txt b/ezlopi-services/ezlopi-service-ble/CMakeLists.txt index 9f4d46915..2c4a8c116 100644 --- a/ezlopi-services/ezlopi-service-ble/CMakeLists.txt +++ b/ezlopi-services/ezlopi-service-ble/CMakeLists.txt @@ -5,6 +5,7 @@ set(EZLOPI_CORE_COMPONENTS ezlopi-core-devices ezlopi-core-ble ezlopi-core-reset + ezlopi-core-ping # ezlopi-user-config ) diff --git a/ezlopi-services/ezlopi-service-ble/ezlopi_service_ble.h b/ezlopi-services/ezlopi-service-ble/ezlopi_service_ble.h index ea5bde30b..d7098649a 100644 --- a/ezlopi-services/ezlopi-service-ble/ezlopi_service_ble.h +++ b/ezlopi-services/ezlopi-service-ble/ezlopi_service_ble.h @@ -30,6 +30,7 @@ #define BLE_DEVICE_INFO_SERVICE_UUID 0x00E4 #define BLE_DEVICE_INFO_CHAR_UUID 0xE401 #define BLE_DEVICE_STATUS_CHAR_NET_INFO_UUDI 0xE402 +#define BLE_DEVICE_INFO_MAC_CHAR_UUID 0xE403 #define BLE_DYNAMIC_CONFIG_HANDLE 4 #define BLE_DYNAMIC_CONFIG_SERVICE_UUID 0x00E5 diff --git a/ezlopi-services/ezlopi-service-ble/ezlopi_service_ble_device_info.c b/ezlopi-services/ezlopi-service-ble/ezlopi_service_ble_device_info.c index cdcb20dda..22511399b 100644 --- a/ezlopi-services/ezlopi-service-ble/ezlopi_service_ble_device_info.c +++ b/ezlopi-services/ezlopi-service-ble/ezlopi_service_ble_device_info.c @@ -25,16 +25,13 @@ #include "ezlopi_service_ble.h" -#define AND && -#define OR || - static s_gatt_service_t* g_device_info_service = NULL; -static s_gatt_char_t* g_device_status_notify_characteristics = NULL; static char* device_info_jsonify(void); static void __add_factory_info_to_root(cJSON* root, char* key, char* value); static void device_info_read_func(esp_gatt_value_t* value, esp_ble_gatts_cb_param_t* param); static void device_status_read_func(esp_gatt_value_t* value, esp_ble_gatts_cb_param_t* param); +static void device_mac_read_func(esp_gatt_value_t* value, esp_ble_gatts_cb_param_t* param); void ezlopi_ble_service_device_info_init(void) { @@ -58,7 +55,33 @@ void ezlopi_ble_service_device_info_init(void) uuid.len = ESP_UUID_LEN_16; permission = ESP_GATT_PERM_READ; properties = ESP_GATT_CHAR_PROP_BIT_NOTIFY | ESP_GATT_CHAR_PROP_BIT_READ; - g_device_status_notify_characteristics = ezlopi_ble_gatt_add_characteristic(g_device_info_service, &uuid, permission, properties, device_status_read_func, NULL, NULL); + ezlopi_ble_gatt_add_characteristic(g_device_info_service, &uuid, permission, properties, device_status_read_func, NULL, NULL); + + uuid.uuid.uuid16 = BLE_DEVICE_INFO_MAC_CHAR_UUID; + uuid.len = ESP_UUID_LEN_16; + permission = ESP_GATT_PERM_READ; + properties = ESP_GATT_CHAR_PROP_BIT_READ; + ezlopi_ble_gatt_add_characteristic(g_device_info_service, &uuid, permission, properties, device_mac_read_func, NULL, NULL); +} + +static void device_mac_read_func(esp_gatt_value_t* value, esp_ble_gatts_cb_param_t* param) +{ + if(value) + { + cJSON * cj_device_mac = cJSON_CreateObject(); + if(cj_device_mac) + { + char* device_mac = ezlopi_factory_info_v3_get_ezlopi_mac(); + } + else + { + TRACE_E("Couldn't allocate memory for device mac json"); + } + } + else + { + TRACE_E("Value is empty"); + } } static void device_status_read_func(esp_gatt_value_t* value, esp_ble_gatts_cb_param_t* param) @@ -69,12 +92,13 @@ static void device_status_read_func(esp_gatt_value_t* value, esp_ble_gatts_cb_pa if (cj_device_status) { e_ezlopi_event_t event = ezlopi_get_event_bit_status(); + e_ping_status_t ping_status = ezlopi_ping_get_internet_status(); cJSON_AddBoolToObject(cj_device_status, "wifi_connection_status", (event & EZLOPI_EVENT_WIFI_CONNECTED) == EZLOPI_EVENT_WIFI_CONNECTED); - cJSON_AddBoolToObject(cj_device_status, "internet_connection_status", (event & EZLOPI_EVENT_WIFI_CONNECTED) == EZLOPI_EVENT_WIFI_CONNECTED); + cJSON_AddBoolToObject(cj_device_status, "internet_connection_status", ping_status == EZLOPI_PING_STATUS_LIVE); cJSON_AddBoolToObject(cj_device_status, "cloud_connection_status", (event & EZLOPI_EVENT_NMA_REG) == EZLOPI_EVENT_NMA_REG); - cJSON_AddBoolToObject(cj_device_status, "provision_completion_status", (event & EZLOPI_EVENT_NMA_REG) == EZLOPI_EVENT_NMA_REG); + cJSON_AddBoolToObject(cj_device_status, "provision_completion_status", ezlopi_factory_info_v3_get_provisioning_status()); cJSON_AddTrueToObject(cj_device_status, "powered_on"); From ad2984f3c396bcf5e466483d0ea2dd7cd2f3e326 Mon Sep 17 00:00:00 2001 From: NDJ-Ezlo Date: Thu, 4 Apr 2024 14:46:44 +0545 Subject: [PATCH 6/7] Indicator LED tested --- .../ezlopi_core_factory_info.h | 9 -- .../ezlopi-core-timer/ezlopi_core_timer.c | 1 + .../ezlopi_core_websocket_client.c | 28 +++--- ezlopi-main/Kconfig.projbuild | 10 ++- .../device_0001_digitalOut_generic.c | 1 - .../ezlopi_service_ble_device_info.c | 87 ++++++++++++------- .../ezlopi_service_ble_provisioning.c | 1 - .../ezlopi_service_led_indicator.c | 4 + .../ezlopi-service-uart/ezlopi_service_uart.c | 1 - .../ezlopi_service_webprov.c | 2 +- sdkconfig.esp32c3.4mb | 2 +- 11 files changed, 83 insertions(+), 63 deletions(-) diff --git a/ezlopi-core/ezlopi-core-factory-info/ezlopi_core_factory_info.h b/ezlopi-core/ezlopi-core-factory-info/ezlopi_core_factory_info.h index 1f970a436..83bec9bee 100644 --- a/ezlopi-core/ezlopi-core-factory-info/ezlopi_core_factory_info.h +++ b/ezlopi-core/ezlopi-core-factory-info/ezlopi_core_factory_info.h @@ -174,15 +174,6 @@ extern "C" \"op_inv\": false,\ \"val_ip\": false,\ \"val_op\": false\ - },\ - {\ - \"dev_type\": 10,\ - \"dev_name\": \"GY61\",\ - \"id_room\": \"\",\ - \"id_item\": 28,\ - \"gpio1\": 33,\ - \"gpio2\": 34,\ - \"gpio3\": 35\ }\ ], \ \"dev_total\": 5}"; diff --git a/ezlopi-core/ezlopi-core-timer/ezlopi_core_timer.c b/ezlopi-core/ezlopi-core-timer/ezlopi_core_timer.c index 63b8c7010..522c97064 100644 --- a/ezlopi-core/ezlopi-core-timer/ezlopi_core_timer.c +++ b/ezlopi-core/ezlopi-core-timer/ezlopi_core_timer.c @@ -196,6 +196,7 @@ void ezlopi_timer_start_1000ms(void) #else void ezlopi_timer_start_1000ms(void) { + TRACE_D("initializing timer for 1000 ms interrupt..."); ezlopi_timer_init_timer_event(0, 1000, EZLOPI_ACTION_NOTIFY_1000_MS); } #endif diff --git a/ezlopi-core/ezlopi-core-websocket_client/ezlopi_core_websocket_client.c b/ezlopi-core/ezlopi-core-websocket_client/ezlopi_core_websocket_client.c index eba46aab2..c2689d608 100644 --- a/ezlopi-core/ezlopi-core-websocket_client/ezlopi_core_websocket_client.c +++ b/ezlopi-core/ezlopi-core-websocket_client/ezlopi_core_websocket_client.c @@ -17,26 +17,26 @@ #include "ezlopi_core_websocket_client.h" static esp_websocket_client_handle_t client = NULL; -static void (*__msg_upcall)(const char *, uint32_t) = NULL; +static void (*__msg_upcall)(const char*, uint32_t) = NULL; typedef struct s_ws_event_arg { esp_websocket_client_handle_t client; - void (*msg_upcall)(const char *, uint32_t); + void (*msg_upcall)(const char*, uint32_t); void (*connection_upcall)(bool connected); } s_ws_event_arg_t; typedef struct s_ws_data_buffer { - char *buffer; + char* buffer; uint32_t len; uint32_t tot_len; - struct s_ws_data_buffer *next; + struct s_ws_data_buffer* next; } s_ws_data_buffer_t; -static void websocket_event_handler(void *handler_args, esp_event_base_t base, int32_t event_id, void *event_data); +static void websocket_event_handler(void* handler_args, esp_event_base_t base, int32_t event_id, void* event_data); -int ezlopi_websocket_client_send(char *data, uint32_t len) +int ezlopi_websocket_client_send(char* data, uint32_t len) { int ret = 0; @@ -65,14 +65,14 @@ void ezlopi_websocket_client_kill(void) client = NULL; } -esp_websocket_client_handle_t ezlopi_websocket_client_init(cJSON *uri, void (*msg_upcall)(const char *, uint32_t), void (*connection_upcall)(bool connected)) +esp_websocket_client_handle_t ezlopi_websocket_client_init(cJSON* uri, void (*msg_upcall)(const char*, uint32_t), void (*connection_upcall)(bool connected)) { if ((NULL == client) && (NULL != uri) && (NULL != uri->valuestring) && (NULL != msg_upcall)) { - char *ca_cert = ezlopi_factory_info_v3_get_ca_certificate(); - char *ssl_shared = ezlopi_factory_info_v3_get_ssl_shared_key(); - char *ssl_priv = ezlopi_factory_info_v3_get_ssl_private_key(); + char* ca_cert = ezlopi_factory_info_v3_get_ca_certificate(); + char* ssl_shared = ezlopi_factory_info_v3_get_ssl_shared_key(); + char* ssl_priv = ezlopi_factory_info_v3_get_ssl_private_key(); __msg_upcall = msg_upcall; static s_ws_event_arg_t event_arg; @@ -97,7 +97,7 @@ esp_websocket_client_handle_t ezlopi_websocket_client_init(cJSON *uri, void (*ms client = esp_websocket_client_init(&websocket_cfg); if (client) { - esp_websocket_register_events(client, WEBSOCKET_EVENT_ANY, websocket_event_handler, (void *)&event_arg); + esp_websocket_register_events(client, WEBSOCKET_EVENT_ANY, websocket_event_handler, (void*)&event_arg); esp_websocket_client_start(client); } else @@ -115,10 +115,10 @@ esp_websocket_client_handle_t ezlopi_websocket_client_init(cJSON *uri, void (*ms return client; } -static void websocket_event_handler(void *handler_args, esp_event_base_t base, int32_t event_id, void *event_data) +static void websocket_event_handler(void* handler_args, esp_event_base_t base, int32_t event_id, void* event_data) { - s_ws_event_arg_t *event_arg = (s_ws_event_arg_t *)handler_args; - esp_websocket_event_data_t *data = (esp_websocket_event_data_t *)event_data; + s_ws_event_arg_t* event_arg = (s_ws_event_arg_t*)handler_args; + esp_websocket_event_data_t* data = (esp_websocket_event_data_t*)event_data; switch (event_id) { case WEBSOCKET_EVENT_CONNECTED: diff --git a/ezlopi-main/Kconfig.projbuild b/ezlopi-main/Kconfig.projbuild index b7fb78b6f..7f7fac558 100644 --- a/ezlopi-main/Kconfig.projbuild +++ b/ezlopi-main/Kconfig.projbuild @@ -102,12 +102,14 @@ menu "EzloPi User Config" endmenu choice - prompt "Select the indicator LED available in the device" - default EZPI_ON_OFF_LED + prompt "Select the indicator LED available in the device (current target $(IDF_TARGET))" + depends on IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32 config EZPI_ON_OFF_LED - bool "Buildin LED for ESP32 dev board" + bool "Onboard LED" + depends on IDF_TARGET_ESP32 config EZPI_RGB_LED - bool "Builtin addressable RGB LED for ESP32S3 and ESP32C3" + bool "Onboard addressable LED" + depends on IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C3 endchoice endmenu diff --git a/ezlopi-sensors-devices/device-0001-digitalOut-generic/device_0001_digitalOut_generic.c b/ezlopi-sensors-devices/device-0001-digitalOut-generic/device_0001_digitalOut_generic.c index 6e3290914..3df7d028d 100644 --- a/ezlopi-sensors-devices/device-0001-digitalOut-generic/device_0001_digitalOut_generic.c +++ b/ezlopi-sensors-devices/device-0001-digitalOut-generic/device_0001_digitalOut_generic.c @@ -43,7 +43,6 @@ uint32_t settings_ids[2]; int device_0001_digitalOut_generic(e_ezlopi_actions_t action, l_ezlopi_item_t* item, void* arg, void* user_arg) { int ret = 0; - switch (action) { case EZLOPI_ACTION_PREPARE: diff --git a/ezlopi-services/ezlopi-service-ble/ezlopi_service_ble_device_info.c b/ezlopi-services/ezlopi-service-ble/ezlopi_service_ble_device_info.c index dabe61e64..b6cf85d5e 100644 --- a/ezlopi-services/ezlopi-service-ble/ezlopi_service_ble_device_info.c +++ b/ezlopi-services/ezlopi-service-ble/ezlopi_service_ble_device_info.c @@ -64,21 +64,70 @@ void ezlopi_ble_service_device_info_init(void) ezlopi_ble_gatt_add_characteristic(g_device_info_service, &uuid, permission, properties, device_mac_read_func, NULL, NULL); } +static void ble_device_info_send_data(const cJSON* cj_response_data, esp_gatt_value_t* value, esp_ble_gatts_cb_param_t* param) +{ + char* send_data = cJSON_Print(cj_response_data); + if (send_data) + { + cJSON_Minify(send_data); + + uint32_t total_data_len = strlen(send_data); + uint32_t max_data_buffer_size = ezlopi_ble_gatt_get_max_data_size(); + uint32_t copy_size = ((total_data_len - param->read.offset) < max_data_buffer_size) ? (total_data_len - param->read.offset) : max_data_buffer_size; + + if ((0 != total_data_len) && (total_data_len > param->read.offset)) + { + strncpy((char*)value->value, send_data + param->read.offset, copy_size); + value->len = copy_size; + } + if ((param->read.offset + copy_size) >= total_data_len) + { + free(send_data); + send_data = NULL; + } + } + else + { + TRACE_E("No data to send"); + value->len = 1; + value->value[0] = 0; // Read 0 if the device not provisioned yet. + } +} + static void device_mac_read_func(esp_gatt_value_t* value, esp_ble_gatts_cb_param_t* param) { - if(value) + if (value) { - cJSON * cj_device_mac = cJSON_CreateObject(); - if(cj_device_mac) + cJSON* cj_device_mac = cJSON_CreateObject(); + if (cj_device_mac) { char* device_mac = ezlopi_factory_info_v3_get_ezlopi_mac(); + cJSON_AddStringToObject(cj_device_mac, "ezlopi_mac", device_mac ? device_mac : "unknown"); + + uint8_t mac[6]; + ezlopi_wifi_get_wifi_mac(mac); + char mac_str[20]; + memset(mac_str, 0, sizeof(mac_str)); + snprintf(mac_str, 20, "%02X:%02X:%02X:%02X:%02X:%02X", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); + cJSON_AddStringToObject(cj_device_mac, "wifi_mac", mac_str); + + memset(mac, 0, sizeof(mac)); + ezlopi_ble_service_get_ble_mac(mac); + memset(mac_str, 0, sizeof(mac_str)); + snprintf(mac_str, 20, "%02X:%02X:%02X:%02X:%02X:%02X", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); + cJSON_AddStringToObject(cj_device_mac, "ble_mac", mac_str); + + ble_device_info_send_data(cj_device_mac, value, param); + + cJSON_Delete(cj_device_mac); + free(device_mac); } - else + else { TRACE_E("Couldn't allocate memory for device mac json"); } } - else + else { TRACE_E("Value is empty"); } @@ -102,32 +151,8 @@ static void device_status_read_func(esp_gatt_value_t* value, esp_ble_gatts_cb_pa cJSON_AddTrueToObject(cj_device_status, "powered_on"); - char* send_data = cJSON_Print(cj_device_status); - if (send_data) - { - cJSON_Minify(send_data); - - uint32_t total_data_len = strlen(send_data); - uint32_t max_data_buffer_size = ezlopi_ble_gatt_get_max_data_size(); - uint32_t copy_size = ((total_data_len - param->read.offset) < max_data_buffer_size) ? (total_data_len - param->read.offset) : max_data_buffer_size; - - if ((0 != total_data_len) && (total_data_len > param->read.offset)) - { - strncpy((char*)value->value, send_data + param->read.offset, copy_size); - value->len = copy_size; - } - if ((param->read.offset + copy_size) >= total_data_len) - { - free(send_data); - send_data = NULL; - } - } - else - { - TRACE_E("No data to send"); - value->len = 1; - value->value[0] = 0; // Read 0 if the device not provisioned yet. - } + ble_device_info_send_data(cj_device_status, value, param); + cJSON_Delete(cj_device_status); } else diff --git a/ezlopi-services/ezlopi-service-ble/ezlopi_service_ble_provisioning.c b/ezlopi-services/ezlopi-service-ble/ezlopi_service_ble_provisioning.c index c352b8705..83ab06adb 100644 --- a/ezlopi-services/ezlopi-service-ble/ezlopi_service_ble_provisioning.c +++ b/ezlopi-services/ezlopi-service-ble/ezlopi_service_ble_provisioning.c @@ -62,7 +62,6 @@ void ezlopi_ble_service_provisioning_init(void) ezlopi_ble_gatt_add_characteristic(g_provisioning_service, &uuid, permission, properties, __provisioning_status_read_func, NULL, NULL); } -#if 1 static char* __provisioning_status_jsonify(void) { char *prov_status_jstr = NULL; diff --git a/ezlopi-services/ezlopi-service-led-indicator/ezlopi_service_led_indicator.c b/ezlopi-services/ezlopi-service-led-indicator/ezlopi_service_led_indicator.c index 4ef016fa0..19c6b54c7 100644 --- a/ezlopi-services/ezlopi-service-led-indicator/ezlopi_service_led_indicator.c +++ b/ezlopi-services/ezlopi-service-led-indicator/ezlopi_service_led_indicator.c @@ -24,7 +24,11 @@ #define INDICATOR_LED_FADE_TIME_MS 20 +#ifdef CONFIG_IDF_TARGET_ESP32S3 +#define INDICATOR_LED_PIN 48 +#elif CONFIG_IDF_TARGET_ESP32C3 #define INDICATOR_LED_PIN 8 +#endif #define INDICATOR_RGB_RMT_TX_CHANNEL RMT_CHANNEL_1 static led_strip_t indicator_led; diff --git a/ezlopi-services/ezlopi-service-uart/ezlopi_service_uart.c b/ezlopi-services/ezlopi-service-uart/ezlopi_service_uart.c index 98b5385ee..1469450eb 100644 --- a/ezlopi-services/ezlopi-service-uart/ezlopi_service_uart.c +++ b/ezlopi-services/ezlopi-service-uart/ezlopi_service_uart.c @@ -646,7 +646,6 @@ static void ezlopi_service_uart_get_info() char* serial_data_json_string = cJSON_Print(cj_get_info); if (serial_data_json_string) { - TRACE_E("%s", serial_data_json_string); cJSON_Minify(serial_data_json_string); EZPI_SERVICE_uart_tx_data(strlen(serial_data_json_string), (uint8_t*)serial_data_json_string); free(serial_data_json_string); diff --git a/ezlopi-services/ezlopi-service-webprov/ezlopi_service_webprov.c b/ezlopi-services/ezlopi-service-webprov/ezlopi_service_webprov.c index c841fd9cb..a355a0ad7 100644 --- a/ezlopi-services/ezlopi-service-webprov/ezlopi_service_webprov.c +++ b/ezlopi-services/ezlopi-service-webprov/ezlopi_service_webprov.c @@ -161,7 +161,7 @@ static void __message_upcall(const char *payload, uint32_t len) } else { - TRACE_W("no response!"); + TRACE_W("no response!"); } } diff --git a/sdkconfig.esp32c3.4mb b/sdkconfig.esp32c3.4mb index e2343561a..5bfa2f0a2 100644 --- a/sdkconfig.esp32c3.4mb +++ b/sdkconfig.esp32c3.4mb @@ -949,7 +949,7 @@ CONFIG_FREERTOS_CORETIMER_SYSTIMER_LVL1=y # CONFIG_FREERTOS_CORETIMER_SYSTIMER_LVL3 is not set CONFIG_FREERTOS_SYSTICK_USES_SYSTIMER=y CONFIG_FREERTOS_OPTIMIZED_SCHEDULER=y -CONFIG_FREERTOS_HZ=100 +CONFIG_FREERTOS_HZ=1000 CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION=y # CONFIG_FREERTOS_CHECK_STACKOVERFLOW_NONE is not set # CONFIG_FREERTOS_CHECK_STACKOVERFLOW_PTRVAL is not set From 5fa7c9e50333f9d2063f8d27035d96452e278bbf Mon Sep 17 00:00:00 2001 From: NDJ-Ezlo Date: Thu, 4 Apr 2024 14:49:20 +0545 Subject: [PATCH 7/7] Deleted heartbead led function --- ezlopi-main/ezlopi_main.c | 47 --------------------------------------- 1 file changed, 47 deletions(-) diff --git a/ezlopi-main/ezlopi_main.c b/ezlopi-main/ezlopi_main.c index 018c85635..f05d03e64 100644 --- a/ezlopi-main/ezlopi_main.c +++ b/ezlopi-main/ezlopi_main.c @@ -30,28 +30,8 @@ #include "pt.h" -#define ENABLE_HEARTBIT_LED 1 - static void __blinky(void* pv); -static void __init_heartbeat_led(void); -static void __toggle_heartbeat_led(void); - -static struct pt pt1; -PT_THREAD(example(struct pt* pt)) -{ - static uint32_t curr_ticks; - PT_BEGIN(pt); - - while (1) - { - curr_ticks = xTaskGetTickCount(); - PT_WAIT_UNTIL(pt, (xTaskGetTickCount() - curr_ticks) > 1000); - __toggle_heartbeat_led(); - } - - PT_END(pt); -} void app_main(void) { @@ -85,36 +65,10 @@ void app_main(void) xTaskCreate(__blinky, "__blinky", 2 * 2048, NULL, 0, NULL); } -static void __init_heartbeat_led(void) -{ -#if (1 == ENABLE_HEARTBIT_LED) - gpio_config_t io_conf = { - .pin_bit_mask = (1ULL << GPIO_NUM_2), - .mode = GPIO_MODE_OUTPUT, - .pull_up_en = GPIO_PULLUP_DISABLE, - .pull_down_en = GPIO_PULLDOWN_DISABLE, - .intr_type = GPIO_INTR_DISABLE, - }; - - gpio_config(&io_conf); -#endif -} - -static void __toggle_heartbeat_led(void) -{ -#if (1 == ENABLE_HEARTBIT_LED) - static uint32_t state = 0; - - state ^= 1; - gpio_set_level(GPIO_NUM_2, state); -#endif -} static void __blinky(void* pv) { - // __init_heartbeat_led(); - // PT_INIT(&pt1); uint32_t count = 0; while (1) @@ -130,6 +84,5 @@ static void __blinky(void* pv) } vTaskDelay(5 / portTICK_PERIOD_MS); - // example(&pt1); } }