Преглед на файлове

Merge remote-tracking branch 'origin/WiFi-Manager' into WiFi-Manager

Conflicts:
	components/wifi-manager/http_server.c
Sebastien преди 5 години
родител
ревизия
c84c663848
променени са 3 файла, в които са добавени 11 реда и са изтрити 5 реда
  1. 1 1
      components/wifi-manager/index.html
  2. 8 0
      components/wifi-manager/style.css
  3. 2 4
      sdkconfig.defaults

+ 1 - 1
components/wifi-manager/index.html

@@ -184,7 +184,7 @@ function handleClick(cb) {
                     <div id="autoexec-command">
                         <h2>Command to run</h2>
                         <section id="command-list">
-                            <input id="autoexec1" type="text" size="50" maxlength="201" value="squeezelite -o I2S -b 500:2000 -d all=info" />
+                            <textarea id="autoexec1" maxlength="120">squeezelite -o I2S -b 500:2000 -d all=info -M esp32</textarea>
                         </section>
                     </div>
 

+ 8 - 0
components/wifi-manager/style.css

@@ -265,6 +265,9 @@ h3 {
 	position: absolute;
 	cursor: pointer;
 	top: 1.5em;
+
+    left: 8px;
+
 	width: 4em;
 	height: 2em;
 	background-color: #c32e04;
@@ -343,3 +346,8 @@ input#ota {
 #otadiv {
     margin-bottom: 15px;
 }
+
+textarea#autoexec1 {
+    width: 100%;
+}
+

+ 2 - 4
sdkconfig.defaults

@@ -77,10 +77,9 @@ CONFIG_SPIRAM_SIZE=-1
 CONFIG_SPIRAM_SPEED_80M=y
 CONFIG_SPIRAM_MEMTEST=y
 CONFIG_SPIRAM_CACHE_WORKAROUND=y
-CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=256
-CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=65536
+CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=512
+CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=32768
 CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=y
-CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y
 CONFIG_SPIRAM_OCCUPY_VSPI_HOST=y
 CONFIG_SPIRAM_BANKSWITCH_ENABLE=n
 CONFIG_D0WD_PSRAM_CLK_IO=17
@@ -114,7 +113,6 @@ CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER=20
 CONFIG_ESP32_PHY_MAX_TX_POWER=20
 CONFIG_FREERTOS_HZ=100
 CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32
-CONFIG_LWIP_UDP_RECVMBOX_SIZE=32
 CONFIG_LWIP_NETIF_LOOPBACK=y
 CONFIG_LWIP_TCP_MSL=60000
 CONFIG_LWIP_TCP_SND_BUF_DEFAULT=8192