co2meter: comparison main/updates.c

-:cc7c423f03fb
+:8a3696620c0a
 #define BUFFSIZE 1024					///< Download buffer size
 static char ota_write_data[BUFFSIZE + 1] = { 0 };
 static const char               *TAG = "update";
+int				update_running = 0;	///< Not zero if update is running.
+extern u8g2_t			u8g2;			///< Structure for the display.
+extern int			Main_Loop1;
 static void http_cleanup(esp_http_client_handle_t client)
 {
 esp_http_client_close(client);
 char                        temp[64];
 esp_err_t                   err;
 const esp_partition_t       *update_partition = NULL;
 esp_ota_handle_t            update_handle = 0;
-//    TFT_setFont(DEJAVU18_FONT, NULL);
+ESP_LOGI(TAG, "Update begin");
-//    _fg = TFT_CYAN;
+update_running = 1;
+screen_updating("Stop tests", NULL);
+requestWiFi_user(true);
+for (;;) {
+	vTaskDelay(50 / portTICK_PERIOD_MS);
+	if (ready_WiFi() && Main_Loop1 == ML1_DONE)
+	    break;
+}
+ESP_LOGI(TAG, "System is ready for update");
+screen_updating("Prepare update", NULL);
 const esp_partition_t       *running = esp_ota_get_running_partition();
 /*
 * Don't use https because it costs more then 100K memory.
 */
 	ESP_LOGE(TAG, "esp_ota_begin failed (%s)", esp_err_to_name(err));
 	http_cleanup(client);
 	goto updateerr;
 }
-//    TFT_print((char *)"Begin firmware download.\r\n", 0, LASTY);
+screen_updating("Begin download", NULL);
 ESP_LOGI(TAG, "Download update %s size %d", update.url, content_length);
 int binary_file_length = 0;
 /*deal with all receive packet*/
 bool image_header_was_checked = false;
 while (1) {
 			    goto updateok;
 }
 }
 		    if (memcmp(new_app_info.app_elf_sha256, running_app_info.app_elf_sha256, 32) == 0) {
+			screen_updating("No new update", NULL);
 ESP_LOGI(TAG, "Current running version is the same as a new.");
 http_cleanup(client);
 			goto updateok;
 }
 }
 if (esp_ota_end(update_handle) != ESP_OK) {
 	ESP_LOGE(TAG, "esp_ota_end failed!");
 	goto updateerr;
 }
-snprintf(temp, 63, "Received image %d bytes\r\n", binary_file_length);
+snprintf(temp, 63, "Ok %d bytes", binary_file_length);
-//    TFT_print(temp, 0, LASTY);
+screen_updating("Begin download", temp);
 /*
 * Here we have new version, install and boot it.
 */
 err = esp_ota_set_boot_partition(update_partition);
 	ESP_LOGE(TAG, "esp_ota_set_boot_partition failed (%s)!", esp_err_to_name(err));
 	goto updateerr;
 }
 ESP_LOGI(TAG, "Prepare to restart system!");
-//   TFT_print((char *)"Rebooting ...", 0, LASTY);
+screen_updating("Reboot...", "...Reboot");
 vTaskDelay(1000 / portTICK_PERIOD_MS);
+update_running = 0;
 esp_restart();
 return;
 updateerr:
-//    _fg = TFT_RED;
+screen_updating("** ERROR **", "Update failed");
-//    TFT_print((char *)"Error\r\n", 0, LASTY);
 updateok:
+update_running = 0;
+requestWiFi_user(false);
 vTaskDelay(3000 / portTICK_PERIOD_MS);
 }
-/**
-* @brief Download a file to /spiffs
-* @param filename The name and path of the file to download.
-* @return Return 0 if ok, negative if errors.
-*/
-int DownloadSpiffs(char *filename)
-{
-esp_err_t	err;
-static char	theurl[73], thefile[41];
-FILE	*f;
-//    static char	todel[41];
-//    snprintf(todel, 40, "/spiffs//%s", filename);
-//    unlink(todel);
-//    return 0;
-snprintf(theurl, 72, "http://update.mbse.eu/ap1/image/%s", filename);
-snprintf(thefile, 40, "/spiffs/%s", filename);
-esp_http_client_config_t update = {
-	.url = theurl,
-};
-esp_http_client_handle_t client = esp_http_client_init(&update);
-if (client == NULL) {
-	ESP_LOGE(TAG, "Failed to init HTTP connection");
-	return -1;
-}
-err = esp_http_client_open(client, 0);
-if (err != ESP_OK) {
-	ESP_LOGE(TAG, "Failed to open HTTP connection: %s", esp_err_to_name(err));
-	esp_http_client_cleanup(client);
-	return -1;
-}
-int content_length = esp_http_client_fetch_headers(client);
-int status_code = esp_http_client_get_status_code(client);
-if (status_code != 200) {
-	ESP_LOGE(TAG, "GET %s error %d", update.url, status_code);
-	esp_http_client_cleanup(client);
-	return -1;
-}
-/*
-* Remove a possible stale download.
-*/
-unlink("/spiffs/tmpfile");
-f = fopen("/spiffs/tmpfile", "w");
-if (f == NULL) {
-	ESP_LOGE(TAG, "Cannot create /spiffs/tmpfile");
-	esp_http_client_cleanup(client);
-	return -1;
-}
-int read_length = 0;
-int write_length = 0;
-while (1) {
-	int data_read = esp_http_client_read(client, ota_write_data, BUFFSIZE);
-	if (data_read < 0) {
-	    ESP_LOGE(TAG, "Error: data read error %s", theurl);
-	    http_cleanup(client);
-	    return -1;
-	} else if (data_read > 0) {
-	    size_t bytes = fwrite(ota_write_data, 1, data_read, f);
-	    if (bytes != data_read) {
-		ESP_LOGE(TAG, "fwrite %s %d/%d at %d", theurl, bytes, data_read, write_length);
-	    }
-	    write_length += bytes;
-	    read_length += data_read;
-	} else if (data_read == 0) {
-	    break;
-	}
-	vTaskDelay(10 / portTICK_PERIOD_MS);
-}
-fclose(f);
-if (content_length != write_length) {
-	ESP_LOGE(TAG, "Download %s size %d but got %d bytes", theurl, content_length, write_length);
-	unlink("/spiffs/tmpfile");
-	return -1;
-}
-ESP_LOGI(TAG, "Download %s size %d Ok", theurl, content_length);
-unlink(thefile);
-rename("/spiffs/tmpfile", thefile);
-esp_http_client_cleanup(client);
-return 0;
-}
-/*
-* Files init function, only runs once a new screen is entered.
-*/
-void Updates_Init(void)
-{
-//			_bg = TFT_BLACK;
-//			TFT_fillScreen(_bg);
-//			TopMessage((char *)"Update");
-}
-/*
-* Updates management loop, non-blocking.
-*/
-void Updates_Loop(void)
-{
-bin_update();
-}

Mercurial > co2meter / file comparison

comparison: main/updates.c

main/updates.c