Mercurial > co2meter / file diff

--- a/main/task_mqtt.c	Sat Jan 25 12:02:22 2020 +0100
+++ b/main/task_mqtt.c	Sat Mar 14 13:07:02 2020 +0100
@@ -11,8 +11,6 @@
 
 EventGroupHandle_t		xEventGroupMQTT;	///< Events MQTT task
 SemaphoreHandle_t		xSemaphorePcounter;	///< Publish counter semaphore.
-uint64_t			Sequence = 0;		///< Sequence stored in NVS
-nvs_handle_t			seq_handle;		///< NVS handle
 int				count_pub = 0;		///< Outstanding published messages.
 esp_mqtt_client_handle_t	client;			///< MQTT client handle
 
@@ -60,16 +58,9 @@
  */
 char *payload_header(void)
 {
-    char        *tmp, buf[128];
-    esp_err_t   err;
+    char        *tmp;
 
-    tmp = xstrcpy((char *)"{\"seq\":");
-    sprintf(buf, "%lld", Sequence++);
-    err = nvs_set_u64(seq_handle, "Sequence_cnt", Sequence);
-    if (err != ESP_OK)
-	ESP_LOGE(TAG, "Error %s write Sequence to NVS", esp_err_to_name(err));
-    tmp = xstrcat(tmp, buf);
-    tmp = xstrcat(tmp, (char *)",\"metric\":");
+    tmp = xstrcpy((char *)"{\"metric\":");
     return tmp;
 }
 
@@ -364,29 +355,6 @@
     ESP_LOGI(TAG, "Starting MQTT task");
     xSemaphorePcounter = xSemaphoreCreateMutex();
 
-    /*
-     * Initialize Sequence counter from NVS
-     */
-    err = nvs_open("storage", NVS_READWRITE, &seq_handle);
-    if (err != ESP_OK) {
-        ESP_LOGE(TAG, "Error (%s) opening NVS handle", esp_err_to_name(err));
-    } else {
-	err = nvs_get_u64(seq_handle, "Sequence_cnt", &Sequence);
-	switch (err) {
-	    case ESP_OK:
-		ESP_LOGI(TAG, "Sequence counter from NVS = %lld", Sequence);
-		break;
-
-	    case ESP_ERR_NVS_NOT_FOUND:
-		ESP_LOGI(TAG, "Sequence counter not found");
-		break;
-
-	    default:
-		ESP_LOGE(TAG, "Error (%s) init Sequence", esp_err_to_name(err));
-		break;
-	}
-    }
-
     /* event handler and event group for the wifi driver */
     xEventGroupMQTT = xEventGroupCreate();
     EventBits_t uxBits;
@@ -436,9 +404,6 @@
 	} else if (uxBits & TASK_MQTT_DISCONNECT) {
 	    ESP_LOGI(TAG, "Request MQTT disconnect");
 	    esp_mqtt_client_stop(client);
-	    err = nvs_commit(seq_handle);
-	    if (err != ESP_OK)
-		ESP_LOGE(TAG, "Error %s commit NVS", esp_err_to_name(err));
 	    xEventGroupClearBits(xEventGroupMQTT, TASK_MQTT_DISCONNECT);
 	    xEventGroupClearBits(xEventGroupMQTT, TASK_MQTT_CONNECTED);
 	}