diff --git a/apps/gateway/sdkconfig b/apps/gateway/sdkconfig index 1467d43..3185a61 100644 --- a/apps/gateway/sdkconfig +++ b/apps/gateway/sdkconfig @@ -794,12 +794,12 @@ CONFIG_BT_CONTROLLER_ENABLED=y # # General # -CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_INTERNAL=y -# CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_EXTERNAL is not set +# CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_INTERNAL is not set +CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_EXTERNAL=y # CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_DEFAULT is not set -CONFIG_BT_NIMBLE_PINNED_TO_CORE=0 -CONFIG_BT_NIMBLE_PINNED_TO_CORE_0=y -# CONFIG_BT_NIMBLE_PINNED_TO_CORE_1 is not set +CONFIG_BT_NIMBLE_PINNED_TO_CORE=1 +# CONFIG_BT_NIMBLE_PINNED_TO_CORE_0 is not set +CONFIG_BT_NIMBLE_PINNED_TO_CORE_1=y CONFIG_BT_NIMBLE_HOST_TASK_STACK_SIZE=4096 CONFIG_BT_NIMBLE_LEGACY_VHCI_ENABLE=y # end of General @@ -841,7 +841,7 @@ CONFIG_BT_NIMBLE_MAX_CONN_REATTEMPT=3 CONFIG_BT_NIMBLE_HS_PVCY=y # CONFIG_BT_NIMBLE_HOST_ALLOW_CONNECT_WITH_SCAN is not set # CONFIG_BT_NIMBLE_HOST_QUEUE_CONG_CHECK is not set -CONFIG_BT_NIMBLE_MAX_CONNECTIONS=3 +CONFIG_BT_NIMBLE_MAX_CONNECTIONS=4 CONFIG_BT_NIMBLE_MAX_CCCDS=8 CONFIG_BT_NIMBLE_CRYPTO_STACK_MBEDTLS=y CONFIG_BT_NIMBLE_HS_STOP_TIMEOUT_MS=2000 @@ -1004,10 +1004,10 @@ CONFIG_BT_NIMBLE_HCI_UART_CTS_PIN=23 # CONFIG_BT_NIMBLE_MEM_DEBUG is not set # CONFIG_BT_NIMBLE_LOG_LEVEL_NONE is not set # CONFIG_BT_NIMBLE_LOG_LEVEL_ERROR is not set -# CONFIG_BT_NIMBLE_LOG_LEVEL_WARNING is not set -CONFIG_BT_NIMBLE_LOG_LEVEL_INFO=y +CONFIG_BT_NIMBLE_LOG_LEVEL_WARNING=y +# CONFIG_BT_NIMBLE_LOG_LEVEL_INFO is not set # CONFIG_BT_NIMBLE_LOG_LEVEL_DEBUG is not set -CONFIG_BT_NIMBLE_LOG_LEVEL=1 +CONFIG_BT_NIMBLE_LOG_LEVEL=2 CONFIG_BT_NIMBLE_PRINT_ERR_NAME=y # CONFIG_BT_NIMBLE_DEBUG is not set # CONFIG_BT_NIMBLE_TEST_THROUGHPUT_TEST is not set @@ -1036,9 +1036,9 @@ CONFIG_BT_CTRL_MODE_EFF=1 CONFIG_BT_CTRL_BLE_MAX_ACT=6 CONFIG_BT_CTRL_BLE_MAX_ACT_EFF=6 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_PINNED_TO_CORE_0 is not set +CONFIG_BT_CTRL_PINNED_TO_CORE_1=y +CONFIG_BT_CTRL_PINNED_TO_CORE=1 CONFIG_BT_CTRL_HCI_MODE_VHCI=y # CONFIG_BT_CTRL_HCI_MODE_UART_H4 is not set CONFIG_BT_CTRL_HCI_TL=1 @@ -1133,8 +1133,8 @@ CONFIG_BT_CTRL_BLE_ADV=y # Common Options # CONFIG_BT_ALARM_MAX_NUM=50 -CONFIG_BT_SMP_CRYPTO_STACK_TINYCRYPT=y -# CONFIG_BT_SMP_CRYPTO_STACK_MBEDTLS is not set +# CONFIG_BT_SMP_CRYPTO_STACK_TINYCRYPT is not set +CONFIG_BT_SMP_CRYPTO_STACK_MBEDTLS=y # # BLE Log @@ -1301,15 +1301,15 @@ CONFIG_ESP_ERR_TO_NAME_LOOKUP=y # # ESP-Driver:GPIO Configurations # -# CONFIG_GPIO_CTRL_FUNC_IN_IRAM is not set +CONFIG_GPIO_CTRL_FUNC_IN_IRAM=y # end of ESP-Driver:GPIO Configurations # # ESP-Driver:GPTimer Configurations # CONFIG_GPTIMER_ISR_HANDLER_IN_IRAM=y -# CONFIG_GPTIMER_CTRL_FUNC_IN_IRAM is not set -# CONFIG_GPTIMER_ISR_CACHE_SAFE is not set +CONFIG_GPTIMER_CTRL_FUNC_IN_IRAM=y +CONFIG_GPTIMER_ISR_CACHE_SAFE=y CONFIG_GPTIMER_OBJ_CACHE_SAFE=y # CONFIG_GPTIMER_ENABLE_DEBUG_LOG is not set # end of ESP-Driver:GPTimer Configurations @@ -1745,9 +1745,9 @@ CONFIG_ESP_ROM_PRINT_IN_IRAM=y # ESP System Settings # # CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_80 is not set -CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_160=y -# CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240 is not set -CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=160 +# CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_160 is not set +CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y +CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=240 # # Cache config @@ -1793,7 +1793,7 @@ CONFIG_ESP_SYSTEM_IN_IRAM=y 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_PANIC_REBOOT_DELAY_SECONDS=0 +CONFIG_ESP_SYSTEM_PANIC_REBOOT_DELAY_SECONDS=2 CONFIG_ESP_SYSTEM_RTC_FAST_MEM_AS_HEAP_DEPCHECK=y CONFIG_ESP_SYSTEM_ALLOW_RTC_FAST_MEM_AS_HEAP=y @@ -1873,9 +1873,9 @@ CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=32 CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER=y CONFIG_ESP_WIFI_TX_BUFFER_TYPE=1 CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=32 -CONFIG_ESP_WIFI_STATIC_RX_MGMT_BUFFER=y -# CONFIG_ESP_WIFI_DYNAMIC_RX_MGMT_BUFFER is not set -CONFIG_ESP_WIFI_DYNAMIC_RX_MGMT_BUF=0 +# CONFIG_ESP_WIFI_STATIC_RX_MGMT_BUFFER is not set +CONFIG_ESP_WIFI_DYNAMIC_RX_MGMT_BUFFER=y +CONFIG_ESP_WIFI_DYNAMIC_RX_MGMT_BUF=1 CONFIG_ESP_WIFI_RX_MGMT_BUF_NUM_DEF=5 # CONFIG_ESP_WIFI_CSI_ENABLED is not set CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y @@ -1883,8 +1883,8 @@ CONFIG_ESP_WIFI_TX_BA_WIN=6 CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y CONFIG_ESP_WIFI_RX_BA_WIN=6 CONFIG_ESP_WIFI_NVS_ENABLED=y -CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_0=y -# CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_1 is not set +# CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_0 is not set +CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_1=y CONFIG_ESP_WIFI_SOFTAP_BEACON_MAX_LEN=752 CONFIG_ESP_WIFI_MGMT_SBUF_NUM=32 CONFIG_ESP_WIFI_IRAM_OPT=y @@ -2001,12 +2001,12 @@ CONFIG_FATFS_DONT_TRUST_LAST_ALLOC=0 # # CONFIG_FREERTOS_SMP is not set # CONFIG_FREERTOS_UNICORE is not set -CONFIG_FREERTOS_HZ=100 +CONFIG_FREERTOS_HZ=1000 # CONFIG_FREERTOS_CHECK_STACKOVERFLOW_NONE is not set # CONFIG_FREERTOS_CHECK_STACKOVERFLOW_PTRVAL is not set CONFIG_FREERTOS_CHECK_STACKOVERFLOW_CANARY=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=1 -CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1536 +CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2048 # CONFIG_FREERTOS_USE_IDLE_HOOK is not set # CONFIG_FREERTOS_USE_TICK_HOOK is not set CONFIG_FREERTOS_MAX_TASK_NAME_LEN=16 @@ -2771,25 +2771,25 @@ CONFIG_WIFI_PROV_STA_ALL_CHANNEL_SCAN=y # CONFIG_DALI_PHY_COUNT=16 CONFIG_DALI_DEFAULT_BAUDRATE=1200 -CONFIG_DALI_TIMER_RESOLUTION_HZ=3000000 +CONFIG_DALI_TIMER_RESOLUTION_HZ=3636363 CONFIG_DALI_CUSTOM_HALF_BIT_TIME_X100_US=0 CONFIG_DALI_TX_STOP_CONDITION_US=0 CONFIG_DALI_RX_STOP_CONDITION_US=0 CONFIG_DALI_QUERY_RESPONSE_TIMEOUT_MS=20 -CONFIG_DALI_DOUBLE_SEND_DELAY_MS=12 -CONFIG_DALI_FORWARD_ACTIVITY_WAIT_MS=25 +CONFIG_DALI_DOUBLE_SEND_DELAY_MS=15 +CONFIG_DALI_FORWARD_ACTIVITY_WAIT_MS=20 CONFIG_DALI_FORWARD_AFTER_BACKWARD_WAIT_MS=5 CONFIG_DALI_FORWARD_MAX_WAIT_MS=50 -CONFIG_DALI_BACKWARD_IDLE_TIMEOUT_MS=9 +CONFIG_DALI_BACKWARD_IDLE_TIMEOUT_MS=10 CONFIG_DALI_BUS_POWER_CHECK_INTERVAL_MS=500 CONFIG_DALI_BUS_ABNORMAL_REPORT_INTERVAL_MS=3000 # CONFIG_DALI_LOG_LEVEL_NONE is not set # CONFIG_DALI_LOG_LEVEL_ERROR is not set # CONFIG_DALI_LOG_LEVEL_WARN is not set # CONFIG_DALI_LOG_LEVEL_INFO is not set -# CONFIG_DALI_LOG_LEVEL_DEBUG is not set -CONFIG_DALI_LOG_LEVEL_VERBOSE=y -CONFIG_DALI_LOG_LEVEL=5 +CONFIG_DALI_LOG_LEVEL_DEBUG=y +# CONFIG_DALI_LOG_LEVEL_VERBOSE is not set +CONFIG_DALI_LOG_LEVEL=4 CONFIG_DALI_TX_ACTIVE_LOW=y # CONFIG_DALI_TX_ACTIVE_HIGH is not set CONFIG_DALI_RX_ACTIVE_LOW=y @@ -2822,10 +2822,12 @@ CONFIG_MQTT_TRANSPORT_SSL=y CONFIG_MQTT_TRANSPORT_WEBSOCKET=y CONFIG_MQTT_TRANSPORT_WEBSOCKET_SECURE=y # CONFIG_MQTT_MSG_ID_INCREMENTAL is not set -# CONFIG_MQTT_SKIP_PUBLISH_IF_DISCONNECTED is not set +CONFIG_MQTT_SKIP_PUBLISH_IF_DISCONNECTED=y # CONFIG_MQTT_REPORT_DELETED_MESSAGES is not set # CONFIG_MQTT_USE_CUSTOM_CONFIG is not set -# CONFIG_MQTT_TASK_CORE_SELECTION_ENABLED is not set +CONFIG_MQTT_TASK_CORE_SELECTION_ENABLED=y +# CONFIG_MQTT_USE_CORE_0 is not set +CONFIG_MQTT_USE_CORE_1=y # CONFIG_MQTT_CUSTOM_OUTBOX is not set # end of ESP-MQTT Configurations # end of Component config @@ -2869,12 +2871,12 @@ CONFIG_ESP32_APPTRACE_DEST_NONE=y CONFIG_ESP32_APPTRACE_LOCK_ENABLE=y # CONFIG_BLUEDROID_ENABLED is not set CONFIG_NIMBLE_ENABLED=y -CONFIG_NIMBLE_MEM_ALLOC_MODE_INTERNAL=y -# CONFIG_NIMBLE_MEM_ALLOC_MODE_EXTERNAL is not set +# CONFIG_NIMBLE_MEM_ALLOC_MODE_INTERNAL is not set +CONFIG_NIMBLE_MEM_ALLOC_MODE_EXTERNAL=y # CONFIG_NIMBLE_MEM_ALLOC_MODE_DEFAULT is not set -CONFIG_NIMBLE_PINNED_TO_CORE=0 -CONFIG_NIMBLE_PINNED_TO_CORE_0=y -# CONFIG_NIMBLE_PINNED_TO_CORE_1 is not set +CONFIG_NIMBLE_PINNED_TO_CORE=1 +# CONFIG_NIMBLE_PINNED_TO_CORE_0 is not set +CONFIG_NIMBLE_PINNED_TO_CORE_1=y CONFIG_NIMBLE_TASK_STACK_SIZE=4096 CONFIG_BT_NIMBLE_TASK_STACK_SIZE=4096 CONFIG_NIMBLE_ROLE_CENTRAL=y @@ -2888,7 +2890,7 @@ CONFIG_BT_NIMBLE_SM_SC_LVL=0 # CONFIG_NIMBLE_NVS_PERSIST is not set CONFIG_NIMBLE_MAX_BONDS=3 CONFIG_NIMBLE_RPA_TIMEOUT=900 -CONFIG_NIMBLE_MAX_CONNECTIONS=3 +CONFIG_NIMBLE_MAX_CONNECTIONS=4 CONFIG_NIMBLE_MAX_CCCDS=8 CONFIG_NIMBLE_CRYPTO_STACK_MBEDTLS=y # CONFIG_NIMBLE_HS_FLOW_CTRL is not set @@ -2911,7 +2913,7 @@ CONFIG_SW_COEXIST_ENABLE=y CONFIG_ESP32_WIFI_SW_COEXIST_ENABLE=y CONFIG_ESP_WIFI_SW_COEXIST_ENABLE=y # CONFIG_CAM_CTLR_DVP_CAM_ISR_IRAM_SAFE is not set -# CONFIG_GPTIMER_ISR_IRAM_SAFE is not set +CONFIG_GPTIMER_ISR_IRAM_SAFE=y # CONFIG_MCPWM_ISR_IRAM_SAFE is not set # CONFIG_EVENT_LOOP_PROFILING is not set CONFIG_POST_EVENTS_FROM_ISR=y @@ -2958,9 +2960,9 @@ CONFIG_ESP32S3_SPIRAM_SUPPORT=y CONFIG_DEFAULT_PSRAM_CLK_IO=30 CONFIG_DEFAULT_PSRAM_CS_IO=26 # CONFIG_ESP32S3_DEFAULT_CPU_FREQ_80 is not set -CONFIG_ESP32S3_DEFAULT_CPU_FREQ_160=y -# CONFIG_ESP32S3_DEFAULT_CPU_FREQ_240 is not set -CONFIG_ESP32S3_DEFAULT_CPU_FREQ_MHZ=160 +# CONFIG_ESP32S3_DEFAULT_CPU_FREQ_160 is not set +CONFIG_ESP32S3_DEFAULT_CPU_FREQ_240=y +CONFIG_ESP32S3_DEFAULT_CPU_FREQ_MHZ=240 CONFIG_SYSTEM_EVENT_QUEUE_SIZE=32 CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=2304 CONFIG_MAIN_TASK_STACK_SIZE=8192 @@ -2995,8 +2997,8 @@ CONFIG_ESP32_WIFI_TX_BA_WIN=6 CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y CONFIG_ESP32_WIFI_RX_BA_WIN=6 CONFIG_ESP32_WIFI_NVS_ENABLED=y -CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0=y -# CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1 is not set +# CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0 is not set +CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1=y CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752 CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32 CONFIG_ESP32_WIFI_IRAM_OPT=y diff --git a/apps/gateway/sdkconfig.old b/apps/gateway/sdkconfig.old index 4309966..53024d5 100644 --- a/apps/gateway/sdkconfig.old +++ b/apps/gateway/sdkconfig.old @@ -1,7 +1,3 @@ -# -# Automatically generated file. DO NOT EDIT. -# Espressif IoT Development Framework (ESP-IDF) 5.5.4 Project Configuration -# CONFIG_SOC_ADC_SUPPORTED=y CONFIG_SOC_UART_SUPPORTED=y CONFIG_SOC_PCNT_SUPPORTED=y @@ -794,12 +790,12 @@ CONFIG_BT_CONTROLLER_ENABLED=y # # General # -CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_INTERNAL=y -# CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_EXTERNAL is not set +# CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_INTERNAL is not set +CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_EXTERNAL=y # CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_DEFAULT is not set -CONFIG_BT_NIMBLE_PINNED_TO_CORE=0 -CONFIG_BT_NIMBLE_PINNED_TO_CORE_0=y -# CONFIG_BT_NIMBLE_PINNED_TO_CORE_1 is not set +CONFIG_BT_NIMBLE_PINNED_TO_CORE=1 +# CONFIG_BT_NIMBLE_PINNED_TO_CORE_0 is not set +CONFIG_BT_NIMBLE_PINNED_TO_CORE_1=y CONFIG_BT_NIMBLE_HOST_TASK_STACK_SIZE=4096 CONFIG_BT_NIMBLE_LEGACY_VHCI_ENABLE=y # end of General @@ -841,7 +837,7 @@ CONFIG_BT_NIMBLE_MAX_CONN_REATTEMPT=3 CONFIG_BT_NIMBLE_HS_PVCY=y # CONFIG_BT_NIMBLE_HOST_ALLOW_CONNECT_WITH_SCAN is not set # CONFIG_BT_NIMBLE_HOST_QUEUE_CONG_CHECK is not set -CONFIG_BT_NIMBLE_MAX_CONNECTIONS=3 +CONFIG_BT_NIMBLE_MAX_CONNECTIONS=4 CONFIG_BT_NIMBLE_MAX_CCCDS=8 CONFIG_BT_NIMBLE_CRYPTO_STACK_MBEDTLS=y CONFIG_BT_NIMBLE_HS_STOP_TIMEOUT_MS=2000 @@ -1004,10 +1000,10 @@ CONFIG_BT_NIMBLE_HCI_UART_CTS_PIN=23 # CONFIG_BT_NIMBLE_MEM_DEBUG is not set # CONFIG_BT_NIMBLE_LOG_LEVEL_NONE is not set # CONFIG_BT_NIMBLE_LOG_LEVEL_ERROR is not set -# CONFIG_BT_NIMBLE_LOG_LEVEL_WARNING is not set -CONFIG_BT_NIMBLE_LOG_LEVEL_INFO=y +CONFIG_BT_NIMBLE_LOG_LEVEL_WARNING=y +# CONFIG_BT_NIMBLE_LOG_LEVEL_INFO is not set # CONFIG_BT_NIMBLE_LOG_LEVEL_DEBUG is not set -CONFIG_BT_NIMBLE_LOG_LEVEL=1 +CONFIG_BT_NIMBLE_LOG_LEVEL=2 CONFIG_BT_NIMBLE_PRINT_ERR_NAME=y # CONFIG_BT_NIMBLE_DEBUG is not set # CONFIG_BT_NIMBLE_TEST_THROUGHPUT_TEST is not set @@ -1036,9 +1032,9 @@ CONFIG_BT_CTRL_MODE_EFF=1 CONFIG_BT_CTRL_BLE_MAX_ACT=6 CONFIG_BT_CTRL_BLE_MAX_ACT_EFF=6 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_PINNED_TO_CORE_0 is not set +CONFIG_BT_CTRL_PINNED_TO_CORE_1=y +CONFIG_BT_CTRL_PINNED_TO_CORE=1 CONFIG_BT_CTRL_HCI_MODE_VHCI=y # CONFIG_BT_CTRL_HCI_MODE_UART_H4 is not set CONFIG_BT_CTRL_HCI_TL=1 @@ -1301,15 +1297,15 @@ CONFIG_ESP_ERR_TO_NAME_LOOKUP=y # # ESP-Driver:GPIO Configurations # -# CONFIG_GPIO_CTRL_FUNC_IN_IRAM is not set +CONFIG_GPIO_CTRL_FUNC_IN_IRAM=y # end of ESP-Driver:GPIO Configurations # # ESP-Driver:GPTimer Configurations # CONFIG_GPTIMER_ISR_HANDLER_IN_IRAM=y -# CONFIG_GPTIMER_CTRL_FUNC_IN_IRAM is not set -# CONFIG_GPTIMER_ISR_CACHE_SAFE is not set +CONFIG_GPTIMER_CTRL_FUNC_IN_IRAM=y +CONFIG_GPTIMER_ISR_CACHE_SAFE=y CONFIG_GPTIMER_OBJ_CACHE_SAFE=y # CONFIG_GPTIMER_ENABLE_DEBUG_LOG is not set # end of ESP-Driver:GPTimer Configurations @@ -1745,9 +1741,9 @@ CONFIG_ESP_ROM_PRINT_IN_IRAM=y # ESP System Settings # # CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_80 is not set -CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_160=y -# CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240 is not set -CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=160 +# CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_160 is not set +CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y +CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=240 # # Cache config @@ -1793,7 +1789,7 @@ CONFIG_ESP_SYSTEM_IN_IRAM=y 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_PANIC_REBOOT_DELAY_SECONDS=0 +CONFIG_ESP_SYSTEM_PANIC_REBOOT_DELAY_SECONDS=2 CONFIG_ESP_SYSTEM_RTC_FAST_MEM_AS_HEAP_DEPCHECK=y CONFIG_ESP_SYSTEM_ALLOW_RTC_FAST_MEM_AS_HEAP=y @@ -1873,9 +1869,9 @@ CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=32 CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER=y CONFIG_ESP_WIFI_TX_BUFFER_TYPE=1 CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=32 -CONFIG_ESP_WIFI_STATIC_RX_MGMT_BUFFER=y -# CONFIG_ESP_WIFI_DYNAMIC_RX_MGMT_BUFFER is not set -CONFIG_ESP_WIFI_DYNAMIC_RX_MGMT_BUF=0 +# CONFIG_ESP_WIFI_STATIC_RX_MGMT_BUFFER is not set +CONFIG_ESP_WIFI_DYNAMIC_RX_MGMT_BUFFER=y +CONFIG_ESP_WIFI_DYNAMIC_RX_MGMT_BUF=1 CONFIG_ESP_WIFI_RX_MGMT_BUF_NUM_DEF=5 # CONFIG_ESP_WIFI_CSI_ENABLED is not set CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y @@ -1883,8 +1879,8 @@ CONFIG_ESP_WIFI_TX_BA_WIN=6 CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y CONFIG_ESP_WIFI_RX_BA_WIN=6 CONFIG_ESP_WIFI_NVS_ENABLED=y -CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_0=y -# CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_1 is not set +# CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_0 is not set +CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_1=y CONFIG_ESP_WIFI_SOFTAP_BEACON_MAX_LEN=752 CONFIG_ESP_WIFI_MGMT_SBUF_NUM=32 CONFIG_ESP_WIFI_IRAM_OPT=y @@ -2001,12 +1997,12 @@ CONFIG_FATFS_DONT_TRUST_LAST_ALLOC=0 # # CONFIG_FREERTOS_SMP is not set # CONFIG_FREERTOS_UNICORE is not set -CONFIG_FREERTOS_HZ=100 +CONFIG_FREERTOS_HZ=1000 # CONFIG_FREERTOS_CHECK_STACKOVERFLOW_NONE is not set # CONFIG_FREERTOS_CHECK_STACKOVERFLOW_PTRVAL is not set CONFIG_FREERTOS_CHECK_STACKOVERFLOW_CANARY=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=1 -CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1536 +CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2048 # CONFIG_FREERTOS_USE_IDLE_HOOK is not set # CONFIG_FREERTOS_USE_TICK_HOOK is not set CONFIG_FREERTOS_MAX_TASK_NAME_LEN=16 @@ -2771,25 +2767,25 @@ CONFIG_WIFI_PROV_STA_ALL_CHANNEL_SCAN=y # CONFIG_DALI_PHY_COUNT=16 CONFIG_DALI_DEFAULT_BAUDRATE=1200 -CONFIG_DALI_TIMER_RESOLUTION_HZ=3000000 +CONFIG_DALI_TIMER_RESOLUTION_HZ=3636363 CONFIG_DALI_CUSTOM_HALF_BIT_TIME_X100_US=0 CONFIG_DALI_TX_STOP_CONDITION_US=0 CONFIG_DALI_RX_STOP_CONDITION_US=0 -CONFIG_DALI_QUERY_RESPONSE_TIMEOUT_MS=12 -CONFIG_DALI_DOUBLE_SEND_DELAY_MS=12 -CONFIG_DALI_FORWARD_ACTIVITY_WAIT_MS=25 +CONFIG_DALI_QUERY_RESPONSE_TIMEOUT_MS=20 +CONFIG_DALI_DOUBLE_SEND_DELAY_MS=15 +CONFIG_DALI_FORWARD_ACTIVITY_WAIT_MS=20 CONFIG_DALI_FORWARD_AFTER_BACKWARD_WAIT_MS=5 CONFIG_DALI_FORWARD_MAX_WAIT_MS=50 -CONFIG_DALI_BACKWARD_IDLE_TIMEOUT_MS=9 +CONFIG_DALI_BACKWARD_IDLE_TIMEOUT_MS=10 CONFIG_DALI_BUS_POWER_CHECK_INTERVAL_MS=500 CONFIG_DALI_BUS_ABNORMAL_REPORT_INTERVAL_MS=3000 # CONFIG_DALI_LOG_LEVEL_NONE is not set # CONFIG_DALI_LOG_LEVEL_ERROR is not set # CONFIG_DALI_LOG_LEVEL_WARN is not set # CONFIG_DALI_LOG_LEVEL_INFO is not set -# CONFIG_DALI_LOG_LEVEL_DEBUG is not set -CONFIG_DALI_LOG_LEVEL_VERBOSE=y -CONFIG_DALI_LOG_LEVEL=5 +CONFIG_DALI_LOG_LEVEL_DEBUG=y +# CONFIG_DALI_LOG_LEVEL_VERBOSE is not set +CONFIG_DALI_LOG_LEVEL=4 CONFIG_DALI_TX_ACTIVE_LOW=y # CONFIG_DALI_TX_ACTIVE_HIGH is not set CONFIG_DALI_RX_ACTIVE_LOW=y @@ -2822,10 +2818,12 @@ CONFIG_MQTT_TRANSPORT_SSL=y CONFIG_MQTT_TRANSPORT_WEBSOCKET=y CONFIG_MQTT_TRANSPORT_WEBSOCKET_SECURE=y # CONFIG_MQTT_MSG_ID_INCREMENTAL is not set -# CONFIG_MQTT_SKIP_PUBLISH_IF_DISCONNECTED is not set +CONFIG_MQTT_SKIP_PUBLISH_IF_DISCONNECTED=y # CONFIG_MQTT_REPORT_DELETED_MESSAGES is not set # CONFIG_MQTT_USE_CUSTOM_CONFIG is not set -# CONFIG_MQTT_TASK_CORE_SELECTION_ENABLED is not set +CONFIG_MQTT_TASK_CORE_SELECTION_ENABLED=y +# CONFIG_MQTT_USE_CORE_0 is not set +CONFIG_MQTT_USE_CORE_1=y # CONFIG_MQTT_CUSTOM_OUTBOX is not set # end of ESP-MQTT Configurations # end of Component config diff --git a/components/dali/src/dali_hal_idf5.c b/components/dali/src/dali_hal_idf5.c index 9de6586..63e10fa 100644 --- a/components/dali/src/dali_hal_idf5.c +++ b/components/dali/src/dali_hal_idf5.c @@ -402,9 +402,9 @@ static uint32_t tx_completion_timeout_ms(const Dali_msg_t *msg) uint64_t frame_us = ((uint64_t)(2U + bits * 2U) * hb) + stop_us; uint32_t frame_ms = (uint32_t)((frame_us + 999U) / 1000U); - uint32_t timeout_ms = frame_ms + 30U; - if (timeout_ms < 30U) { - timeout_ms = 30U; + uint32_t timeout_ms = frame_ms + 20U; + if (timeout_ms < 20U) { + timeout_ms = 20U; } if (timeout_ms > 500U) { timeout_ms = 500U; diff --git a/components/dali_domain/src/dali_domain.cpp b/components/dali_domain/src/dali_domain.cpp index 413e753..5a894fd 100644 --- a/components/dali_domain/src/dali_domain.cpp +++ b/components/dali_domain/src/dali_domain.cpp @@ -1,10 +1,12 @@ #include "dali_domain.hpp" +#define LOG_LOCAL_LEVEL CONFIG_DALI_LOG_LEVEL +#include "esp_log.h" + #include "dali.h" #include "dali_hal.h" #include "dali.hpp" #include "driver/uart.h" -#include "esp_log.h" #include "freertos/queue.h" #include @@ -14,25 +16,29 @@ #define CONFIG_DALI_QUERY_RESPONSE_TIMEOUT_MS 25 #endif +static const char *TAG = "dali_domain"; + namespace gateway { namespace { -constexpr const char* kTag = "dali_domain"; constexpr size_t kSerialRxPacketMaxBytes = 8; constexpr UBaseType_t kSerialRxQueueDepth = 8; -constexpr uint32_t kHardwareQueryRawSuppressMs = CONFIG_DALI_QUERY_RESPONSE_TIMEOUT_MS + 10; +constexpr uint32_t kHardwareQueryRawPostSuppressMs = 10; portMUX_TYPE s_query_raw_suppress_lock = portMUX_INITIALIZER_UNLOCKED; -TickType_t s_query_raw_suppress_until[DALI_PHY_COUNT] = {}; +uint8_t s_query_raw_suppress_inflight[DALI_PHY_COUNT] = {}; +TickType_t s_query_raw_suppress_post_until[DALI_PHY_COUNT] = {}; void BeginHardwareQueryRawSuppress(uint8_t bus_id) { if (bus_id >= DALI_PHY_COUNT) { return; } - const TickType_t until = xTaskGetTickCount() + pdMS_TO_TICKS(kHardwareQueryRawSuppressMs); portENTER_CRITICAL(&s_query_raw_suppress_lock); - s_query_raw_suppress_until[bus_id] = until; + if (s_query_raw_suppress_inflight[bus_id] < UINT8_MAX) { + ++s_query_raw_suppress_inflight[bus_id]; + } + s_query_raw_suppress_post_until[bus_id] = 0; portEXIT_CRITICAL(&s_query_raw_suppress_lock); } @@ -44,12 +50,13 @@ bool TakeHardwareQueryRawSuppress(uint8_t bus_id) { bool suppress = false; const TickType_t now = xTaskGetTickCount(); portENTER_CRITICAL(&s_query_raw_suppress_lock); - const TickType_t until = s_query_raw_suppress_until[bus_id]; - if (until != 0 && now <= until) { + const TickType_t post_until = s_query_raw_suppress_post_until[bus_id]; + if (s_query_raw_suppress_inflight[bus_id] > 0) { suppress = true; - s_query_raw_suppress_until[bus_id] = 0; - } else if (until != 0) { - s_query_raw_suppress_until[bus_id] = 0; + } else if (post_until != 0 && now <= post_until) { + suppress = true; + } else if (post_until != 0) { + s_query_raw_suppress_post_until[bus_id] = 0; } portEXIT_CRITICAL(&s_query_raw_suppress_lock); return suppress; @@ -59,8 +66,15 @@ void ClearHardwareQueryRawSuppress(uint8_t bus_id) { if (bus_id >= DALI_PHY_COUNT) { return; } + const TickType_t post_until = xTaskGetTickCount() + + pdMS_TO_TICKS(kHardwareQueryRawPostSuppressMs); portENTER_CRITICAL(&s_query_raw_suppress_lock); - s_query_raw_suppress_until[bus_id] = 0; + if (s_query_raw_suppress_inflight[bus_id] > 0) { + --s_query_raw_suppress_inflight[bus_id]; + } + if (s_query_raw_suppress_inflight[bus_id] == 0) { + s_query_raw_suppress_post_until[bus_id] = post_until; + } portEXIT_CRITICAL(&s_query_raw_suppress_lock); } @@ -128,9 +142,11 @@ bool SendHardwareFrame(uint8_t bus_id, const uint8_t* data, size_t len) { switch (data[0]) { case 0x10: + ESP_LOGD(TAG, "sending hardware frame for bus=%u data=%02x %02x", bus_id, data[1], data[2]); dali_send(&tx); return true; case 0x11: + ESP_LOGD(TAG, "sending extended frame for bus=%u data=%02x %02x", bus_id, data[1], data[2]); dali_send_double(&tx); return true; default: @@ -148,7 +164,7 @@ std::vector TransactHardwareFrame(uint8_t bus_id, const uint8_t* data, switch (data[0]) { case 0x00: - return {0xFF}; + ESP_LOGD(TAG, "received reset for bus=%u", bus_id); case 0x01: return {1}; case 0x10: @@ -156,15 +172,21 @@ std::vector TransactHardwareFrame(uint8_t bus_id, const uint8_t* data, return SendHardwareFrame(bus_id, data, len) ? std::vector{0xFF} : std::vector{0xFD}; case 0x12: { + ESP_LOGD(TAG, "received hardware query frame for bus=%u data=%02x %02x", bus_id, data[1], + data[2]); Dali_msg_t tx = dali_msg_new(data[1], data[2]); tx.id = bus_id; Dali_msg_t rx = {}; BeginHardwareQueryRawSuppress(bus_id); if (dali_query(&tx, &rx) == pdTRUE) { + ClearHardwareQueryRawSuppress(bus_id); if (rx.status != DALI_FRAME_OK || rx.length != 8) { - ClearHardwareQueryRawSuppress(bus_id); + ESP_LOGW(TAG, "hardware query response for bus=%u has invalid status or length", bus_id); return LegacyQueryResponse(0xFD); } + ESP_LOGD(TAG, "got hardware query response for bus=%u status=%u len=%u data=%02x %02x " + "%02x %02x", + bus_id, rx.status, rx.length, rx.data[0], rx.data[1], rx.data[2], rx.data[3]); return {0xFF, rx.data[0]}; } ClearHardwareQueryRawSuppress(bus_id); @@ -290,14 +312,14 @@ bool DaliDomainService::bindTransport(const DaliChannelConfig& config, DaliTrans esp_err_t DaliDomainService::bindHardwareBus(const DaliHardwareBusConfig& config) { esp_err_t err = dali_hal_set_baudrate(config.baudrate); if (err != ESP_OK) { - ESP_LOGE(kTag, "failed to set baudrate=%lu: %s", static_cast(config.baudrate), + ESP_LOGE(TAG, "failed to set baudrate=%lu: %s", static_cast(config.baudrate), esp_err_to_name(err)); return err; } err = dali_hal_init(config.bus_id, config.tx_pin, config.rx_pin); if (err != ESP_OK) { - ESP_LOGE(kTag, "failed to init bus=%u tx=%u rx=%u: %s", config.bus_id, config.tx_pin, + ESP_LOGE(TAG, "failed to init bus=%u tx=%u rx=%u: %s", config.bus_id, config.tx_pin, config.rx_pin, esp_err_to_name(err)); return err; } @@ -323,9 +345,9 @@ esp_err_t DaliDomainService::bindHardwareBus(const DaliHardwareBusConfig& config } err = startRawFrameTask(); if (err != ESP_OK) { - ESP_LOGW(kTag, "failed to start raw frame task: %s", esp_err_to_name(err)); + ESP_LOGW(TAG, "failed to start raw frame task: %s", esp_err_to_name(err)); } - ESP_LOGI(kTag, "bound channel=%u gateway=%u hardware bus=%u tx=%u rx=%u baudrate=%lu", + ESP_LOGI(TAG, "bound channel=%u gateway=%u hardware bus=%u tx=%u rx=%u baudrate=%lu", config.channel_index, config.gateway_id, config.bus_id, config.tx_pin, config.rx_pin, static_cast(config.baudrate)); return ESP_OK; @@ -336,7 +358,7 @@ esp_err_t DaliDomainService::bindSerialBus(const DaliSerialBusConfig& config) { return ESP_ERR_INVALID_ARG; } if (hasSerialPort(config.uart_port)) { - ESP_LOGE(kTag, "uart%d is already assigned to another DALI channel", config.uart_port); + ESP_LOGE(TAG, "uart%d is already assigned to another DALI channel", config.uart_port); return ESP_ERR_INVALID_STATE; } @@ -352,27 +374,27 @@ esp_err_t DaliDomainService::bindSerialBus(const DaliSerialBusConfig& config) { auto uart = static_cast(config.uart_port); esp_err_t err = uart_param_config(uart, &uart_config); if (err != ESP_OK) { - ESP_LOGE(kTag, "failed to configure uart%d: %s", config.uart_port, esp_err_to_name(err)); + ESP_LOGE(TAG, "failed to configure uart%d: %s", config.uart_port, esp_err_to_name(err)); return err; } err = uart_set_pin(uart, config.tx_pin < 0 ? UART_PIN_NO_CHANGE : config.tx_pin, config.rx_pin < 0 ? UART_PIN_NO_CHANGE : config.rx_pin, UART_PIN_NO_CHANGE, UART_PIN_NO_CHANGE); if (err != ESP_OK) { - ESP_LOGE(kTag, "failed to set uart%d pins tx=%d rx=%d: %s", config.uart_port, + ESP_LOGE(TAG, "failed to set uart%d pins tx=%d rx=%d: %s", config.uart_port, config.tx_pin, config.rx_pin, esp_err_to_name(err)); return err; } err = uart_driver_install(uart, config.rx_buffer_size, config.tx_buffer_size, 0, nullptr, 0); if (err != ESP_OK && err != ESP_ERR_INVALID_STATE) { - ESP_LOGE(kTag, "failed to install uart%d driver: %s", config.uart_port, esp_err_to_name(err)); + ESP_LOGE(TAG, "failed to install uart%d driver: %s", config.uart_port, esp_err_to_name(err)); return err; } uart_flush_input(uart); QueueHandle_t serial_rx_queue = xQueueCreate(kSerialRxQueueDepth, sizeof(SerialRxPacket)); if (serial_rx_queue == nullptr) { - ESP_LOGE(kTag, "failed to create uart%d RX queue", config.uart_port); + ESP_LOGE(TAG, "failed to create uart%d RX queue", config.uart_port); return ESP_ERR_NO_MEM; } @@ -402,12 +424,12 @@ esp_err_t DaliDomainService::bindSerialBus(const DaliSerialBusConfig& config) { channel->serial_rx_queue = serial_rx_queue; err = startSerialRxTask(*channel); if (err != ESP_OK) { - ESP_LOGE(kTag, "failed to start uart%d RX task: %s", config.uart_port, + ESP_LOGE(TAG, "failed to start uart%d RX task: %s", config.uart_port, esp_err_to_name(err)); return err; } } - ESP_LOGI(kTag, "bound channel=%u gateway=%u serial uart%d tx=%d rx=%d baudrate=%lu", + ESP_LOGI(TAG, "bound channel=%u gateway=%u serial uart%d tx=%d rx=%d baudrate=%lu", config.channel_index, config.gateway_id, config.uart_port, config.tx_pin, config.rx_pin, static_cast(config.baudrate)); return ESP_OK; @@ -1281,7 +1303,7 @@ void DaliDomainService::rawFrameTaskLoop() { Dali_msg_t message = {}; while (true) { if (queue == nullptr) { - vTaskDelay(pdMS_TO_TICKS(100)); + vTaskDelay(pdMS_TO_TICKS(10)); queue = dali_hal_raw_receive_queue(); continue; } diff --git a/components/gateway_ble/src/gateway_ble.cpp b/components/gateway_ble/src/gateway_ble.cpp index a3a84fd..ed5db12 100644 --- a/components/gateway_ble/src/gateway_ble.cpp +++ b/components/gateway_ble/src/gateway_ble.cpp @@ -455,6 +455,18 @@ int GatewayBleBridge::handleGapEvent(struct ble_gap_event* event) { notify_enabled_.fill(false); last_notify_payload_.clear(); last_notify_at_us_ = 0; + struct ble_gap_upd_params params = { + .itvl_min = 15, + .itvl_max = 15, + .latency = 3, + .supervision_timeout = 1000, + .min_ce_len = 0, + .max_ce_len = 0, + }; + int rc = ble_gap_update_params(event->connect.conn_handle, ¶ms); + if (rc != 0) { + ESP_LOGW(kTag, "ble_gap_update_params rc=%d", rc); + } ESP_LOGI(kTag, "BLE client connected handle=%u", conn_handle_); } else if (enabled_) { startAdvertising();