2
0
Эх сурвалжийг харах

New config UI for Services (Airplay, bt, etc) - release

Sebastien 4 жил өмнө
parent
commit
0c224b4b84

+ 1 - 1
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),

+ 6 - 5
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("<tr><td><input type='text' class='form-control' id='nvs-new-key' placeholder='new key'></td><td><input type='text' class='form-control' id='nvs-new-value' placeholder='new value' nvs_type=33 ></td></tr>");
-			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('<tr class=' + cl + '><th scope="row">' + gpio_entry.group + '</th><td>' + gpio_entry.name + '</td><td>' + gpio_entry.gpio + '</td><td>' + (gpio_entry.fixed ? 'Fixed':'Configuration') + '</td></tr>');
 				});
 			}

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

@@ -207,6 +207,7 @@
 				</div>
 				<!-- wifi -->
 				<div class="tab-pane fade" id="tab-setdisplay">
+					<div id="set_services-list"></div>
 					<div id="setname-list"></div>
 					<div id="setdisplay-list"></div>
 					<div id="i2cconfig-list"></div>

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
components/wifi-manager/index.html


+ 1 - 1
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!");
 		}

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно