Skip to content

Commit 530e920

Browse files
committed
Merge branch 'feature/add_esp_peer_v1.2.6' into 'main'
esp_peer: Add v1.2.6 See merge request adf/esp-webrtc-solution!52
2 parents b13eaf0 + 0377b3d commit 530e920

File tree

7 files changed

+4
-1
lines changed

7 files changed

+4
-1
lines changed

components/esp_peer/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
- Added `msid` support in SDP
88
- Fixed padding issue of TURN server relay packet
99
- Fixed race condition for SCTP reference count
10+
- Fixed wrong fingerprint error log output
1011

1112
### Features
1213

1.03 KB
Binary file not shown.
1.01 KB
Binary file not shown.
640 Bytes
Binary file not shown.
1.01 KB
Binary file not shown.
1.02 KB
Binary file not shown.

solutions/common/sys_state.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111
#include "freertos/FreeRTOS.h"
1212
#include "freertos/task.h"
1313
#include "esp_log.h"
14+
#ifndef CONFIG_HEAP_TRACING_OFF
1415
#include "esp_heap_trace.h"
16+
#endif
1517
#include "esp_heap_caps.h"
1618
#include "sys_state.h"
1719
#include "esp_idf_version.h"
@@ -115,7 +117,7 @@ void sys_state_show()
115117

116118
void sys_state_heap_trace(bool start)
117119
{
118-
#if CONFIG_IDF_TARGET_ESP32S3
120+
#if (defined CONFIG_IDF_TARGET_ESP32S3) && (!defined CONFIG_HEAP_TRACING_OFF)
119121
static heap_trace_record_t *trace_record;
120122
if (trace_record == NULL) {
121123
trace_record = heap_caps_malloc(NUM_RECORDS * sizeof(heap_trace_record_t), MALLOC_CAP_SPIRAM);

0 commit comments

Comments
 (0)