Skip to content

Commit ddf29e1

Browse files
mantriyogeshmantriyogesh
committed
Merge branch 'fix/sdkconfig' into 'feature/esp_as_mcu_host'
fix(bluetooth): Enable bluetooth modem power svae by default See merge request app-frameworks/esp_hosted!504
2 parents 615d1e9 + be04ba2 commit ddf29e1

9 files changed

+20
-28
lines changed

‎Kconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ menu "ESP-Hosted config"
274274
int "GPIO pin for handshake"
275275
default 16 if IDF_TARGET_ESP32P4 && SLAVE_CHIPSET_ESP32C6
276276
default 3 if IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C6
277-
default 17 if IDF_TARGET_ESP32S3
277+
default 17 if IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32S2
278278
default 26
279279
help
280280
GPIO pin to use for handshake with other spi controller

‎slave/main/Kconfig.projbuild‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ menu "Example Configuration"
192192
int "Slave GPIO pin for handshake"
193193
default 22 if ESP_HOST_DEV_BOARD_P4_FUNC_BOARD
194194
default 3 if IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C6
195-
default 17 if IDF_TARGET_ESP32S3
195+
default 17 if IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32S2
196196
default 26
197197
help
198198
Slave GPIO pin to use for handshake with other spi controller

‎slave/partitions.esp32.csv‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# ESP-IDF Partition Table
2+
# Name, Type, SubType, Offset, Size, Flags
3+
nvs,data,nvs,0x9000,16K,
4+
otadata,data,ota,0xd000,8K,
5+
phy_init,data,phy,0xf000,4K,
6+
ota_0,app,ota_0,0x10000,1792K,
7+
ota_1,app,ota_1,0x1D0000,1792K,

‎slave/sdkconfig.defaults‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
CONFIG_BT_ENABLED=y
33
CONFIG_BT_CONTROLLER_ONLY=y
44

5-
CONFIG_ESP32_WIFI_NVS_ENABLED=
6-
75
# OTA
86
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
97
CONFIG_PARTITION_TABLE_TWO_OTA=y

‎slave/sdkconfig.defaults.esp32‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ CONFIG_BT_BLUEDROID_ENABLED=
99
CONFIG_BTDM_CONTROLLER_MODE_BTDM=y
1010
CONFIG_BTDM_CONTROLLER_HCI_MODE_VHCI=y
1111
CONFIG_BTDM_CTRL_AUTO_LATENCY=y
12-
13-
CONFIG_ESP32_WIFI_NVS_ENABLED=
12+
CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=y
13+
CONFIG_BTDM_CTRL_MODEM_SLEEP=y
1414

1515
# BT over UART
1616
#CONFIG_BTDM_CONTROLLER_HCI_MODE_UART_H4=y
@@ -32,5 +32,8 @@ CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER=y
3232
CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=64
3333

3434
# OTA
35-
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
36-
CONFIG_PARTITION_TABLE_TWO_OTA=y
35+
CONFIG_PARTITION_TABLE_CUSTOM=y
36+
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.esp32.csv"
37+
38+
# iram text saving
39+
CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y

‎slave/sdkconfig.defaults.esp32c2‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,14 @@ CONFIG_SDIO_DAT2_DISABLED=
77
CONFIG_BT_ENABLED=n ## temporary disable
88
CONFIG_BT_CONTROLLER_ONLY=y
99
CONFIG_BT_BLUEDROID_ENABLED=
10-
CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
11-
CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n
12-
CONFIG_BTDM_CTRL_MODE_BTDM=n
13-
CONFIG_BTDM_CTRL_HCI_MODE_VHCI=y
10+
CONFIG_BT_LE_SLEEP_ENABLE=y
1411

1512
#UART pins, Enable below config, delete sdkconfig and rebuild
1613
#CONFIG_BT_LE_HCI_INTERFACE_USE_UART=y
1714
#CONFIG_BT_LE_HCI_UART_FLOWCTRL=n
1815
#CONFIG_BT_LE_HCI_UART_TX_PIN=5
1916
#CONFIG_BT_LE_HCI_UART_RX_PIN=18
2017

21-
CONFIG_ESP32_WIFI_NVS_ENABLED=
22-
2318
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=n
2419
CONFIG_ESPTOOLPY_FLASHSIZE_2MB=y
2520
CONFIG_PARTITION_TABLE_TWO_OTA=y

‎slave/sdkconfig.defaults.esp32c3‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,4 @@ CONFIG_SDIO_DAT2_DISABLED=
77
CONFIG_BT_ENABLED=y
88
CONFIG_BT_CONTROLLER_ONLY=y
99
CONFIG_BT_BLUEDROID_ENABLED=
10-
CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
11-
CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n
12-
CONFIG_BTDM_CTRL_MODE_BTDM=n
13-
CONFIG_BTDM_CTRL_HCI_MODE_VHCI=y
14-
15-
CONFIG_ESP32_WIFI_NVS_ENABLED=
10+
CONFIG_BT_LE_SLEEP_ENABLE=y

‎slave/sdkconfig.defaults.esp32c6‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_160=y
44
CONFIG_BT_ENABLED=y
55
CONFIG_BT_CONTROLLER_ONLY=y
66
CONFIG_BT_BLUEDROID_ENABLED=
7+
CONFIG_BT_LE_SLEEP_ENABLE=y
78

89
# SPI/SDIO only
910
CONFIG_BT_LE_HCI_INTERFACE_USE_RAM=y
@@ -18,8 +19,6 @@ CONFIG_BT_LE_HCI_INTERFACE_USE_RAM=y
1819
# #CONFIG_BT_LE_HCI_UART_RTS_PIN=9
1920
# #CONFIG_BT_LE_HCI_UART_CTS_PIN=13
2021

21-
CONFIG_ESP_WIFI_NVS_ENABLED=
22-
2322
CONFIG_ESP_CACHE_MALLOC=n
2423

2524
CONFIG_PARTITION_TABLE_CUSTOM=y

‎slave/sdkconfig.defaults.esp32s3‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,4 @@ CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240
66
CONFIG_BT_ENABLED=y
77
CONFIG_BT_CONTROLLER_ONLY=y
88
CONFIG_BT_BLUEDROID_ENABLED=
9-
CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
10-
CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n
11-
CONFIG_BTDM_CTRL_MODE_BTDM=n
12-
CONFIG_BTDM_CTRL_HCI_MODE_VHCI=y
13-
14-
CONFIG_ESP32_WIFI_NVS_ENABLED=
9+
CONFIG_BT_LE_SLEEP_ENABLE=y

0 commit comments

Comments
 (0)