/**********************************************************
* Thread/Task reference
**********************************************************/
-#ifdef CONFIG_BTU_TASK_STACK_SIZE
-#define UC_BTU_TASK_STACK_SIZE CONFIG_BTU_TASK_STACK_SIZE
+#ifdef CONFIG_BT_BTU_TASK_STACK_SIZE
+#define UC_BTU_TASK_STACK_SIZE CONFIG_BT_BTU_TASK_STACK_SIZE
#else
#define UC_BTU_TASK_STACK_SIZE 4096
#endif
// If flash mode is set to QIO or QOUT, the WP pin is equal the value configured in bootloader.
// If flash mode is set to DIO or DOUT, the WP pin should config it via menuconfig.
- #if CONFIG_FLASHMODE_QIO || CONFIG_FLASHMODE_QOUT
+ #if CONFIG_ESPTOOLPY_FLASHMODE_QIO || CONFIG_FLASHMODE_QOUT
psram_io.psram_spiwp_sd3_io = CONFIG_BOOTLOADER_SPI_WP_PIN;
#else
psram_io.psram_spiwp_sd3_io = CONFIG_SPIRAM_SPIWP_SD3_PIN;
# Override some defaults so BT stack is enabled
# by default in this example
CONFIG_BT_ENABLED=y
-CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
-CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
-CONFIG_BTDM_CONTROLLER_MODE_BTDM=
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=
+CONFIG_BTDM_CTRL_MODE_BTDM=
# Override some defaults so BT stack is enabled
# by default in this example
CONFIG_BT_ENABLED=y
-CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
-CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
-CONFIG_BTDM_CONTROLLER_MODE_BTDM=
-CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=n
-CONFIG_BLE_SCAN_DUPLICATE=y
-CONFIG_SCAN_DUPLICATE_TYPE=2
-CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR=y
-CONFIG_DUPLICATE_SCAN_CACHE_SIZE=200
-CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=y
-CONFIG_MESH_DUPLICATE_SCAN_CACHE_SIZE=200
-CONFIG_BTDM_CONTROLLER_FULL_SCAN_SUPPORTED=y
-CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_SUPPORTED=y
-CONFIG_GATTS_ENABLE=y
-CONFIG_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=
+CONFIG_BTDM_CTRL_MODE_BTDM=
+CONFIG_BTDM_MODEM_SLEEP=n
+CONFIG_BTDM_BLE_SCAN_DUPL=y
+CONFIG_BTDM_SCAN_DUPL_TYPE=2
+CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y
+CONFIG_BTDM_SCAN_DUPL_CACHE_SIZE=200
+CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y
+CONFIG_BTDM_MESH_DUPL_SCAN_CACHE_SIZE=200
+CONFIG_BTDM_CTRL_FULL_SCAN_SUPPORTED=y
+CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP=y
+CONFIG_BT_GATTS_ENABLE=y
+CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
CONFIG_BLE_MESH=y
CONFIG_BLE_MESH_HCI_5_0=y
CONFIG_BLE_MESH_USE_DUPLICATE_SCAN=y
CONFIG_BLE_MESH_FRIEND=
CONFIG_BLE_MESH_CFG_CLI=
CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y
-CONFIG_BTU_TASK_STACK_SIZE=4512
\ No newline at end of file
+CONFIG_BT_BTU_TASK_STACK_SIZE=4512
# Override some defaults so BT stack is enabled
# by default in this example
-CONFIG_CONSOLE_UART_BAUDRATE=921600
+CONFIG_ESP_CONSOLE_UART_BAUDRATE=921600
CONFIG_ESPTOOLPY_BAUD_921600B=y
-CONFIG_MONITOR_BAUD_921600B=y
+CONFIG_ESPTOOLPY_MONITOR_BAUD_921600B=y
CONFIG_BT_ENABLED=y
-CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
-CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
-CONFIG_BTDM_CONTROLLER_MODE_BTDM=
-CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=n
-CONFIG_BLE_SCAN_DUPLICATE=y
-CONFIG_SCAN_DUPLICATE_TYPE=2
-CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR=y
-CONFIG_DUPLICATE_SCAN_CACHE_SIZE=200
-CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=y
-CONFIG_MESH_DUPLICATE_SCAN_CACHE_SIZE=200
-CONFIG_BTDM_CONTROLLER_FULL_SCAN_SUPPORTED=y
-CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_SUPPORTED=y
-CONFIG_GATTS_ENABLE=y
-CONFIG_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=
+CONFIG_BTDM_CTRL_MODE_BTDM=
+CONFIG_BTDM_MODEM_SLEEP=n
+CONFIG_BTDM_BLE_SCAN_DUPL=y
+CONFIG_BTDM_SCAN_DUPL_TYPE=2
+CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y
+CONFIG_BTDM_SCAN_DUPL_CACHE_SIZE=200
+CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y
+CONFIG_BTDM_MESH_DUPL_SCAN_CACHE_SIZE=200
+CONFIG_BTDM_CTRL_FULL_SCAN_SUPPORTED=y
+CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP=y
+CONFIG_BT_GATTS_ENABLE=y
+CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
CONFIG_BLE_MESH=y
CONFIG_BLE_MESH_HCI_5_0=y
CONFIG_BLE_MESH_USE_DUPLICATE_SCAN=y
CONFIG_BLE_MESH_LOW_POWER=
CONFIG_BLE_MESH_FRIEND=
CONFIG_BLE_MESH_CFG_CLI=y
-CONFIG_BTU_TASK_STACK_SIZE=4512
\ No newline at end of file
+CONFIG_BT_BTU_TASK_STACK_SIZE=4512
# Override some defaults so BT stack is enabled
# by default in this example
CONFIG_BT_ENABLED=y
-CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
-CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
-CONFIG_BTDM_CONTROLLER_MODE_BTDM=
-CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=n
-CONFIG_BLE_SCAN_DUPLICATE=y
-CONFIG_SCAN_DUPLICATE_TYPE=2
-CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR=y
-CONFIG_DUPLICATE_SCAN_CACHE_SIZE=200
-CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=y
-CONFIG_MESH_DUPLICATE_SCAN_CACHE_SIZE=200
-CONFIG_BTDM_CONTROLLER_FULL_SCAN_SUPPORTED=y
-CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_SUPPORTED=y
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=
+CONFIG_BTDM_CTRL_MODE_BTDM=
+CONFIG_BTDM_MODEM_SLEEP=n
+CONFIG_BTDM_BLE_SCAN_DUPL=y
+CONFIG_BTDM_SCAN_DUPL_TYPE=2
+CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y
+CONFIG_BTDM_SCAN_DUPL_CACHE_SIZE=200
+CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y
+CONFIG_BTDM_MESH_DUPL_SCAN_CACHE_SIZE=200
+CONFIG_BTDM_CTRL_FULL_SCAN_SUPPORTED=y
+CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP=y
CONFIG_BLE_MESH=y
CONFIG_BLE_MESH_HCI_5_0=y
CONFIG_BLE_MESH_USE_DUPLICATE_SCAN=y
CONFIG_BLE_MESH_RX_SEG_MSG_COUNT=1
CONFIG_BLE_MESH_RX_SDU_MAX=384
CONFIG_BLE_MESH_TX_SEG_MAX=32
-CONFIG_BTU_TASK_STACK_SIZE=4512
+CONFIG_BT_BTU_TASK_STACK_SIZE=4512
CONFIG_BLE_MESH_CFG_CLI=y
-CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y
\ No newline at end of file
+CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y
# Override some defaults so BT stack is enabled
# by default in this example
CONFIG_BT_ENABLED=y
-CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
-CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
-CONFIG_BTDM_CONTROLLER_MODE_BTDM=
-CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=n
-CONFIG_BLE_SCAN_DUPLICATE=y
-CONFIG_SCAN_DUPLICATE_TYPE=2
-CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR=y
-CONFIG_DUPLICATE_SCAN_CACHE_SIZE=200
-CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=y
-CONFIG_MESH_DUPLICATE_SCAN_CACHE_SIZE=200
-CONFIG_BTDM_CONTROLLER_FULL_SCAN_SUPPORTED=y
-CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_SUPPORTED=y
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=
+CONFIG_BTDM_CTRL_MODE_BTDM=
+CONFIG_BTDM_MODEM_SLEEP=n
+CONFIG_BTDM_BLE_SCAN_DUPL=y
+CONFIG_BTDM_SCAN_DUPL_TYPE=2
+CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y
+CONFIG_BTDM_SCAN_DUPL_CACHE_SIZE=200
+CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y
+CONFIG_BTDM_MESH_DUPL_SCAN_CACHE_SIZE=200
+CONFIG_BTDM_CTRL_FULL_SCAN_SUPPORTED=y
+CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP=y
CONFIG_BLE_MESH=y
CONFIG_BLE_MESH_HCI_5_0=y
CONFIG_BLE_MESH_USE_DUPLICATE_SCAN=y
CONFIG_BLE_MESH_RELAY=y
CONFIG_BLE_MESH_LOW_POWER=
CONFIG_BLE_MESH_FRIEND=
-CONFIG_BTU_TASK_STACK_SIZE=4512
+CONFIG_BT_BTU_TASK_STACK_SIZE=4512
CONFIG_BLE_MESH_CFG_CLI=y
CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y
CONFIG_BLE_MESH_ADV_BUF_COUNT=100
CONFIG_BLE_MESH_RX_SDU_MAX=384
CONFIG_BLE_MESH_TX_SEG_MAX=32
CONFIG_BLE_MESH_NO_LOG=n
-CONFIG_BLE_MESH_STACK_TRACE_LEVEL=1
\ No newline at end of file
+CONFIG_BLE_MESH_STACK_TRACE_LEVEL=1
# Override some defaults so BT stack is enabled
# by default in this example
CONFIG_BT_ENABLED=y
-CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
-CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
-CONFIG_BTDM_CONTROLLER_MODE_BTDM=
-CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=n
-CONFIG_BLE_SCAN_DUPLICATE=y
-CONFIG_SCAN_DUPLICATE_TYPE=2
-CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR=y
-CONFIG_DUPLICATE_SCAN_CACHE_SIZE=200
-CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=y
-CONFIG_MESH_DUPLICATE_SCAN_CACHE_SIZE=200
-CONFIG_BTDM_CONTROLLER_FULL_SCAN_SUPPORTED=y
-CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_SUPPORTED=y
-CONFIG_GATTS_ENABLE=y
-CONFIG_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=
+CONFIG_BTDM_CTRL_MODE_BTDM=
+CONFIG_BTDM_MODEM_SLEEP=n
+CONFIG_BTDM_BLE_SCAN_DUPL=y
+CONFIG_BTDM_SCAN_DUPL_TYPE=2
+CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y
+CONFIG_BTDM_SCAN_DUPL_CACHE_SIZE=200
+CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y
+CONFIG_BTDM_MESH_DUPL_SCAN_CACHE_SIZE=200
+CONFIG_BTDM_CTRL_FULL_SCAN_SUPPORTED=y
+CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP=y
+CONFIG_BT_GATTS_ENABLE=y
+CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
CONFIG_BLE_MESH=y
CONFIG_BLE_MESH_HCI_5_0=y
CONFIG_BLE_MESH_USE_DUPLICATE_SCAN=y
CONFIG_BLE_MESH_RELAY=y
CONFIG_BLE_MESH_LOW_POWER=
CONFIG_BLE_MESH_FRIEND=
-CONFIG_BTU_TASK_STACK_SIZE=4512
+CONFIG_BT_BTU_TASK_STACK_SIZE=4512
CONFIG_BLE_MESH_CFG_CLI=y
CONFIG_BLE_MESH_CRPL=60
CONFIG_BLE_MESH_MSG_CACHE_SIZE=60
CONFIG_BLE_MESH_RX_SDU_MAX=384
CONFIG_BLE_MESH_TX_SEG_MAX=32
CONFIG_BLE_MESH_NO_LOG=n
-CONFIG_BLE_MESH_STACK_TRACE_LEVEL=0
\ No newline at end of file
+CONFIG_BLE_MESH_STACK_TRACE_LEVEL=0
# Override some defaults so BT stack is enabled
# by default in this example
CONFIG_BT_ENABLED=y
-CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
-CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
-CONFIG_BTDM_CONTROLLER_MODE_BTDM=
-CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=n
-CONFIG_BLE_SCAN_DUPLICATE=y
-CONFIG_SCAN_DUPLICATE_TYPE=2
-CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR=y
-CONFIG_DUPLICATE_SCAN_CACHE_SIZE=200
-CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=y
-CONFIG_MESH_DUPLICATE_SCAN_CACHE_SIZE=200
-CONFIG_BTDM_CONTROLLER_FULL_SCAN_SUPPORTED=y
-CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_SUPPORTED=y
-CONFIG_GATTS_ENABLE=y
-CONFIG_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=
+CONFIG_BTDM_CTRL_MODE_BTDM=
+CONFIG_BTDM_MODEM_SLEEP=n
+CONFIG_BTDM_BLE_SCAN_DUPL=y
+CONFIG_BTDM_SCAN_DUPL_TYPE=2
+CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y
+CONFIG_BTDM_SCAN_DUPL_CACHE_SIZE=200
+CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y
+CONFIG_BTDM_MESH_DUPL_SCAN_CACHE_SIZE=200
+CONFIG_BTDM_CTRL_FULL_SCAN_SUPPORTED=y
+CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP=y
+CONFIG_BT_GATTS_ENABLE=y
+CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
CONFIG_BLE_MESH=y
CONFIG_BLE_MESH_HCI_5_0=y
CONFIG_BLE_MESH_USE_DUPLICATE_SCAN=y
CONFIG_BLE_MESH_LOW_POWER=
CONFIG_BLE_MESH_FRIEND=
CONFIG_BLE_MESH_CFG_CLI=y
-CONFIG_BTU_TASK_STACK_SIZE=4512
\ No newline at end of file
+CONFIG_BT_BTU_TASK_STACK_SIZE=4512
# Override some defaults so BT stack is enabled
# by default in this example
CONFIG_BT_ENABLED=y
-CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
-CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
-CONFIG_BTDM_CONTROLLER_MODE_BTDM=
-CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=n
-CONFIG_BLE_SCAN_DUPLICATE=y
-CONFIG_SCAN_DUPLICATE_TYPE=2
-CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR=y
-CONFIG_DUPLICATE_SCAN_CACHE_SIZE=200
-CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=y
-CONFIG_MESH_DUPLICATE_SCAN_CACHE_SIZE=200
-CONFIG_BTDM_CONTROLLER_FULL_SCAN_SUPPORTED=y
-CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_SUPPORTED=y
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=
+CONFIG_BTDM_CTRL_MODE_BTDM=
+CONFIG_BTDM_MODEM_SLEEP=n
+CONFIG_BTDM_BLE_SCAN_DUPL=y
+CONFIG_BTDM_SCAN_DUPL_TYPE=2
+CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y
+CONFIG_BTDM_SCAN_DUPL_CACHE_SIZE=200
+CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y
+CONFIG_BTDM_MESH_DUPL_SCAN_CACHE_SIZE=200
+CONFIG_BTDM_CTRL_FULL_SCAN_SUPPORTED=y
+CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP=y
CONFIG_BLE_MESH=y
CONFIG_BLE_MESH_HCI_5_0=y
CONFIG_BLE_MESH_USE_DUPLICATE_SCAN=y
CONFIG_BLE_MESH_RX_SEG_MSG_COUNT=6
CONFIG_BLE_MESH_RX_SDU_MAX=384
CONFIG_BLE_MESH_TX_SEG_MAX=32
-CONFIG_BTU_TASK_STACK_SIZE=4512
+CONFIG_BT_BTU_TASK_STACK_SIZE=4512
CONFIG_BLE_MESH_CFG_CLI=y
-CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y
\ No newline at end of file
+CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y
CONFIG_BLE_MESH_RELAY=y
CONFIG_BLE_MESH_LOW_POWER=
CONFIG_BLE_MESH_FRIEND=
-CONFIG_BTU_TASK_STACK_SIZE=4512
+CONFIG_BT_BTU_TASK_STACK_SIZE=4512
CONFIG_BLE_MESH_CFG_CLI=y
CONFIG_BLE_MESH_CRPL=60
CONFIG_BLE_MESH_MSG_CACHE_SIZE=60
CONFIG_BLE_MESH_RX_SDU_MAX=384
CONFIG_BLE_MESH_TX_SEG_MAX=32
CONFIG_BLE_MESH_NO_LOG=n
-CONFIG_BLE_MESH_STACK_TRACE_LEVEL=0
\ No newline at end of file
+CONFIG_BLE_MESH_STACK_TRACE_LEVEL=0
CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240
CONFIG_MEMMAP_SMP=y
CONFIG_BT_ENABLED=y
-CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
-CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
-CONFIG_BTDM_CONTROLLER_MODE_BTDM=
-CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=n
-CONFIG_BLE_SCAN_DUPLICATE=y
-CONFIG_SCAN_DUPLICATE_TYPE=2
-CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR=y
-CONFIG_DUPLICATE_SCAN_CACHE_SIZE=200
-CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=y
-CONFIG_MESH_DUPLICATE_SCAN_CACHE_SIZE=200
-CONFIG_BTDM_CONTROLLER_FULL_SCAN_SUPPORTED=y
-CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_SUPPORTED=y
-CONFIG_GATTS_ENABLE=y
-CONFIG_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=
+CONFIG_BTDM_CTRL_MODE_BTDM=
+CONFIG_BTDM_MODEM_SLEEP=n
+CONFIG_BTDM_BLE_SCAN_DUPL=y
+CONFIG_BTDM_SCAN_DUPL_TYPE=2
+CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y
+CONFIG_BTDM_SCAN_DUPL_CACHE_SIZE=200
+CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y
+CONFIG_BTDM_MESH_DUPL_SCAN_CACHE_SIZE=200
+CONFIG_BTDM_CTRL_FULL_SCAN_SUPPORTED=y
+CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP=y
+CONFIG_BT_GATTS_ENABLE=y
+CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
CONFIG_BLE_MESH=y
CONFIG_BLE_MESH_HCI_5_0=y
CONFIG_BLE_MESH_USE_DUPLICATE_SCAN=y
CONFIG_BLE_MESH_RELAY=y
CONFIG_BLE_MESH_LOW_POWER=
CONFIG_BLE_MESH_FRIEND=
-CONFIG_BTU_TASK_STACK_SIZE=4512
+CONFIG_BT_BTU_TASK_STACK_SIZE=4512
CONFIG_BLE_MESH_CFG_CLI=y
CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y
CONFIG_BLE_MESH_CRPL=60
CONFIG_BLE_MESH_NO_LOG=n
CONFIG_BLE_MESH_STACK_TRACE_LEVEL=0
-CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=4096
+CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=4096
CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=16
CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=64
CONFIG_FREERTOS_UNICORE=
CONFIG_FREERTOS_HZ=1000
-CONFIG_INT_WDT=
-CONFIG_TASK_WDT=
+CONFIG_ESP_INT_WDT=
+CONFIG_ESP_TASK_WDT=
-CONFIG_TCP_SND_BUF_DEFAULT=65534
-CONFIG_TCP_WND_DEFAULT=65534
-CONFIG_TCP_RECVMBOX_SIZE=64
-CONFIG_UDP_RECVMBOX_SIZE=64
-CONFIG_TCPIP_RECVMBOX_SIZE=64
+CONFIG_LWIP_TCP_SND_BUF_DEFAULT=65534
+CONFIG_LWIP_TCP_WND_DEFAULT=65534
+CONFIG_LWIP_TCP_RECVMBOX_SIZE=64
+CONFIG_LWIP_UDP_RECVMBOX_SIZE=64
+CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=64
CONFIG_LWIP_ETHARP_TRUST_IP_MAC=
-CONFIG_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
CONFIG_LWIP_IRAM_OPTIMIZATION=y
CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
\ No newline at end of file
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
endif
endif
+ifneq ("$(wildcard $(SDKCONFIG_DEFAULTS))","")
+ifeq ($(OS),Windows_NT)
+DEFAULTS_ARG:=--defaults $(shell cygpath -m $(SDKCONFIG_DEFAULTS))
+else
+DEFAULTS_ARG:=--defaults $(SDKCONFIG_DEFAULTS)
+endif
+else
+DEFAULTS_ARG:=
+endif
+
# macro for running confgen.py
define RunConfGen
mkdir -p $(BUILD_DIR_BASE)/include/config
--env "COMPONENT_KCONFIGS_PROJBUILD=$(strip $(COMPONENT_KCONFIGS_PROJBUILD))" \
--env "COMPONENT_SDKCONFIG_RENAMES=$(strip $(COMPONENT_SDKCONFIG_RENAMES))" \
--env "IDF_CMAKE=n" \
+ $(DEFAULTS_ARG) \
--output config ${SDKCONFIG} \
--output makefile $(SDKCONFIG_MAKEFILE) \
--output header $(BUILD_DIR_BASE)/include/sdkconfig.h
# defconfig creates a default config, based on SDKCONFIG_DEFAULTS if present
defconfig: | check_python_dependencies
$(summary) DEFCONFIG
-ifneq ("$(wildcard $(SDKCONFIG_DEFAULTS))","")
- cat $(SDKCONFIG_DEFAULTS) >> $(SDKCONFIG) # append defaults to sdkconfig, will override existing values
-endif
$(call RunConfGen)
# if neither defconfig or menuconfig are requested, use the GENCONFIG rule to
--- /dev/null
+#!/usr/bin/env python
+#
+# Copyright 2019 Espressif Systems (Shanghai) PTE LTD
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from __future__ import print_function
+from __future__ import unicode_literals
+import argparse
+import os
+import sys
+from io import open
+
+# FILES_TO_CHECK used as "startswith" pattern to match sdkconfig.defaults variants
+FILES_TO_CHECK = ('sdkconfig.ci', 'sdkconfig.defaults')
+
+# ignored directories (makes sense only when run on IDF_PATH)
+# Note: IGNORE_DIRS is a tuple in order to be able to use it directly with the startswith() built-in function which
+# accepts tuples but no lists.
+IGNORE_DIRS = (
+)
+
+
+def _parse_path(path, sep=' '):
+ ret = set()
+ with open(path, 'r', encoding='utf-8') as f:
+ for line in f:
+ line = line.strip()
+ if not line.startswith('#') and len(line) > 0:
+ ret.add(line.split(sep)[0])
+ return ret
+
+
+def _valid_directory(path):
+ if not os.path.isdir(path):
+ raise argparse.ArgumentTypeError("{} is not a valid directory!".format(path))
+ return path
+
+
+def main():
+ default_path = os.getenv('IDF_PATH', None)
+
+ parser = argparse.ArgumentParser(description='Kconfig options checker')
+ parser.add_argument('--directory', '-d', help='Path to directory to check recursively '
+ '(for example $IDF_PATH)',
+ type=_valid_directory,
+ required=default_path is None,
+ default=default_path)
+ args = parser.parse_args()
+
+ # IGNORE_DIRS makes sense when the required directory is IDF_PATH
+ check_ignore_dirs = default_path is not None and os.path.abspath(args.directory) == os.path.abspath(default_path)
+
+ ignores = 0
+ files_to_check = []
+ deprecated_options = set()
+ errors = []
+
+ for root, dirnames, filenames in os.walk(args.directory):
+ for filename in filenames:
+ full_path = os.path.join(root, filename)
+ path_in_idf = os.path.relpath(full_path, args.directory)
+
+ if filename.startswith(FILES_TO_CHECK):
+ if check_ignore_dirs and path_in_idf.startswith(IGNORE_DIRS):
+ print('{}: Ignored'.format(path_in_idf))
+ ignores += 1
+ continue
+ files_to_check.append(full_path)
+ elif filename == 'sdkconfig.rename':
+ deprecated_options |= _parse_path(full_path)
+
+ for path in files_to_check:
+ used_options = _parse_path(path, '=')
+ used_deprecated_options = deprecated_options & used_options
+ if len(used_deprecated_options) > 0:
+ errors.append('{}: The following options are deprecated: {}'.format(path,
+ ', '.join(used_deprecated_options)))
+
+ if ignores > 0:
+ print('{} files have been ignored.'.format(ignores))
+
+ if len(errors) > 0:
+ print('\n\n'.join(errors))
+ sys.exit(1)
+
+
+if __name__ == "__main__":
+ main()
- ${IDF_PATH}/tools/ci/multirun_with_pyenv.sh ${IDF_PATH}/tools/test_check_kconfigs.py
- ${IDF_PATH}/tools/check_kconfigs.py
+check_deprecated_kconfig_options:
+ extends: .check_job_template_with_filter
+ script:
+ - ${IDF_PATH}/tools/ci/check_deprecated_kconfigs.py
+
check_ut_cmake_make:
extends: .check_job_template_with_filter
stage: check
tools/ci/build_examples_cmake.sh
tools/ci/check-executable.sh
tools/ci/check-line-endings.sh
+tools/ci/check_deprecated_kconfigs.py
tools/ci/check_examples_cmake_make.sh
tools/ci/check_examples_rom_header.sh
tools/ci/check_idf_version.sh
pushd ${IDF_PATH}
git checkout -- sdkconfig.rename Kconfig
popd
- make defconfig
+
+ print_status "Handling deprecated Kconfig options in sdkconfig.defaults"
+ make clean;
+ rm -f sdkconfig;
+ echo "CONFIG_TEST_OLD_OPTION=7" > sdkconfig.defaults;
+ echo "CONFIG_TEST_OLD_OPTION CONFIG_TEST_NEW_OPTION" > ${IDF_PATH}/sdkconfig.rename;
+ echo -e "\n\
+menu \"test\"\n\
+ config TEST_NEW_OPTION\n\
+ int \"TEST_NEW_OPTION\"\n\
+ range 0 10\n\
+ default 5\n\
+ help\n\
+ TEST_NEW_OPTION description\n\
+endmenu\n" >> ${IDF_PATH}/Kconfig;
+ make defconfig > /dev/null;
+ grep "CONFIG_TEST_OLD_OPTION=7" sdkconfig || failure "CONFIG_TEST_OLD_OPTION=7 should be in sdkconfig for backward compatibility"
+ grep "CONFIG_TEST_NEW_OPTION=7" sdkconfig || failure "CONFIG_TEST_NEW_OPTION=7 should be in sdkconfig"
+ rm -f sdkconfig.defaults;
+ pushd ${IDF_PATH}
+ git checkout -- sdkconfig.rename Kconfig
+ popd
print_status "All tests completed"
if [ -n "${FAILURES}" ]; then
git checkout -- sdkconfig.rename Kconfig
popd
+ print_status "Handling deprecated Kconfig options in sdkconfig.defaults"
+ idf.py clean;
+ rm -f sdkconfig;
+ echo "CONFIG_TEST_OLD_OPTION=7" > sdkconfig.defaults;
+ echo "CONFIG_TEST_OLD_OPTION CONFIG_TEST_NEW_OPTION" > ${IDF_PATH}/sdkconfig.rename;
+ echo -e "\n\
+menu \"test\"\n\
+ config TEST_NEW_OPTION\n\
+ int \"TEST_NEW_OPTION\"\n\
+ range 0 10\n\
+ default 5\n\
+ help\n\
+ TEST_NEW_OPTION description\n\
+endmenu\n" >> ${IDF_PATH}/Kconfig;
+ idf.py build > /dev/null;
+ grep "CONFIG_TEST_OLD_OPTION=7" sdkconfig || failure "CONFIG_TEST_OLD_OPTION=7 should be in sdkconfig for backward compatibility"
+ grep "CONFIG_TEST_NEW_OPTION=7" sdkconfig || failure "CONFIG_TEST_NEW_OPTION=7 should be in sdkconfig"
+ rm -f sdkconfig.defaults;
+ pushd ${IDF_PATH}
+ git checkout -- sdkconfig.rename Kconfig
+ popd
+
print_status "Confserver can be invoked by idf.py"
echo '{"version": 1}' | idf.py confserver || failure "Couldn't load confserver"
config.disable_redun_warnings()
config.disable_override_warnings()
+ sdkconfig_renames = [args.sdkconfig_rename] if args.sdkconfig_rename else []
+ sdkconfig_renames += os.environ.get("COMPONENT_SDKCONFIG_RENAMES", "").split()
+ deprecated_options = DeprecatedOptions(config.config_prefix, path_rename_files=sdkconfig_renames)
+
if len(args.defaults) > 0:
# always load defaults first, so any items which are not defined in that config
# will have the default defined in the defaults file
print("Loading defaults file %s..." % name)
if not os.path.exists(name):
raise RuntimeError("Defaults file not found: %s" % name)
- config.load_config(name, replace=False)
-
- sdkconfig_renames = [args.sdkconfig_rename] if args.sdkconfig_rename else []
- sdkconfig_renames += os.environ.get("COMPONENT_SDKCONFIG_RENAMES", "").split()
- deprecated_options = DeprecatedOptions(config.config_prefix, path_rename_files=sdkconfig_renames)
+ try:
+ with tempfile.NamedTemporaryFile(prefix="confgen_tmp", delete=False) as f:
+ temp_file = f.name
+ deprecated_options.replace(sdkconfig_in=name, sdkconfig_out=temp_file)
+ config.load_config(temp_file, replace=False)
+ finally:
+ try:
+ os.remove(temp_file)
+ except OSError:
+ pass
# If config file previously exists, load it
if args.config and os.path.exists(args.config):
projects / esp-idf / commitdiff