From 3d0beea62cf09cabb69c142f70c8754a0d9cac1e Mon Sep 17 00:00:00 2001 From: luc lebosse Date: Sat, 17 Mar 2018 20:03:12 +0100 Subject: [PATCH] Fix web update available size --- esp3d/config.cpp | 13 +++++++------ esp3d/config.h | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/esp3d/config.cpp b/esp3d/config.cpp index 1f9e804e..30f143b8 100644 --- a/esp3d/config.cpp +++ b/esp3d/config.cpp @@ -1371,22 +1371,23 @@ void CONFIG::print_config(tpipe output, bool plaintext) BRIDGE::print(formatBytes(ESP.getFlashChipSize()).c_str(), output); if (!plaintext)BRIDGE::print(F("\","), output); else BRIDGE::print(F("\n"), output); -#ifdef ARDUINO_ARCH_ESP8266 +#ifdef ARDUINO_ARCH_ESP8266 + fs::FSInfo info; + SPIFFS.info(info); if (!plaintext)BRIDGE::print(F("\"update_size\":\""), output); else BRIDGE::print(F("Available Size for update: "), output); uint32_t flashsize = ESP.getFlashChipSize(); if (flashsize > 1024 * 1024) flashsize = 1024 * 1024; - BRIDGE::print(formatBytes(flashsize - ESP.getSketchSize()).c_str(), output); + BRIDGE::print(formatBytes(flashsize - ESP.getSketchSize()-info.totalBytes).c_str(), output); if (!plaintext)BRIDGE::print(F("\","), output); else { - if ((flashsize - ESP.getSketchSize()) > (flashsize / 2)) BRIDGE::println(F("(Ok)"), output); - else BRIDGE::print(F("(Not enough)"), output); + if ((flashsize - ESP.getSketchSize()-info.totalBytes) > (flashsize / 2)) BRIDGE::println(F("(Ok)"), output); + else BRIDGE::println(F("(Not enough)"), output); } if (!plaintext)BRIDGE::print(F("\"spiffs_size\":\""), output); else BRIDGE::print(F("Available Size for SPIFFS: "), output); - fs::FSInfo info; - SPIFFS.info(info); + BRIDGE::print(formatBytes(info.totalBytes).c_str(), output); if (!plaintext)BRIDGE::print(F("\","), output); else BRIDGE::print(F("\n"), output); diff --git a/esp3d/config.h b/esp3d/config.h index 5b043e55..8f2836bf 100644 --- a/esp3d/config.h +++ b/esp3d/config.h @@ -186,7 +186,7 @@ extern "C" { #endif #include "wificonf.h" //version and sources location -#define FW_VERSION "0.9.101" +#define FW_VERSION "0.9.102" #define REPOSITORY "https://github.com/luc-github/ESP3D" typedef enum {