Skip to content

Commit 6f6ee98

Browse files
authored
Update ESP-IDF da2116f + esp32-camera f8f26ab + BLE b232e7f (espressif#2194)
* ESP-IDF da2116f + esp32-camera f8f26ab +BLE b232e7f * Fix fail compilation due to missing cpp guard
1 parent 1289f4b commit 6f6ee98

File tree

120 files changed

+760
-17
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+760
-17
lines changed

Diff for: cores/esp32/Esp.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
#include <soc/soc.h>
2727
#include <soc/efuse_reg.h>
2828
#include <esp_partition.h>
29-
#include <esp_ota_ops.h>
3029
extern "C" {
31-
#include <esp_image_format.h>
30+
#include "esp_ota_ops.h"
31+
#include "esp_image_format.h"
3232
}
3333
#include <MD5Builder.h>
3434

Diff for: libraries/BLE

Diff for: platform.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ compiler.warning_flags.all=-Wall -Werror=all -Wextra
2222

2323
compiler.path={runtime.tools.xtensa-esp32-elf-gcc.path}/bin/
2424
compiler.sdk.path={runtime.platform.path}/tools/sdk
25-
compiler.cpreprocessor.flags=-DESP_PLATFORM -DMBEDTLS_CONFIG_FILE="mbedtls/esp_config.h" -DHAVE_CONFIG_H "-I{compiler.sdk.path}/include/config" "-I{compiler.sdk.path}/include/app_trace" "-I{compiler.sdk.path}/include/app_update" "-I{compiler.sdk.path}/include/asio" "-I{compiler.sdk.path}/include/bootloader_support" "-I{compiler.sdk.path}/include/bt" "-I{compiler.sdk.path}/include/coap" "-I{compiler.sdk.path}/include/console" "-I{compiler.sdk.path}/include/driver" "-I{compiler.sdk.path}/include/esp-tls" "-I{compiler.sdk.path}/include/esp32" "-I{compiler.sdk.path}/include/esp_adc_cal" "-I{compiler.sdk.path}/include/esp_event" "-I{compiler.sdk.path}/include/esp_http_client" "-I{compiler.sdk.path}/include/esp_http_server" "-I{compiler.sdk.path}/include/esp_https_ota" "-I{compiler.sdk.path}/include/esp_https_server" "-I{compiler.sdk.path}/include/esp_ringbuf" "-I{compiler.sdk.path}/include/ethernet" "-I{compiler.sdk.path}/include/expat" "-I{compiler.sdk.path}/include/fatfs" "-I{compiler.sdk.path}/include/freemodbus" "-I{compiler.sdk.path}/include/freertos" "-I{compiler.sdk.path}/include/heap" "-I{compiler.sdk.path}/include/idf_test" "-I{compiler.sdk.path}/include/jsmn" "-I{compiler.sdk.path}/include/json" "-I{compiler.sdk.path}/include/libsodium" "-I{compiler.sdk.path}/include/log" "-I{compiler.sdk.path}/include/lwip" "-I{compiler.sdk.path}/include/mbedtls" "-I{compiler.sdk.path}/include/mdns" "-I{compiler.sdk.path}/include/micro-ecc" "-I{compiler.sdk.path}/include/mqtt" "-I{compiler.sdk.path}/include/newlib" "-I{compiler.sdk.path}/include/nghttp" "-I{compiler.sdk.path}/include/nvs_flash" "-I{compiler.sdk.path}/include/openssl" "-I{compiler.sdk.path}/include/protobuf-c" "-I{compiler.sdk.path}/include/protocomm" "-I{compiler.sdk.path}/include/pthread" "-I{compiler.sdk.path}/include/sdmmc" "-I{compiler.sdk.path}/include/smartconfig_ack" "-I{compiler.sdk.path}/include/soc" "-I{compiler.sdk.path}/include/spi_flash" "-I{compiler.sdk.path}/include/spiffs" "-I{compiler.sdk.path}/include/tcp_transport" "-I{compiler.sdk.path}/include/tcpip_adapter" "-I{compiler.sdk.path}/include/ulp" "-I{compiler.sdk.path}/include/unity" "-I{compiler.sdk.path}/include/vfs" "-I{compiler.sdk.path}/include/wear_levelling" "-I{compiler.sdk.path}/include/wifi_provisioning" "-I{compiler.sdk.path}/include/wpa_supplicant" "-I{compiler.sdk.path}/include/xtensa-debug-module"
25+
compiler.cpreprocessor.flags=-DESP_PLATFORM -DMBEDTLS_CONFIG_FILE="mbedtls/esp_config.h" -DHAVE_CONFIG_H "-I{compiler.sdk.path}/include/config" "-I{compiler.sdk.path}/include/app_trace" "-I{compiler.sdk.path}/include/app_update" "-I{compiler.sdk.path}/include/asio" "-I{compiler.sdk.path}/include/bootloader_support" "-I{compiler.sdk.path}/include/bt" "-I{compiler.sdk.path}/include/coap" "-I{compiler.sdk.path}/include/console" "-I{compiler.sdk.path}/include/driver" "-I{compiler.sdk.path}/include/esp-tls" "-I{compiler.sdk.path}/include/esp32" "-I{compiler.sdk.path}/include/esp_adc_cal" "-I{compiler.sdk.path}/include/esp_event" "-I{compiler.sdk.path}/include/esp_http_client" "-I{compiler.sdk.path}/include/esp_http_server" "-I{compiler.sdk.path}/include/esp_https_ota" "-I{compiler.sdk.path}/include/esp_https_server" "-I{compiler.sdk.path}/include/esp_ringbuf" "-I{compiler.sdk.path}/include/ethernet" "-I{compiler.sdk.path}/include/expat" "-I{compiler.sdk.path}/include/fatfs" "-I{compiler.sdk.path}/include/freemodbus" "-I{compiler.sdk.path}/include/freertos" "-I{compiler.sdk.path}/include/heap" "-I{compiler.sdk.path}/include/idf_test" "-I{compiler.sdk.path}/include/jsmn" "-I{compiler.sdk.path}/include/json" "-I{compiler.sdk.path}/include/libsodium" "-I{compiler.sdk.path}/include/log" "-I{compiler.sdk.path}/include/lwip" "-I{compiler.sdk.path}/include/mbedtls" "-I{compiler.sdk.path}/include/mdns" "-I{compiler.sdk.path}/include/micro-ecc" "-I{compiler.sdk.path}/include/mqtt" "-I{compiler.sdk.path}/include/newlib" "-I{compiler.sdk.path}/include/nghttp" "-I{compiler.sdk.path}/include/nvs_flash" "-I{compiler.sdk.path}/include/openssl" "-I{compiler.sdk.path}/include/protobuf-c" "-I{compiler.sdk.path}/include/protocomm" "-I{compiler.sdk.path}/include/pthread" "-I{compiler.sdk.path}/include/sdmmc" "-I{compiler.sdk.path}/include/smartconfig_ack" "-I{compiler.sdk.path}/include/soc" "-I{compiler.sdk.path}/include/spi_flash" "-I{compiler.sdk.path}/include/spiffs" "-I{compiler.sdk.path}/include/tcp_transport" "-I{compiler.sdk.path}/include/tcpip_adapter" "-I{compiler.sdk.path}/include/ulp" "-I{compiler.sdk.path}/include/unity" "-I{compiler.sdk.path}/include/vfs" "-I{compiler.sdk.path}/include/wear_levelling" "-I{compiler.sdk.path}/include/wifi_provisioning" "-I{compiler.sdk.path}/include/wpa_supplicant" "-I{compiler.sdk.path}/include/xtensa-debug-module" "-I{compiler.sdk.path}/include/esp32-camera"
2626

2727
compiler.c.cmd=xtensa-esp32-elf-gcc
2828
compiler.c.flags=-std=gnu99 -Os -g3 -fstack-protector -ffunction-sections -fdata-sections -fstrict-volatile-bitfields -mlongcalls -nostdlib -Wpointer-arith {compiler.warning_flags} -Wno-error=unused-function -Wno-error=unused-but-set-variable -Wno-error=unused-variable -Wno-error=deprecated-declarations -Wno-unused-parameter -Wno-sign-compare -Wno-old-style-declaration -MMD -c
@@ -35,7 +35,7 @@ compiler.S.flags=-c -g3 -x assembler-with-cpp -MMD -mlongcalls
3535

3636
compiler.c.elf.cmd=xtensa-esp32-elf-gcc
3737
compiler.c.elf.flags=-nostdlib "-L{compiler.sdk.path}/lib" "-L{compiler.sdk.path}/ld" -T esp32_out.ld -T esp32.common.ld -T esp32.rom.ld -T esp32.peripherals.ld -T esp32.rom.spiram_incompatible_fns.ld -u ld_include_panic_highint_hdl -u call_user_start_cpu0 -Wl,--gc-sections -Wl,-static -Wl,--undefined=uxTopUsedPriority -u __cxa_guard_dummy -u __cxx_fatal_exception
38-
compiler.c.elf.libs=-lgcc -lopenssl -lbtdm_app -lfatfs -lwps -lcoexist -lwear_levelling -lesp_http_client -lprotobuf-c -lhal -lnewlib -ldriver -lbootloader_support -lpp -lfreemodbus -lmesh -lsmartconfig -ljsmn -lwpa -lethernet -lphy -lapp_trace -lconsole -lulp -lwpa_supplicant -lfreertos -lbt -lmicro-ecc -lcxx -lxtensa-debug-module -ltcp_transport -lmdns -lvfs -lesp_ringbuf -lsoc -lcore -lsdmmc -llibsodium -lcoap -ltcpip_adapter -lprotocomm -lesp_event -lc_nano -lesp-tls -lasio -lrtc -lspi_flash -lwpa2 -lwifi_provisioning -lesp32 -lapp_update -lnghttp -lspiffs -lunity -lesp_https_server -lespnow -lnvs_flash -lesp_adc_cal -llog -lsmartconfig_ack -lexpat -lm -lmqtt -lc -lheap -lmbedtls -llwip -lnet80211 -lesp_http_server -lpthread -ljson -lesp_https_ota -lstdc++
38+
compiler.c.elf.libs=-lgcc -lopenssl -lbtdm_app -lfatfs -lwps -lcoexist -lwear_levelling -lesp_http_client -lprotobuf-c -lhal -lnewlib -ldriver -lbootloader_support -lpp -lfreemodbus -lmesh -lsmartconfig -ljsmn -lwpa -lethernet -lphy -lapp_trace -lconsole -lulp -lwpa_supplicant -lfreertos -lbt -lmicro-ecc -lesp32-camera -lcxx -lxtensa-debug-module -ltcp_transport -lmdns -lvfs -lesp_ringbuf -lsoc -lcore -lsdmmc -llibsodium -lcoap -ltcpip_adapter -lprotocomm -lesp_event -lc_nano -lesp-tls -lasio -lrtc -lspi_flash -lwpa2 -lwifi_provisioning -lesp32 -lapp_update -lnghttp -lspiffs -lunity -lesp_https_server -lespnow -lnvs_flash -lesp_adc_cal -llog -lsmartconfig_ack -lexpat -lm -lmqtt -lc -lheap -lmbedtls -llwip -lnet80211 -lesp_http_server -lpthread -ljson -lesp_https_ota -lstdc++
3939

4040
compiler.as.cmd=xtensa-esp32-elf-as
4141

Diff for: tools/gen_esp32part.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@
3535
MD5_PARTITION_BEGIN = b"\xEB\xEB" + b"\xFF" * 14 # The first 2 bytes are like magic numbers for MD5 sum
3636
PARTITION_TABLE_SIZE = 0x1000 # Size of partition table
3737

38+
MIN_PARTITION_SUBTYPE_APP_OTA = 0x10
39+
NUM_PARTITION_SUBTYPE_APP_OTA = 16
40+
3841
__version__ = '1.2'
3942

4043
APP_TYPE = 0x00
@@ -254,8 +257,8 @@ class PartitionDefinition(object):
254257
}
255258

256259
# add subtypes for the 16 OTA slot values ("ota_XX, etc.")
257-
for ota_slot in range(16):
258-
SUBTYPES[TYPES["app"]]["ota_%d" % ota_slot] = 0x10 + ota_slot
260+
for ota_slot in range(NUM_PARTITION_SUBTYPE_APP_OTA):
261+
SUBTYPES[TYPES["app"]]["ota_%d" % ota_slot] = MIN_PARTITION_SUBTYPE_APP_OTA + ota_slot
259262

260263
def __init__(self):
261264
self.name = ""

Diff for: tools/platformio-build.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@
151151
join(FRAMEWORK_DIR, "tools", "sdk", "include", "wifi_provisioning"),
152152
join(FRAMEWORK_DIR, "tools", "sdk", "include", "wpa_supplicant"),
153153
join(FRAMEWORK_DIR, "tools", "sdk", "include", "xtensa-debug-module"),
154+
join(FRAMEWORK_DIR, "tools", "sdk", "include", "esp32-camera"),
154155
join(FRAMEWORK_DIR, "cores", env.BoardConfig().get("build.core"))
155156
],
156157

@@ -160,7 +161,7 @@
160161
],
161162

162163
LIBS=[
163-
"-lgcc", "-lopenssl", "-lbtdm_app", "-lfatfs", "-lwps", "-lcoexist", "-lwear_levelling", "-lesp_http_client", "-lprotobuf-c", "-lhal", "-lnewlib", "-ldriver", "-lbootloader_support", "-lpp", "-lfreemodbus", "-lmesh", "-lsmartconfig", "-ljsmn", "-lwpa", "-lethernet", "-lphy", "-lapp_trace", "-lconsole", "-lulp", "-lwpa_supplicant", "-lfreertos", "-lbt", "-lmicro-ecc", "-lcxx", "-lxtensa-debug-module", "-ltcp_transport", "-lmdns", "-lvfs", "-lesp_ringbuf", "-lsoc", "-lcore", "-lsdmmc", "-llibsodium", "-lcoap", "-ltcpip_adapter", "-lprotocomm", "-lesp_event", "-lc_nano", "-lesp-tls", "-lasio", "-lrtc", "-lspi_flash", "-lwpa2", "-lwifi_provisioning", "-lesp32", "-lapp_update", "-lnghttp", "-lspiffs", "-lunity", "-lesp_https_server", "-lespnow", "-lnvs_flash", "-lesp_adc_cal", "-llog", "-lsmartconfig_ack", "-lexpat", "-lm", "-lmqtt", "-lc", "-lheap", "-lmbedtls", "-llwip", "-lnet80211", "-lesp_http_server", "-lpthread", "-ljson", "-lesp_https_ota", "-lstdc++"
164+
"-lgcc", "-lopenssl", "-lbtdm_app", "-lfatfs", "-lwps", "-lcoexist", "-lwear_levelling", "-lesp_http_client", "-lprotobuf-c", "-lhal", "-lnewlib", "-ldriver", "-lbootloader_support", "-lpp", "-lfreemodbus", "-lmesh", "-lsmartconfig", "-ljsmn", "-lwpa", "-lethernet", "-lphy", "-lapp_trace", "-lconsole", "-lulp", "-lwpa_supplicant", "-lfreertos", "-lbt", "-lmicro-ecc", "-lesp32-camera", "-lcxx", "-lxtensa-debug-module", "-ltcp_transport", "-lmdns", "-lvfs", "-lesp_ringbuf", "-lsoc", "-lcore", "-lsdmmc", "-llibsodium", "-lcoap", "-ltcpip_adapter", "-lprotocomm", "-lesp_event", "-lc_nano", "-lesp-tls", "-lasio", "-lrtc", "-lspi_flash", "-lwpa2", "-lwifi_provisioning", "-lesp32", "-lapp_update", "-lnghttp", "-lspiffs", "-lunity", "-lesp_https_server", "-lespnow", "-lnvs_flash", "-lesp_adc_cal", "-llog", "-lsmartconfig_ack", "-lexpat", "-lm", "-lmqtt", "-lc", "-lheap", "-lmbedtls", "-llwip", "-lnet80211", "-lesp_http_server", "-lpthread", "-ljson", "-lesp_https_ota", "-lstdc++"
164165
],
165166

166167
LIBSOURCE_DIRS=[

Diff for: tools/sdk/bin/bootloader_dio_40m.bin

144 Bytes
Binary file not shown.

Diff for: tools/sdk/bin/bootloader_dio_80m.bin

-1.34 KB
Binary file not shown.

Diff for: tools/sdk/bin/bootloader_dout_40m.bin

144 Bytes
Binary file not shown.

Diff for: tools/sdk/bin/bootloader_dout_80m.bin

128 Bytes
Binary file not shown.

Diff for: tools/sdk/bin/bootloader_qio_40m.bin

144 Bytes
Binary file not shown.

Diff for: tools/sdk/bin/bootloader_qio_80m.bin

144 Bytes
Binary file not shown.

Diff for: tools/sdk/bin/bootloader_qout_40m.bin

144 Bytes
Binary file not shown.

Diff for: tools/sdk/bin/bootloader_qout_80m.bin

144 Bytes
Binary file not shown.

Diff for: tools/sdk/include/app_update/esp_ota_ops.h

+25
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include <stddef.h>
2121
#include "esp_err.h"
2222
#include "esp_partition.h"
23+
#include "esp_image_format.h"
2324

2425
#ifdef __cplusplus
2526
extern "C"
@@ -41,6 +42,14 @@ extern "C"
4142
*/
4243
typedef uint32_t esp_ota_handle_t;
4344

45+
/**
46+
* @brief Return esp_app_desc structure. This structure includes app version.
47+
*
48+
* Return description for running app.
49+
* @return Pointer to esp_app_desc structure.
50+
*/
51+
const esp_app_desc_t *esp_ota_get_app_description(void);
52+
4453
/**
4554
* @brief Commence an OTA update writing to the specified partition.
4655
@@ -170,6 +179,22 @@ const esp_partition_t* esp_ota_get_running_partition(void);
170179
*/
171180
const esp_partition_t* esp_ota_get_next_update_partition(const esp_partition_t *start_from);
172181

182+
/**
183+
* @brief Returns esp_app_desc structure for app partition. This structure includes app version.
184+
*
185+
* Returns a description for the requested app partition.
186+
* @param[in] partition Pointer to app partition. (only app partition)
187+
* @param[out] app_desc Structure of info about app.
188+
* @return
189+
* - ESP_OK Successful.
190+
* - ESP_ERR_NOT_FOUND app_desc structure is not found. Magic word is incorrect.
191+
* - ESP_ERR_NOT_SUPPORTED Partition is not application.
192+
* - ESP_ERR_INVALID_ARG Arguments is NULL or if partition's offset exceeds partition size.
193+
* - ESP_ERR_INVALID_SIZE Read would go out of bounds of the partition.
194+
* - or one of error codes from lower-level flash driver.
195+
*/
196+
esp_err_t esp_ota_get_partition_description(const esp_partition_t *partition, esp_app_desc_t *app_desc);
197+
173198
#ifdef __cplusplus
174199
}
175200
#endif

Diff for: tools/sdk/include/bootloader_support/bootloader_common.h

+37-4
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
#pragma once
1616
#include "esp_flash_data_types.h"
17+
#include "esp_image_format.h"
1718

1819
/// Type of hold a GPIO in low state
1920
typedef enum {
@@ -23,21 +24,29 @@ typedef enum {
2324
} esp_comm_gpio_hold_t;
2425

2526
/**
26-
* @brief Calculate crc for the OTA data partition.
27+
* @brief Calculate crc for the OTA data select.
2728
*
28-
* @param[in] ota_data The OTA data partition.
29+
* @param[in] s The OTA data select.
2930
* @return Returns crc value.
3031
*/
3132
uint32_t bootloader_common_ota_select_crc(const esp_ota_select_entry_t *s);
3233

3334
/**
34-
* @brief Verifies the validity of the OTA data partition
35+
* @brief Verifies the validity of the OTA data select
3536
*
36-
* @param[in] ota_data The OTA data partition.
37+
* @param[in] s The OTA data select.
3738
* @return Returns true on valid, false otherwise.
3839
*/
3940
bool bootloader_common_ota_select_valid(const esp_ota_select_entry_t *s);
4041

42+
/**
43+
* @brief Returns true if OTADATA is not marked as bootable partition.
44+
*
45+
* @param[in] s The OTA data select.
46+
* @return Returns true if OTADATA invalid, false otherwise.
47+
*/
48+
bool bootloader_common_ota_select_invalid(const esp_ota_select_entry_t *s);
49+
4150
/**
4251
* @brief Check if the GPIO input is a long hold or a short hold.
4352
*
@@ -91,3 +100,27 @@ bool bootloader_common_label_search(const char *list, char *label);
91100
* - ESP_FAIL: An allocation error occurred.
92101
*/
93102
esp_err_t bootloader_common_get_sha256_of_partition(uint32_t address, uint32_t size, int type, uint8_t *out_sha_256);
103+
104+
/**
105+
* @brief Returns the number of active otadata.
106+
*
107+
* @param[in] two_otadata Pointer on array from two otadata structures.
108+
*
109+
* @return The number of active otadata (0 or 1).
110+
* - -1: If it does not have active otadata.
111+
*/
112+
int bootloader_common_get_active_otadata(esp_ota_select_entry_t *two_otadata);
113+
114+
/**
115+
* @brief Returns esp_app_desc structure for app partition. This structure includes app version.
116+
*
117+
* Returns a description for the requested app partition.
118+
* @param[in] partition App partition description.
119+
* @param[out] app_desc Structure of info about app.
120+
* @return
121+
* - ESP_OK: Successful.
122+
* - ESP_ERR_INVALID_ARG: The arguments passed are not valid.
123+
* - ESP_ERR_NOT_FOUND: app_desc structure is not found. Magic word is incorrect.
124+
* - ESP_FAIL: mapping is fail.
125+
*/
126+
esp_err_t bootloader_common_get_partition_description(const esp_partition_pos_t *partition, esp_app_desc_t *app_desc);

Diff for: tools/sdk/include/bootloader_support/esp_image_format.h

+19
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,25 @@ typedef struct {
8989
uint32_t data_len;
9090
} esp_image_segment_header_t;
9191

92+
#define ESP_APP_DESC_MAGIC_WORD 0xABCD5432 /*!< The magic word for the esp_app_desc structure that is in DROM. */
93+
94+
/**
95+
* @brief Description about application.
96+
*/
97+
typedef struct {
98+
uint32_t magic_word; /*!< Magic word ESP_APP_DESC_MAGIC_WORD */
99+
uint32_t secure_version; /*!< Secure version */
100+
uint32_t reserv1[2]; /*!< --- */
101+
char version[32]; /*!< Application version */
102+
char project_name[32]; /*!< Project name */
103+
char time[16]; /*!< Compile time */
104+
char date[16]; /*!< Compile date*/
105+
char idf_ver[32]; /*!< Version IDF */
106+
uint8_t app_elf_sha256[32]; /*!< sha256 of elf file */
107+
uint32_t reserv2[20]; /*!< --- */
108+
} esp_app_desc_t;
109+
_Static_assert(sizeof(esp_app_desc_t) == 256, "esp_app_desc_t should be 256 bytes");
110+
92111
#define ESP_IMAGE_MAX_SEGMENTS 16
93112

94113
/* Structure to hold on-flash image metadata */

Diff for: tools/sdk/include/bt/esp_bt.h

-1
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,6 @@ esp_err_t esp_bt_mem_release(esp_bt_mode_t mode);
405405
*
406406
* For ORIG mode:
407407
* Bluetooth modem sleep is enabled in controller start up by default if CONFIG_BTDM_CONTROLLER_MODEM_SLEEP is set and "ORIG mode" is selected. In ORIG modem sleep mode, bluetooth controller will switch off some components and pause to work every now and then, if there is no event to process; and wakeup according to the scheduled interval and resume the work. It can also wakeup earlier upon external request using function "esp_bt_controller_wakeup_request".
408-
* Note that currently there is problem in the combination use of bluetooth modem sleep and Dynamic Frequency Scaling(DFS). So do not enable DFS if bluetooth modem sleep is in use.
409408
*
410409
* @return
411410
* - ESP_OK : success

Diff for: tools/sdk/include/config/sdkconfig.h

+5
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
#define CONFIG_MBEDTLS_PEM_WRITE_C 1
6464
#define CONFIG_BT_SPP_ENABLED 1
6565
#define CONFIG_BT_RESERVE_DRAM 0xdb5c
66+
#define CONFIG_APP_COMPILE_TIME_DATE 1
6667
#define CONFIG_CXX_EXCEPTIONS 1
6768
#define CONFIG_FATFS_FS_LOCK 0
6869
#define CONFIG_IP_LOST_TIMER_INTERVAL 120
@@ -76,6 +77,7 @@
7677
#define CONFIG_SPIRAM_SUPPORT 1
7778
#define CONFIG_LWIP_MAX_SOCKETS 10
7879
#define CONFIG_LWIP_NETIF_LOOPBACK 1
80+
#define CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT "pthread"
7981
#define CONFIG_EMAC_TASK_PRIORITY 20
8082
#define CONFIG_TIMER_TASK_STACK_DEPTH 2048
8183
#define CONFIG_TCP_MSS 1436
@@ -201,6 +203,7 @@
201203
#define CONFIG_MB_QUEUE_LENGTH 20
202204
#define CONFIG_SW_COEXIST_PREFERENCE_VALUE 0
203205
#define CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA 1
206+
#define CONFIG_OV2640_SUPPORT 1
204207
#define CONFIG_FREERTOS_TASK_FUNCTION_WRAPPER 1
205208
#define CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_PSK 1
206209
#define CONFIG_PPP_SUPPORT 1
@@ -270,8 +273,10 @@
270273
#define CONFIG_MBEDTLS_TLS_CLIENT 1
271274
#define CONFIG_BTDM_CONTROLLER_HCI_MODE_VHCI 1
272275
#define CONFIG_BT_ENABLED 1
276+
#define CONFIG_ESP32_DEFAULT_PTHREAD_CORE_NO_AFFINITY 1
273277
#define CONFIG_MBEDTLS_ECP_DP_SECP256R1_ENABLED 1
274278
#define CONFIG_MONITOR_BAUD 115200
279+
#define CONFIG_ESP32_PTHREAD_TASK_CORE_DEFAULT -1
275280
#define CONFIG_ESP32_DEBUG_STUBS_ENABLE 1
276281
#define CONFIG_TCPIP_LWIP 1
277282
#define CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST 1

Diff for: tools/sdk/include/driver/driver/spi_slave.h

+4-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,10 @@ struct spi_slave_transaction_t {
7373
size_t length; ///< Total data length, in bits
7474
size_t trans_len; ///< Transaction data length, in bits
7575
const void *tx_buffer; ///< Pointer to transmit buffer, or NULL for no MOSI phase
76-
void *rx_buffer; ///< Pointer to receive buffer, or NULL for no MISO phase
76+
void *rx_buffer; /**< Pointer to receive buffer, or NULL for no MISO phase.
77+
* When the DMA is anabled, must start at WORD boundary (``rx_buffer%4==0``),
78+
* and has length of a multiple of 4 bytes.
79+
*/
7780
void *user; ///< User-defined variable. Can be used to store eg transaction ID.
7881
};
7982

0 commit comments

Comments
 (0)