diff --git a/components/services/monitor.c b/components/services/monitor.c index 124e0e5a..4f95d951 100644 --- a/components/services/monitor.c +++ b/components/services/monitor.c @@ -237,7 +237,7 @@ void monitor_svc_init(void) { monitor_timer = xTimerCreate("monitor", MONITOR_TIMER / portTICK_RATE_MS, pdTRUE, NULL, monitor_callback); xTimerStart(monitor_timer, portMAX_DELAY); } - free(p); + FREE_AND_NULL(p); ESP_LOGI(TAG, "Heap internal:%zu (min:%zu) external:%zu (min:%zu)", heap_caps_get_free_size(MALLOC_CAP_INTERNAL), diff --git a/components/wifi-manager/code.js b/components/wifi-manager/code.js index 890b3f8d..803071b9 100644 --- a/components/wifi-manager/code.js +++ b/components/wifi-manager/code.js @@ -1243,8 +1243,9 @@ function getCommands() { } function getConfig() { - $.getJSON("/config.json", function(data) { - Object.keys(data.hasOwnProperty('config') ? data.config : data).sort().forEach(function(key, i) { + $.getJSON("/config.json", function(entries) { + data = entries.hasOwnProperty('config') ? entries.config : entries; + Object.keys(data).sort().forEach(function(key, i) { if (data.hasOwnProperty(key)) { if (key == 'autoexec') { if (data["autoexec"].value === "1") { @@ -1280,9 +1281,9 @@ function getConfig() { } }); $("tbody#nvsTable").append(""); - if (data.hasOwnProperty('gpio')) { - data.gpio.forEach(function(gpio_entry) { - cl = gpio_entry.fixed ? "table-light" : "table-dark"; + if (entries.hasOwnProperty('gpio')) { + entries.gpio.forEach(function(gpio_entry) { + cl = gpio_entry.fixed ? "table-secondary" : "table-primary"; $("tbody#gpiotable").append('' + gpio_entry.group + '' + gpio_entry.name + '' + gpio_entry.gpio + '' + (gpio_entry.fixed ? 'Fixed':'Configuration') + ''); }); } diff --git a/components/wifi-manager/index.development.html b/components/wifi-manager/index.development.html index 1f8018b2..73f2154c 100644 --- a/components/wifi-manager/index.development.html +++ b/components/wifi-manager/index.development.html @@ -207,6 +207,7 @@
+
diff --git a/components/wifi-manager/index.html b/components/wifi-manager/index.html index 3d0e27b4..83909343 100644 --- a/components/wifi-manager/index.html +++ b/components/wifi-manager/index.html @@ -1 +1 @@ -esp32-wifi-manager

Connected to:

Manual connect

ADD (HIDDEN) SSID

or choose a network...

Enter Details

DHCP host name

Manual Connection

Connect to network

DHCP host name

Password for

Please wait...

Connecting to

You may lose wifi access while the esp32 recalibrates its radio. Please wait until your device automatically reconnects. This can take up to 30s.

Success!

Connection failed

Please double-check wifi password if any and make sure the access point has good signal.

IP Address

IP Address:
Subnet Mask:
Default Gateway:

Are you sure you would like to disconnect from this wifi?

Audio output

Player name

Optional setting (e.g. for LMS IP address)

Squeezelite command to run

Start Squeezelite (toggle to activate changes)


Check for firmware upgrade

Firmware versionRelease dateHW platformIDF versionBranchFlash this FW

Firmware URL:

OR

0%
Logs
TimestampMessage
Pin Assignments
DevicePin NameGPIO NumberType
KeyValue

squeezelite-esp32, © 2020, philippe44, sle118, daduke
Licensed under the GPL

This app would not be possible without the following libraries:

  • squeezelite, © 2012-2019, Adrian Smith and Ralph Irving. Licensed under the GPL License.
  • esp32-wifi-manager, © 2017-2019, Tony Pottier. Licensed under the MIT License.
  • SpinKit, © 2015, Tobias Ahlin. Licensed under the MIT License.
  • jQuery, The jQuery Foundation. Licensed under the MIT License.
  • cJSON, © 2009-2017, Dave Gamble and cJSON contributors. Licensed under the MIT License.
  • esp32-rotary-encoder, © 2011-2019, David Antliff and Ben Buxton. Licensed under the GPL License.
  • tarablessd1306, © 2017-2018, Tara Keeling. Licensed under the MIT license.

Show NVS Editor

Show Advanced Commands

\ No newline at end of file +esp32-wifi-manager

Connected to:

Manual connect

ADD (HIDDEN) SSID

or choose a network...

Enter Details

DHCP host name

Manual Connection

Connect to network

DHCP host name

Password for

Please wait...

Connecting to

You may lose wifi access while the esp32 recalibrates its radio. Please wait until your device automatically reconnects. This can take up to 30s.

Success!

Connection failed

Please double-check wifi password if any and make sure the access point has good signal.

IP Address

IP Address:
Subnet Mask:
Default Gateway:

Are you sure you would like to disconnect from this wifi?

Audio output

Player name

Optional setting (e.g. for LMS IP address)

Squeezelite command to run

Start Squeezelite (toggle to activate changes)


Check for firmware upgrade

Firmware versionRelease dateHW platformIDF versionBranchFlash this FW

Firmware URL:

OR

0%
Logs
TimestampMessage
Pin Assignments
DevicePin NameGPIO NumberType
KeyValue

squeezelite-esp32, © 2020, philippe44, sle118, daduke
Licensed under the GPL

This app would not be possible without the following libraries:

  • squeezelite, © 2012-2019, Adrian Smith and Ralph Irving. Licensed under the GPL License.
  • esp32-wifi-manager, © 2017-2019, Tony Pottier. Licensed under the MIT License.
  • SpinKit, © 2015, Tobias Ahlin. Licensed under the MIT License.
  • jQuery, The jQuery Foundation. Licensed under the MIT License.
  • cJSON, © 2009-2017, Dave Gamble and cJSON contributors. Licensed under the MIT License.
  • esp32-rotary-encoder, © 2011-2019, David Antliff and Ben Buxton. Licensed under the GPL License.
  • tarablessd1306, © 2017-2018, Tara Keeling. Licensed under the MIT license.

Show NVS Editor

Show Advanced Commands

\ No newline at end of file diff --git a/components/wifi-manager/wifi_manager.c b/components/wifi-manager/wifi_manager.c index cfa25efb..a1b5a102 100644 --- a/components/wifi-manager/wifi_manager.c +++ b/components/wifi-manager/wifi_manager.c @@ -274,7 +274,7 @@ void wifi_manager_init_wifi(){ ESP_LOGD(TAG, "Initializing wifi. Starting wifi"); char * disable_ps = config_alloc_get_default(NVS_TYPE_STR, "disable_ps", "n", 0); - if (gpio36_39_used || (disable_ps && strcasecmp(disable_ps,"y"))) { + if (gpio36_39_used || (disable_ps && strcasecmp(disable_ps,"y")==0)) { if(gpio36_39_used){ ESP_LOGW(TAG, "GPIO 36 or 39 are in use, need to disable WiFi PowerSave!"); }