This commit is contained in:
0x1abin
2018-03-16 17:10:39 +08:00
parent d7508f0ceb
commit fe71b9be40
2 changed files with 3 additions and 16 deletions
+1 -2
View File
@@ -97,7 +97,7 @@ CONFIG_MICROPY_USE_TASK_WDT=y
CONFIG_MICROPY_USE_BOTH_CORES=
CONFIG_MICROPY_TASK_PRIORITY=5
CONFIG_MICROPY_STACK_SIZE=20
CONFIG_MICROPY_HEAP_SIZE=80
CONFIG_MICROPY_HEAP_SIZE=96
CONFIG_MICROPY_THREAD_MAX_THREADS=4
CONFIG_MICROPY_THREAD_STACK_SIZE=4
CONFIG_MICROPY_USE_TELNET=y
@@ -130,7 +130,6 @@ CONFIG_MICROPY_USE_MDNS=y
CONFIG_MICROPY_USE_CURL=y
CONFIG_MICROPY_USE_CURL_TLS=y
CONFIG_MICROPY_USE_CURLFTP=
CONFIG_MICROPY_USE_MAIL=y
CONFIG_MICROPY_USE_SSH=y
CONFIG_MICROPY_USE_MQTT=y
@@ -96,10 +96,10 @@ CONFIG_MICROPY_RX_BUFFER_SIZE=1080
CONFIG_MICROPY_USE_TASK_WDT=y
CONFIG_MICROPY_USE_BOTH_CORES=
CONFIG_MICROPY_TASK_PRIORITY=5
CONFIG_MICROPY_STACK_SIZE=30
CONFIG_MICROPY_STACK_SIZE=32
CONFIG_MICROPY_HEAP_SIZE=3072
CONFIG_MICROPY_THREAD_MAX_THREADS=6
CONFIG_MICROPY_THREAD_STACK_SIZE=8
CONFIG_MICROPY_THREAD_STACK_SIZE=6
CONFIG_MICROPY_USE_TELNET=y
CONFIG_MICROPY_USE_WEBSERVER=
CONFIG_MICROPY_USE_FTPSERVER=y
@@ -130,7 +130,6 @@ CONFIG_MICROPY_USE_MDNS=y
CONFIG_MICROPY_USE_CURL=y
CONFIG_MICROPY_USE_CURL_TLS=y
CONFIG_MICROPY_USE_CURLFTP=
CONFIG_MICROPY_USE_MAIL=y
CONFIG_MICROPY_USE_SSH=y
CONFIG_MICROPY_USE_MQTT=y
@@ -243,11 +242,7 @@ CONFIG_SPIRAM_SIZE=4194304
CONFIG_SPIRAM_SPEED_40M=y
CONFIG_SPIRAM_MEMTEST=y
CONFIG_SPIRAM_CACHE_WORKAROUND=y
<<<<<<< HEAD
CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST=
=======
CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST=y
>>>>>>> master
CONFIG_MEMMAP_TRACEMEM=
CONFIG_MEMMAP_TRACEMEM_TWOBANKS=
CONFIG_ESP32_TRAX=
@@ -323,17 +318,10 @@ CONFIG_COMPATIBLE_PRE_V2_1_BOOTLOADERS=
#
CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=8
CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=16
<<<<<<< HEAD
CONFIG_ESP32_WIFI_STATIC_TX_BUFFER=
CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER=y
CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=1
CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=16
=======
CONFIG_ESP32_WIFI_STATIC_TX_BUFFER=y
CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER=
CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=0
CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM=16
>>>>>>> master
CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y
CONFIG_ESP32_WIFI_TX_BA_WIN=6
CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y