Skip to content

Commit 505926c

Browse files
committed
IDF master 58022f859
1 parent c5a1f3e commit 505926c

File tree

75 files changed

+199
-53
lines changed

Some content is hidden

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

75 files changed

+199
-53
lines changed

platform.txt

Lines changed: 3 additions & 3 deletions
Large diffs are not rendered by default.

tools/platformio-build-esp32.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@
176176
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "espcoredump", "include", "port", "xtensa"),
177177
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "wpa_supplicant", "include"),
178178
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "wpa_supplicant", "port", "include"),
179-
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "wpa_supplicant", "include", "esp_supplicant"),
179+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "wpa_supplicant", "esp_supplicant", "include"),
180180
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "ieee802154", "include"),
181181
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "asio", "asio", "asio", "include"),
182182
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "asio", "port", "include"),
@@ -295,7 +295,7 @@
295295
"UNITY_INCLUDE_CONFIG_H",
296296
"WITH_POSIX",
297297
"_GNU_SOURCE",
298-
("IDF_VER", '\\"v4.4-dev-2313-gc69f0ec32\\"'),
298+
("IDF_VER", '\\"v4.4-dev-2359-g58022f859\\"'),
299299
"ESP_PLATFORM",
300300
"ARDUINO_ARCH_ESP32",
301301
"ESP32",

tools/platformio-build-esp32c3.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@
202202
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "espcoredump", "include", "port", "riscv"),
203203
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "wpa_supplicant", "include"),
204204
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "wpa_supplicant", "port", "include"),
205-
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "wpa_supplicant", "include", "esp_supplicant"),
205+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "wpa_supplicant", "esp_supplicant", "include"),
206206
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "ieee802154", "include"),
207207
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "asio", "asio", "asio", "include"),
208208
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "asio", "port", "include"),
@@ -281,7 +281,7 @@
281281
"UNITY_INCLUDE_CONFIG_H",
282282
"WITH_POSIX",
283283
"_GNU_SOURCE",
284-
("IDF_VER", '\\"v4.4-dev-2313-gc69f0ec32\\"'),
284+
("IDF_VER", '\\"v4.4-dev-2359-g58022f859\\"'),
285285
"ESP_PLATFORM",
286286
"ARDUINO_ARCH_ESP32",
287287
"ESP32",

tools/platformio-build-esp32s2.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@
171171
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "espcoredump", "include", "port", "xtensa"),
172172
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "wpa_supplicant", "include"),
173173
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "wpa_supplicant", "port", "include"),
174-
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "wpa_supplicant", "include", "esp_supplicant"),
174+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "wpa_supplicant", "esp_supplicant", "include"),
175175
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "ieee802154", "include"),
176176
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "asio", "asio", "asio", "include"),
177177
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "asio", "port", "include"),
@@ -281,7 +281,7 @@
281281
"UNITY_INCLUDE_CONFIG_H",
282282
"WITH_POSIX",
283283
"_GNU_SOURCE",
284-
("IDF_VER", '\\"v4.4-dev-2313-gc69f0ec32\\"'),
284+
("IDF_VER", '\\"v4.4-dev-2359-g58022f859\\"'),
285285
"ESP_PLATFORM",
286286
"ARDUINO_ARCH_ESP32",
287287
"ESP32",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -690,5 +690,5 @@
690690
#define CONFIG_ULP_COPROC_ENABLED CONFIG_ESP32_ULP_COPROC_ENABLED
691691
#define CONFIG_ULP_COPROC_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
692692
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
693-
#define CONFIG_ARDUINO_IDF_COMMIT "c69f0ec32"
693+
#define CONFIG_ARDUINO_IDF_COMMIT "58022f859"
694694
#define CONFIG_ARDUINO_IDF_BRANCH "master"

tools/sdk/esp32/include/esp32-camera/driver/include/esp_camera.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,14 @@ typedef enum {
8383
CAMERA_GRAB_LATEST /*!< Except when 1 frame buffer is used, queue will always contain the last 'fb_count' frames */
8484
} camera_grab_mode_t;
8585

86+
/**
87+
* @brief Camera frame buffer location
88+
*/
89+
typedef enum {
90+
CAMERA_FB_IN_PSRAM, /*!< Frame buffer is placed in external PSRAM */
91+
CAMERA_FB_IN_DRAM /*!< Frame buffer is placed in internal DRAM */
92+
} camera_fb_location_t;
93+
8694
/**
8795
* @brief Configuration structure for camera initialization
8896
*/
@@ -114,6 +122,7 @@ typedef struct {
114122

115123
int jpeg_quality; /*!< Quality of JPEG output. 0-63 lower means higher quality */
116124
size_t fb_count; /*!< Number of frame buffers to be allocated. If more than one, then each frame will be acquired (double speed) */
125+
camera_fb_location_t fb_location; /*!< The location where the frame buffer will be allocated */
117126
camera_grab_mode_t grab_mode; /*!< When buffers should be filled */
118127
} camera_config_t;
119128

tools/sdk/esp32/include/idf_test/include/idf_performance.h

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,20 @@
5050
#define IDF_PERFORMANCE_MIN_UDP_TX_THROUGHPUT 50
5151
#endif
5252

53+
// throughput performance by ethernet iperf
54+
#ifndef IDF_PERFORMANCE_MIN_TCP_RX_ETH_THROUGHPUT
55+
#define IDF_PERFORMANCE_MIN_TCP_RX_ETH_THROUGHPUT 20
56+
#endif
57+
#ifndef IDF_PERFORMANCE_MIN_TCP_TX_ETH_THROUGHPUT
58+
#define IDF_PERFORMANCE_MIN_TCP_TX_ETH_THROUGHPUT 30
59+
#endif
60+
#ifndef IDF_PERFORMANCE_MIN_UDP_RX_ETH_THROUGHPUT
61+
#define IDF_PERFORMANCE_MIN_UDP_RX_ETH_THROUGHPUT 50
62+
#endif
63+
#ifndef IDF_PERFORMANCE_MIN_UDP_TX_ETH_THROUGHPUT
64+
#define IDF_PERFORMANCE_MIN_UDP_TX_ETH_THROUGHPUT 70
65+
#endif
66+
5367
// events dispatched per second by event loop library
5468
#ifndef IDF_PERFORMANCE_MIN_EVENT_DISPATCH
5569
#define IDF_PERFORMANCE_MIN_EVENT_DISPATCH 25000

0 commit comments

Comments
 (0)