Skip to content

Commit fe71b9b

Browse files
0x1abin0x1abin
committed
v0.3.7
1 parent d7508f0 commit fe71b9b

2 files changed

Lines changed: 3 additions & 16 deletions

File tree

‎MicroPython_BUILD/firmware/esp32/sdkconfig‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ CONFIG_MICROPY_USE_TASK_WDT=y
9797
CONFIG_MICROPY_USE_BOTH_CORES=
9898
CONFIG_MICROPY_TASK_PRIORITY=5
9999
CONFIG_MICROPY_STACK_SIZE=20
100-
CONFIG_MICROPY_HEAP_SIZE=80
100+
CONFIG_MICROPY_HEAP_SIZE=96
101101
CONFIG_MICROPY_THREAD_MAX_THREADS=4
102102
CONFIG_MICROPY_THREAD_STACK_SIZE=4
103103
CONFIG_MICROPY_USE_TELNET=y
@@ -130,7 +130,6 @@ CONFIG_MICROPY_USE_MDNS=y
130130
CONFIG_MICROPY_USE_CURL=y
131131
CONFIG_MICROPY_USE_CURL_TLS=y
132132
CONFIG_MICROPY_USE_CURLFTP=
133-
CONFIG_MICROPY_USE_MAIL=y
134133
CONFIG_MICROPY_USE_SSH=y
135134
CONFIG_MICROPY_USE_MQTT=y
136135

‎MicroPython_BUILD/firmware/esp32_psram/sdkconfig‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,10 @@ CONFIG_MICROPY_RX_BUFFER_SIZE=1080
9696
CONFIG_MICROPY_USE_TASK_WDT=y
9797
CONFIG_MICROPY_USE_BOTH_CORES=
9898
CONFIG_MICROPY_TASK_PRIORITY=5
99-
CONFIG_MICROPY_STACK_SIZE=30
99+
CONFIG_MICROPY_STACK_SIZE=32
100100
CONFIG_MICROPY_HEAP_SIZE=3072
101101
CONFIG_MICROPY_THREAD_MAX_THREADS=6
102-
CONFIG_MICROPY_THREAD_STACK_SIZE=8
102+
CONFIG_MICROPY_THREAD_STACK_SIZE=6
103103
CONFIG_MICROPY_USE_TELNET=y
104104
CONFIG_MICROPY_USE_WEBSERVER=
105105
CONFIG_MICROPY_USE_FTPSERVER=y
@@ -130,7 +130,6 @@ CONFIG_MICROPY_USE_MDNS=y
130130
CONFIG_MICROPY_USE_CURL=y
131131
CONFIG_MICROPY_USE_CURL_TLS=y
132132
CONFIG_MICROPY_USE_CURLFTP=
133-
CONFIG_MICROPY_USE_MAIL=y
134133
CONFIG_MICROPY_USE_SSH=y
135134
CONFIG_MICROPY_USE_MQTT=y
136135

@@ -243,11 +242,7 @@ CONFIG_SPIRAM_SIZE=4194304
243242
CONFIG_SPIRAM_SPEED_40M=y
244243
CONFIG_SPIRAM_MEMTEST=y
245244
CONFIG_SPIRAM_CACHE_WORKAROUND=y
246-
<<<<<<< HEAD
247245
CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST=
248-
=======
249-
CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST=y
250-
>>>>>>> master
251246
CONFIG_MEMMAP_TRACEMEM=
252247
CONFIG_MEMMAP_TRACEMEM_TWOBANKS=
253248
CONFIG_ESP32_TRAX=
@@ -323,17 +318,10 @@ CONFIG_COMPATIBLE_PRE_V2_1_BOOTLOADERS=
323318
#
324319
CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=8
325320
CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=16
326-
<<<<<<< HEAD
327321
CONFIG_ESP32_WIFI_STATIC_TX_BUFFER=
328322
CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER=y
329323
CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=1
330324
CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=16
331-
=======
332-
CONFIG_ESP32_WIFI_STATIC_TX_BUFFER=y
333-
CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER=
334-
CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=0
335-
CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM=16
336-
>>>>>>> master
337325
CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y
338326
CONFIG_ESP32_WIFI_TX_BA_WIN=6
339327
CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y

0 commit comments

Comments
 (0)