Merge remote-tracking branch 'origin/master' into httpd

Conflicts:
	Makefile
	components/wifi-manager/index.html
This commit is contained in:
Sebastien
2020-02-19 08:14:49 -05:00
40 changed files with 1009 additions and 387 deletions

View File

@@ -146,4 +146,10 @@ void monitor_svc_init(void) {
xTimerStart(monitor_timer, portMAX_DELAY);
}
free(p);
ESP_LOGI(TAG, "Heap internal:%zu (min:%zu) external:%zu (min:%zu)",
heap_caps_get_free_size(MALLOC_CAP_INTERNAL),
heap_caps_get_minimum_free_size(MALLOC_CAP_INTERNAL),
heap_caps_get_free_size(MALLOC_CAP_SPIRAM),
heap_caps_get_minimum_free_size(MALLOC_CAP_SPIRAM));
}