Mercurial > brewboard / file diff

--- a/main/task_http.c	Tue May 18 16:52:23 2021 +0200
+++ b/main/task_http.c	Wed May 19 14:35:48 2021 +0200
@@ -552,8 +552,7 @@
     struct netconn	*conn, *newconn;
     static err_t	err;
 
-    ESP_LOGI(TAG, "Start http server_task");
-    client_queue = xQueueCreate(client_queue_size,sizeof(struct netconn*));
+    ESP_LOGI(TAG, "Start HTTP/web server");
 
     conn = netconn_new(NETCONN_TCP);
     netconn_bind(conn,NULL,80);
@@ -569,7 +568,7 @@
 	vTaskDelay(5 / portTICK_PERIOD_MS);
     } while (err == ERR_OK);
 
-    ESP_LOGE(TAG, "Stopping http server_task");
+    ESP_LOGE(TAG, "Stopping HTTP/web server");
     netconn_close(conn);
     netconn_delete(conn);
     vTaskDelete(NULL);
@@ -586,7 +585,7 @@
 
     ESP_LOGI(TAG, "Start Queue task");
     for(;;) {
-	xQueueReceive(client_queue, &conn, portMAX_DELAY);
+	xQueueReceive(client_queue, &(conn), portMAX_DELAY);
 	if (!conn)
 	    continue;
 	http_serve(conn);
@@ -602,8 +601,14 @@
 {
     ESP_LOGI(TAG, "Start HTTP/Websocket server");
 
+    client_queue = xQueueCreate(client_queue_size,sizeof(struct netconn*));
+    if (client_queue == 0) {
+        ESP_LOGE(TAG, "Failed to create client_queue");
+        return;
+    }
+
     ws_server_start();
-    xTaskCreate(&task_HTTPserver, "HTTPserver", 4000, NULL, 9, &xTaskHTTP);
-    xTaskCreate(&task_Queue,      "Queue",      5000, NULL, 6, &xTaskQueue);
+    xTaskCreate(&task_HTTPserver, "HTTPserver", 5000, NULL, 9, &xTaskHTTP);
+    xTaskCreate(&task_Queue,      "Queue",      6000, NULL, 6, &xTaskQueue);
 }