Mercurial > co2meter / file diff

--- a/main/task_mqtt.c	Thu Nov 07 11:47:15 2019 +0100
+++ b/main/task_mqtt.c	Thu Nov 07 15:09:51 2019 +0100
@@ -91,10 +91,9 @@
      */
     if (xSemaphoreTake(xSemaphorePcounter, 10) == pdTRUE) {
         count_pub++;
-//printf("  up %d\n", count_pub);
         xSemaphoreGive(xSemaphorePcounter);
     } else {
-        ESP_LOGE(TAG, "Missed lock 1");
+        ESP_LOGE(TAG, "publisher() counter lock");
     }
 
     if (payload)
@@ -147,6 +146,8 @@
     	payload = xstrcat(payload, buf);
     	payload = xstrcat(payload, (char *)"}}");
 	xSemaphoreGive(xSemaphoreUnits);
+    } else {
+	ESP_LOGE(TAG, "unit_data(%d) lock error", i);
     }
     return payload;
 }
@@ -204,6 +205,8 @@
         payload = xstrcat(payload, buf);
         payload = xstrcat(payload, (char *)"}");
 	xSemaphoreGive(xSemaphoreDS18B20);
+    } else {
+	ESP_LOGE(TAG, "publishNode() lock DS18B20 error");
     }
 
     if (xSemaphoreTake(xSemaphoreWiFi, 10) == pdTRUE) {
@@ -214,6 +217,8 @@
 	payload = xstrcat(payload, buf);
         payload = xstrcat(payload, (char *)"}");
 	xSemaphoreGive(xSemaphoreWiFi);
+    } else {
+	ESP_LOGE(TAG, "publishNode() lock WiFi error");
     }
 
     payload = xstrcat(payload, (char *)"}}");
@@ -254,6 +259,8 @@
 		free(payload);
 		payload = NULL;
 		xSemaphoreGive(xSemaphoreUnits);
+	    } else {
+		ESP_LOGE(TAG, "publishLogs() lock error unit %d", i);
 	    }
 	}
     }
@@ -288,11 +295,10 @@
 	    if (xSemaphoreTake(xSemaphorePcounter, 10) == pdTRUE) {
 	    	if (count_pub) {
 		    count_pub--;
-//printf("down %d\n", count_pub);
 	    	}
 		xSemaphoreGive(xSemaphorePcounter);
 	    } else {
-        	ESP_LOGE(TAG, "Missed lock 2");
+        	ESP_LOGE(TAG, "mqtt_event_handler_cb(() lock error event");
 	    }
             break;
 
@@ -379,7 +385,7 @@
 	    ESP_LOGI(TAG, "Request MQTT connect");
 	    err = esp_mqtt_client_start(client);
 	    if (err != ESP_OK)
-	    	ESP_LOGI(TAG, "Result %s", esp_err_to_name(err));
+	    	ESP_LOGE(TAG, "Result %s", esp_err_to_name(err));
 	    xEventGroupClearBits(xEventGroupMQTT, TASK_MQTT_CONNECT);
 
 	} else if (uxBits & TASK_MQTT_DISCONNECT) {