Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit e8311b0

Browse files
authoredMar 10, 2021
IDF release/v3.3 0bfff0b25 (#4895)
esp-face: master 420fc7e esp32-camera: master 770f26a
1 parent 4d95e3a commit e8311b0

Some content is hidden

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

78 files changed

+8
-7
lines changed
 

‎tools/platformio-build.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@
170170
],
171171

172172
LIBS=[
173-
"-lgcc", "-lapp_trace", "-llibsodium", "-lbt", "-lesp-tls", "-lmdns", "-lconsole", "-ljsmn", "-lesp_ringbuf", "-lpthread", "-ldriver", "-ldetection", "-lsoc", "-lc", "-lmesh", "-lwpa2", "-ljson", "-ldl", "-lwear_levelling", "-lmicro-ecc", "-lcoexist", "-lface_detection", "-lnvs_flash", "-lwifi_provisioning", "-lfr", "-lnghttp", "-lesp32", "-lnet80211", "-lesp_http_server", "-ltcp_transport", "-llog", "-lespnow", "-lhal", "-lmqtt", "-lesp_websocket_client", "-lesp_http_client", "-lvfs", "-lbtdm_app", "-lapp_update", "-lpe", "-lprotocomm", "-lwps", "-lsdmmc", "-lesp_adc_cal", "-lwpa", "-lefuse", "-lcoap", "-lsmartconfig", "-limage_util", "-lspiffs", "-lulp", "-lunity", "-lface_recognition", "-lesp_https_server", "-lethernet", "-lspi_flash", "-lpp", "-lexpat", "-lfatfs", "-ltcpip_adapter", "-llwip", "-lcxx", "-lfreertos", "-lesp32-camera", "-lmbedtls", "-ldetection_cat_face", "-lm", "-lc_nano", "-lesp_event", "-lnewlib", "-lcore", "-lopenssl", "-lsmartconfig_ack", "-lwpa_supplicant", "-lbootloader_support", "-lasio", "-lesp_https_ota", "-lod", "-lespcoredump", "-lheap", "-lrtc", "-lprotobuf-c", "-lfb_gfx", "-lfreemodbus", "-lfd", "-lphy", "-lxtensa-debug-module", "-lstdc++"
173+
"-lgcc", "-ltcp_transport", "-lc", "-llog", "-lapp_update", "-llibsodium", "-lfatfs", "-lsmartconfig", "-lfd", "-lcore", "-limage_util", "-lpe", "-lulp", "-lsdmmc", "-lesp32", "-lesp_https_server", "-lasio", "-lesp_event", "-lfr", "-llwip", "-lmicro-ecc", "-ldetection_cat_face", "-lbootloader_support", "-lesp_http_server", "-lethernet", "-lpthread", "-lfreertos", "-lapp_trace", "-ljson", "-lface_recognition", "-ldl", "-lfreemodbus", "-lnvs_flash", "-lhal", "-lspiffs", "-lmdns", "-lmqtt", "-lunity", "-lheap", "-lsoc", "-lefuse", "-ldetection", "-lcoap", "-lcxx", "-lfb_gfx", "-lesp_websocket_client", "-lprotocomm", "-lwear_levelling", "-lesp-tls", "-lnet80211", "-lnghttp", "-lmbedtls", "-ltcpip_adapter", "-lespnow", "-lespcoredump", "-ljsmn", "-lc_nano", "-lesp_ringbuf", "-lpp", "-lexpat", "-lm", "-lface_detection", "-lmesh", "-lxtensa-debug-module", "-lrtc", "-lphy", "-ldriver", "-lod", "-lopenssl", "-lwpa", "-lwifi_provisioning", "-lwpa_supplicant", "-lesp_http_client", "-lnewlib", "-lconsole", "-lesp_https_ota", "-lprotobuf-c", "-lesp_adc_cal", "-lcoexist", "-lwps", "-lesp32-camera", "-lbtdm_app", "-lwpa2", "-lvfs", "-lsmartconfig_ack", "-lspi_flash", "-lbt", "-lstdc++"
174174
],
175175

176176
LIBSOURCE_DIRS=[

‎tools/sdk/include/config/sdkconfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -396,5 +396,5 @@
396396
#define CONFIG_BTDM_MODEM_SLEEP_MODE_ORIG 1
397397
#define CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL_ERROR 1
398398
#define CONFIG_FATFS_API_ENCODING_ANSI_OEM 1
399-
#define CONFIG_ARDUINO_IDF_COMMIT "7a85334d8"
399+
#define CONFIG_ARDUINO_IDF_COMMIT "0bfff0b25"
400400
#define CONFIG_ARDUINO_IDF_BRANCH "release/v3.3"

‎tools/sdk/include/esp32-camera/img_converters.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ bool frame2jpg_cb(camera_fb_t * fb, uint8_t quality, jpg_out_cb cb, void * arg);
6262
* @param height Height in pixels of the source image
6363
* @param format Format of the source image
6464
* @param quality JPEG quality of the resulting image
65-
* @param out Pointer to be populated with the address of the resulting buffer
65+
* @param out Pointer to be populated with the address of the resulting buffer.
66+
* You MUST free the pointer once you are done with it.
6667
* @param out_len Pointer to be populated with the length of the output buffer
6768
*
6869
* @return true on success
There was a problem loading the remainder of the diff.

0 commit comments

Comments
 (0)
Failed to load comments.