Skip to content

Commit d1b1c2b

Browse files
authored
Merge pull request #172 from baba-dev/codex/test-code-for-compile-errors
fix(tab5): align hosted config for esp32c6
2 parents fb3aa39 + 5bbf257 commit d1b1c2b

3 files changed

Lines changed: 36 additions & 18 deletions

File tree

platforms/tab5/main/hal/components/hal_camera.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ void app_camera_display(void* arg)
324324
// uint32_t img_offset = 280 * 720 * 2;
325325
heap_caps_free(img_show_data);
326326
img_show_data = NULL;
327-
}
327+
328328
// close(camera->fd);
329329

330330
camera_mutex.lock();

platforms/tab5/sdkconfig

Lines changed: 31 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -703,6 +703,7 @@ CONFIG_PARTITION_TABLE_MD5=y
703703
# Tab5 application
704704
#
705705
CONFIG_APP_LOG_LEVEL=3
706+
# CONFIG_HAL_AUDIO_ENABLE_LONG_DEMO is not set
706707
# end of Tab5 application
707708

708709
#
@@ -1180,7 +1181,7 @@ CONFIG_RTC_FAST_CLK_SRC_RC_FAST=y
11801181
#
11811182
# Peripheral Control
11821183
#
1183-
# CONFIG_PERIPH_CTRL_FUNC_IN_IRAM is not set
1184+
CONFIG_PERIPH_CTRL_FUNC_IN_IRAM=y
11841185
# end of Peripheral Control
11851186

11861187
#
@@ -1287,6 +1288,7 @@ CONFIG_ESP_NETIF_REPORT_DATA_TRAFFIC=y
12871288
#
12881289
# CONFIG_PM_ENABLE is not set
12891290
# CONFIG_PM_SLP_IRAM_OPT is not set
1291+
CONFIG_PM_SLP_DEFAULT_PARAMS_OPT=y
12901292
# CONFIG_PM_POWER_DOWN_PERIPHERAL_IN_LIGHT_SLEEP is not set
12911293
# end of Power Management
12921294

@@ -1458,11 +1460,13 @@ CONFIG_ESP_WIFI_NVS_ENABLED=y
14581460
CONFIG_ESP_WIFI_SOFTAP_BEACON_MAX_LEN=752
14591461
CONFIG_ESP_WIFI_MGMT_SBUF_NUM=32
14601462
CONFIG_ESP_WIFI_IRAM_OPT=y
1463+
CONFIG_ESP_WIFI_EXTRA_IRAM_OPT=y
14611464
CONFIG_ESP_WIFI_RX_IRAM_OPT=y
14621465
CONFIG_ESP_WIFI_ENABLE_WPA3_SAE=y
14631466
CONFIG_ESP_WIFI_ENABLE_SAE_PK=y
14641467
CONFIG_ESP_WIFI_SOFTAP_SAE_SUPPORT=y
14651468
CONFIG_ESP_WIFI_ENABLE_WPA3_OWE_STA=y
1469+
CONFIG_ESP_WIFI_SLP_IRAM_OPT=y
14661470
CONFIG_ESP_WIFI_SLP_DEFAULT_MIN_ACTIVE_TIME=50
14671471
CONFIG_ESP_WIFI_SLP_DEFAULT_MAX_ACTIVE_TIME=10
14681472
CONFIG_ESP_WIFI_SLP_DEFAULT_WAIT_BROADCAST_DATA_TIME=15
@@ -1472,6 +1476,7 @@ CONFIG_ESP_WIFI_SOFTAP_SUPPORT=y
14721476
CONFIG_ESP_WIFI_ESPNOW_MAX_ENCRYPT_NUM=7
14731477
CONFIG_ESP_WIFI_MBEDTLS_CRYPTO=y
14741478
CONFIG_ESP_WIFI_MBEDTLS_TLS_CLIENT=y
1479+
CONFIG_ESP_WIFI_TX_HETB_QUEUE_NUM=3
14751480
CONFIG_ESP_WIFI_ENTERPRISE_SUPPORT=y
14761481
# end of Wi-Fi
14771482

@@ -2317,7 +2322,7 @@ CONFIG_LV_USE_BUILTIN_STRING=y
23172322
CONFIG_LV_USE_BUILTIN_SPRINTF=y
23182323
# CONFIG_LV_USE_CLIB_SPRINTF is not set
23192324
# CONFIG_LV_USE_CUSTOM_SPRINTF is not set
2320-
CONFIG_LV_MEM_SIZE_KILOBYTES=512
2325+
CONFIG_LV_MEM_SIZE_KILOBYTES=64
23212326
CONFIG_LV_MEM_POOL_EXPAND_SIZE_KILOBYTES=0
23222327
CONFIG_LV_MEM_ADR=0x0
23232328
# end of Memory Settings
@@ -2668,7 +2673,7 @@ CONFIG_LVGL_VERSION_PATCH=2
26682673
#
26692674
# Examples
26702675
#
2671-
CONFIG_LV_BUILD_EXAMPLES=y
2676+
# CONFIG_LV_BUILD_EXAMPLES is not set
26722677
# end of Examples
26732678

26742679
#
@@ -2848,11 +2853,13 @@ CONFIG_ESP_HOSTED_ENABLED=y
28482853
#
28492854

28502855
#
2851-
# ESP32 is Slave Target from Wi-Fi Remote Component
2856+
# ESP32-C6 is Slave Target from Wi-Fi Remote Component
28522857
#
28532858
CONFIG_ESP_HOSTED_PRIV_SDIO_OPTION=y
2859+
CONFIG_ESP_HOSTED_PRIV_SPI_HD_OPTION=y
28542860
# CONFIG_ESP_HOSTED_SPI_HOST_INTERFACE is not set
28552861
CONFIG_ESP_HOSTED_SDIO_HOST_INTERFACE=y
2862+
# CONFIG_ESP_HOSTED_SPI_HD_HOST_INTERFACE is not set
28562863
# CONFIG_ESP_HOSTED_UART_HOST_INTERFACE is not set
28572864
CONFIG_ESP_HOSTED_IDF_SLAVE_TARGET="esp32c6"
28582865

@@ -2935,21 +2942,26 @@ CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=1
29352942
# Wi-Fi Remote
29362943
#
29372944
CONFIG_ESP_WIFI_REMOTE_ENABLED=y
2938-
CONFIG_SLAVE_IDF_TARGET_ESP32=y
2945+
# CONFIG_SLAVE_IDF_TARGET_ESP32 is not set
29392946
# CONFIG_SLAVE_IDF_TARGET_ESP32S2 is not set
29402947
# CONFIG_SLAVE_IDF_TARGET_ESP32C3 is not set
29412948
# CONFIG_SLAVE_IDF_TARGET_ESP32S3 is not set
29422949
# CONFIG_SLAVE_IDF_TARGET_ESP32C2 is not set
2943-
# CONFIG_SLAVE_IDF_TARGET_ESP32C6 is not set
2950+
CONFIG_SLAVE_IDF_TARGET_ESP32C6=y
29442951
# CONFIG_SLAVE_IDF_TARGET_ESP32C5 is not set
29452952
# CONFIG_SLAVE_IDF_TARGET_ESP32C61 is not set
29462953
CONFIG_SLAVE_SOC_WIFI_SUPPORTED=y
29472954
CONFIG_SLAVE_SOC_WIFI_WAPI_SUPPORT=y
29482955
CONFIG_SLAVE_SOC_WIFI_CSI_SUPPORT=y
29492956
CONFIG_SLAVE_SOC_WIFI_MESH_SUPPORT=y
2950-
CONFIG_SLAVE_SOC_WIFI_SUPPORT_VARIABLE_BEACON_WINDOW=y
2951-
CONFIG_SLAVE_SOC_WIFI_NAN_SUPPORT=y
2952-
CONFIG_SLAVE_IDF_TARGET_ARCH_XTENSA=y
2957+
CONFIG_SLAVE_SOC_WIFI_LIGHT_SLEEP_CLK_WIDTH=12
2958+
CONFIG_SLAVE_SOC_WIFI_HW_TSF=y
2959+
CONFIG_SLAVE_SOC_WIFI_FTM_SUPPORT=y
2960+
CONFIG_SLAVE_FREERTOS_UNICORE=y
2961+
CONFIG_SLAVE_SOC_WIFI_GCMP_SUPPORT=y
2962+
CONFIG_SLAVE_IDF_TARGET_ARCH_RISCV=y
2963+
CONFIG_SLAVE_SOC_WIFI_HE_SUPPORT=y
2964+
CONFIG_SLAVE_SOC_WIFI_MAC_VERSION_NUM=2
29532965
CONFIG_ESP_WIFI_REMOTE_LIBRARY_HOSTED=y
29542966
# CONFIG_ESP_WIFI_REMOTE_LIBRARY_EPPP is not set
29552967

@@ -2972,37 +2984,40 @@ CONFIG_WIFI_RMT_TX_BA_WIN=6
29722984
CONFIG_WIFI_RMT_AMPDU_RX_ENABLED=y
29732985
CONFIG_WIFI_RMT_RX_BA_WIN=6
29742986
CONFIG_WIFI_RMT_NVS_ENABLED=y
2975-
CONFIG_WIFI_RMT_TASK_PINNED_TO_CORE_0=y
2976-
# CONFIG_WIFI_RMT_TASK_PINNED_TO_CORE_1 is not set
29772987
CONFIG_WIFI_RMT_SOFTAP_BEACON_MAX_LEN=752
29782988
CONFIG_WIFI_RMT_MGMT_SBUF_NUM=32
29792989
CONFIG_WIFI_RMT_IRAM_OPT=y
2980-
# CONFIG_WIFI_RMT_EXTRA_IRAM_OPT is not set
2990+
CONFIG_WIFI_RMT_EXTRA_IRAM_OPT=y
29812991
CONFIG_WIFI_RMT_RX_IRAM_OPT=y
29822992
CONFIG_WIFI_RMT_ENABLE_WPA3_SAE=y
29832993
CONFIG_WIFI_RMT_ENABLE_SAE_PK=y
29842994
CONFIG_WIFI_RMT_SOFTAP_SAE_SUPPORT=y
29852995
CONFIG_WIFI_RMT_ENABLE_WPA3_OWE_STA=y
2986-
# CONFIG_WIFI_RMT_SLP_IRAM_OPT is not set
2996+
CONFIG_WIFI_RMT_SLP_IRAM_OPT=y
29872997
CONFIG_WIFI_RMT_SLP_DEFAULT_MIN_ACTIVE_TIME=50
29882998
CONFIG_WIFI_RMT_SLP_DEFAULT_MAX_ACTIVE_TIME=10
29892999
CONFIG_WIFI_RMT_SLP_DEFAULT_WAIT_BROADCAST_DATA_TIME=15
3000+
# CONFIG_WIFI_RMT_FTM_ENABLE is not set
29903001
CONFIG_WIFI_RMT_STA_DISCONNECTED_PM_ENABLE=y
3002+
# CONFIG_WIFI_RMT_GCMP_SUPPORT is not set
29913003
CONFIG_WIFI_RMT_GMAC_SUPPORT=y
29923004
CONFIG_WIFI_RMT_SOFTAP_SUPPORT=y
29933005
# CONFIG_WIFI_RMT_SLP_BEACON_LOST_OPT is not set
29943006
CONFIG_WIFI_RMT_ESPNOW_MAX_ENCRYPT_NUM=7
2995-
# CONFIG_WIFI_RMT_NAN_ENABLE is not set
29963007
CONFIG_WIFI_RMT_MBEDTLS_CRYPTO=y
29973008
CONFIG_WIFI_RMT_MBEDTLS_TLS_CLIENT=y
29983009
# CONFIG_WIFI_RMT_EAP_TLS1_3 is not set
29993010
# CONFIG_WIFI_RMT_WAPI_PSK is not set
3011+
# CONFIG_WIFI_RMT_SUITE_B_192 is not set
30003012
# CONFIG_WIFI_RMT_11KV_SUPPORT is not set
30013013
# CONFIG_WIFI_RMT_MBO_SUPPORT is not set
30023014
# CONFIG_WIFI_RMT_ENABLE_ROAMING_APP is not set
30033015
# CONFIG_WIFI_RMT_DPP_SUPPORT is not set
30043016
# CONFIG_WIFI_RMT_11R_SUPPORT is not set
30053017
# CONFIG_WIFI_RMT_WPS_SOFTAP_REGISTRAR is not set
3018+
# CONFIG_WIFI_RMT_ENABLE_WIFI_TX_STATS is not set
3019+
# CONFIG_WIFI_RMT_ENABLE_WIFI_RX_STATS is not set
3020+
CONFIG_WIFI_RMT_TX_HETB_QUEUE_NUM=3
30063021

30073022
#
30083023
# WPS Configuration Options
@@ -3198,8 +3213,9 @@ CONFIG_SUPPORT_TERMIOS=y
31983213
CONFIG_SEMIHOSTFS_MAX_MOUNT_POINTS=1
31993214
# CONFIG_ESP_SPI_HOST_INTERFACE is not set
32003215
CONFIG_ESP_SDIO_HOST_INTERFACE=y
3216+
# CONFIG_ESP_SPI_HD_HOST_INTERFACE is not set
32013217
# CONFIG_ESP_UART_HOST_INTERFACE is not set
3202-
CONFIG_IDF_SLAVE_TARGET="esp32"
3218+
CONFIG_IDF_SLAVE_TARGET="esp32c6"
32033219
CONFIG_SDIO_RESET_ACTIVE_HIGH=y
32043220
# CONFIG_ESP_SDIO_OPTIMIZATION_RX_NONE is not set
32053221
# CONFIG_ESP_SDIO_OPTIMIZATION_RX_MAX_SIZE is not set

platforms/tab5/sdkconfig.defaults

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,15 @@ CONFIG_ESP_BROOKESIA_MEMORY_USE_CUSTOM=y
1919
CONFIG_LV_COLOR_SCREEN_TRANSP=y
2020
CONFIG_LV_USE_BUILTIN_MALLOC=y
2121
# CONFIG_LV_USE_CLIB_MALLOC is not set
22-
CONFIG_LV_MEM_SIZE_KILOBYTES=512
22+
CONFIG_LV_MEM_SIZE_KILOBYTES=64
2323
CONFIG_LV_MEM_POOL_EXPAND_SIZE_KILOBYTES=0
2424
CONFIG_LV_MEM_ADR=0x0
2525
CONFIG_LV_DISP_DEF_REFR_PERIOD=25
2626
CONFIG_LV_USE_LOG=y
2727
CONFIG_LV_LOG_PRINTF=y
2828
CONFIG_LV_USE_PERF_MONITOR=y
2929
CONFIG_LV_ATTRIBUTE_FAST_MEM_USE_IRAM=y
30+
# CONFIG_LV_BUILD_EXAMPLES is not set
3031
CONFIG_LV_FONT_MONTSERRAT_8=y
3132
CONFIG_LV_FONT_MONTSERRAT_10=y
3233
CONFIG_LV_FONT_MONTSERRAT_12=y
@@ -47,7 +48,8 @@ CONFIG_LV_FONT_MONTSERRAT_42=y
4748
CONFIG_LV_FONT_MONTSERRAT_44=y
4849
CONFIG_LV_FONT_FMT_TXT_LARGE=y
4950
CONFIG_LV_USE_FONT_COMPRESSED=y
50-
CONFIG_LV_USE_DEMO_BENCHMARK=y
51+
# CONFIG_LV_USE_DEMO_BENCHMARK is not set
5152
CONFIG_IDF_EXPERIMENTAL_FEATURES=y
53+
CONFIG_SLAVE_IDF_TARGET_ESP32C6=y
5254
CONFIG_ESP_HOSTED_IDF_SLAVE_TARGET="esp32c6"
5355
# CONFIG_HAL_AUDIO_ENABLE_LONG_DEMO is not set

0 commit comments

Comments
 (0)