Merge branch 'feature/reset_esp32c2_4mb_config' into 'master'

feat: reset esp32c2-4mb blufi config

See merge request application/esp-at!1373

.gitlab-ci.yml

@@ -338,6 +338,22 @@ esp32c2_4mb_at:
     - 'echo -e "{\"platform\": \"PLATFORM_ESP32C2\", \"module\": \"ESP32C2-4MB\", \"description\": \"\",\"silence\": 0}" > module_info.json'
     - *execute_script_esp32c2
 
+esp32c2_4mb_with_ble_at:
+  extends:
+    - .esp_at_build_template_esp32c2
+  script:
+    # enable ble features
+    - sed -i '/CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT=n/,/CONFIG_BT_NIMBLE_HCI_EVT_LO_BUF_COUNT=3/d' module_config/module_esp32c2_default/sdkconfig.defaults
+    - echo -e "CONFIG_AT_BLE_COMMAND_SUPPORT=y" >> module_config/module_esp32c2_default/sdkconfig.defaults
+    - echo -e "CONFIG_BT_NIMBLE_EXT_ADV=y" >> module_config/module_esp32c2_default/sdkconfig.defaults
+    - echo -e "CONFIG_BT_NIMBLE_MAX_PERIODIC_SYNCS=1" >> module_config/module_esp32c2_default/sdkconfig.defaults
+    - echo -e "CONFIG_BT_NIMBLE_GAP_DEVICE_NAME_MAX_LEN=32" >> module_config/module_esp32c2_default/sdkconfig.defaults
+    - echo -e "CONFIG_BT_NIMBLE_ATT_PREFERRED_MTU=203" >> module_config/module_esp32c2_default/sdkconfig.defaults
+
+    - export MODULE_CFG_DIR=module_esp32c2_default
+    - 'echo -e "{\"platform\": \"PLATFORM_ESP32C2\", \"module\": \"ESP32C2-4MB\", \"description\": \"\",\"silence\": 0}" > module_info.json'
+    - *execute_script_esp32c2
+
 esp32c2_4mb_at_xtal_40mhz_test:
   extends:
     - .esp_at_build_template_esp32c2

module_config/module_esp32c2_default/sdkconfig.defaults

@@ -56,10 +56,24 @@ CONFIG_BTDM_CTRL_MODE_ONLY=y
 CONFIG_BTDM_SCAN_DUPL_CACHE_SIZE=200
 CONFIG_BT_NIMBLE_ENABLED=y
 CONFIG_BT_NIMBLE_BLUFI_ENABLE=y
-CONFIG_BT_NIMBLE_EXT_ADV=y
-CONFIG_BT_NIMBLE_MAX_PERIODIC_SYNCS=1
-CONFIG_BT_NIMBLE_GAP_DEVICE_NAME_MAX_LEN=32
-CONFIG_BT_NIMBLE_ATT_PREFERRED_MTU=203
+
+# NimBLE Options
+CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT=n
+CONFIG_BT_NIMBLE_MAX_CONNECTIONS=1
+CONFIG_BT_NIMBLE_WHITELIST_SIZE=1
+CONFIG_BT_LE_LL_RESOLV_LIST_SIZE=1
+CONFIG_BT_LE_LL_DUP_SCAN_LIST_COUNT=1
+
+# NimBLE Memory Settings
+CONFIG_BT_NIMBLE_MSYS_1_BLOCK_COUNT=10
+CONFIG_BT_NIMBLE_MSYS_1_BLOCK_SIZE=100
+CONFIG_BT_NIMBLE_MSYS_2_BLOCK_COUNT=4
+CONFIG_BT_NIMBLE_MSYS_2_BLOCK_SIZE=320
+CONFIG_BT_NIMBLE_ACL_BUF_COUNT=5
+CONFIG_BT_NIMBLE_ACL_BUF_SIZE=255
+CONFIG_BT_NIMBLE_HCI_EVT_BUF_SIZE=70
+CONFIG_BT_NIMBLE_HCI_EVT_HI_BUF_COUNT=5
+CONFIG_BT_NIMBLE_HCI_EVT_LO_BUF_COUNT=3
 
 # FreeRTOS
 CONFIG_FREERTOS_UNICORE=y
@@ -109,6 +123,7 @@ CONFIG_AT_ENABLE=y
 CONFIG_AT_BASE_ON_UART=y
 CONFIG_AT_MQTT_COMMAND_SUPPORT=y
 CONFIG_AT_HTTP_COMMAND_SUPPORT=y
+CONFIG_AT_BLE_COMMAND_SUPPORT=n
 CONFIG_AT_PROCESS_TASK_STACK_SIZE=6144
 CONFIG_AT_OTA_SERVER_IP="iot.espressif.cn"
 CONFIG_AT_OTA_SERVER_PORT=80

module_config/module_esp32c2_default/sdkconfig_silence.defaults

@@ -60,10 +60,24 @@ CONFIG_BTDM_CTRL_MODE_ONLY=y
 CONFIG_BTDM_SCAN_DUPL_CACHE_SIZE=200
 CONFIG_BT_NIMBLE_ENABLED=y
 CONFIG_BT_NIMBLE_BLUFI_ENABLE=y
-CONFIG_BT_NIMBLE_EXT_ADV=y
-CONFIG_BT_NIMBLE_MAX_PERIODIC_SYNCS=1
-CONFIG_BT_NIMBLE_GAP_DEVICE_NAME_MAX_LEN=32
-CONFIG_BT_NIMBLE_ATT_PREFERRED_MTU=203
+
+# NimBLE Options
+CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT=n
+CONFIG_BT_NIMBLE_MAX_CONNECTIONS=1
+CONFIG_BT_NIMBLE_WHITELIST_SIZE=1
+CONFIG_BT_LE_LL_RESOLV_LIST_SIZE=1
+CONFIG_BT_LE_LL_DUP_SCAN_LIST_COUNT=1
+
+# NimBLE Memory Settings
+CONFIG_BT_NIMBLE_MSYS_1_BLOCK_COUNT=10
+CONFIG_BT_NIMBLE_MSYS_1_BLOCK_SIZE=100
+CONFIG_BT_NIMBLE_MSYS_2_BLOCK_COUNT=4
+CONFIG_BT_NIMBLE_MSYS_2_BLOCK_SIZE=320
+CONFIG_BT_NIMBLE_ACL_BUF_COUNT=5
+CONFIG_BT_NIMBLE_ACL_BUF_SIZE=255
+CONFIG_BT_NIMBLE_HCI_EVT_BUF_SIZE=70
+CONFIG_BT_NIMBLE_HCI_EVT_HI_BUF_COUNT=5
+CONFIG_BT_NIMBLE_HCI_EVT_LO_BUF_COUNT=3
 
 # FreeRTOS
 CONFIG_FREERTOS_UNICORE=y
@@ -113,6 +127,7 @@ CONFIG_AT_ENABLE=y
 CONFIG_AT_BASE_ON_UART=y
 CONFIG_AT_MQTT_COMMAND_SUPPORT=y
 CONFIG_AT_HTTP_COMMAND_SUPPORT=y
+CONFIG_AT_BLE_COMMAND_SUPPORT=n
 CONFIG_AT_PROCESS_TASK_STACK_SIZE=6144
 CONFIG_AT_OTA_SERVER_IP="iot.espressif.cn"
 CONFIG_AT_OTA_SERVER_PORT=80