Skip to content

Commit 232c306

Browse files
authored
Merge branch 'master' into patch-1
2 parents 074476e + 1c01fcd commit 232c306

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

libraries/ESP32/examples/Camera/CameraWebServer/app_httpd.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,8 @@ static esp_err_t stream_handler(httpd_req_t *req) {
281281
int64_t fr_end = esp_timer_get_time();
282282

283283
int64_t frame_time = fr_end - last_frame;
284+
last_frame = fr_end;
285+
284286
frame_time /= 1000;
285287
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_INFO
286288
uint32_t avg_frame_time = ra_filter_run(&ra_filter, frame_time);

tests/validation/uart/uart.ino

+2-1
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,8 @@ void auto_baudrate_test(void) {
399399

400400
if (TEST_UART_NUM == 1) {
401401
selected_serial = &Serial1;
402-
uart_internal_loopback(0, RX1);
402+
// UART1 pins were swapped because of ESP32-P4
403+
uart_internal_loopback(0, /*RX1*/ TX1);
403404
} else {
404405
#ifdef RX2
405406
selected_serial = &Serial2;

0 commit comments

Comments
 (0)