GitHub-Proxy/ESP3D
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/luc-github/ESP3D.git synced 2025-08-12 18:29:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix web update available size

Browse Source
This commit is contained in:
luc lebosse 2018-03-17 20:03:12 +01:00
parent 32b07c6740
commit 3d0beea62c
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
esp3d/config.cpp
View File

@ -1372,21 +1372,22 @@ void CONFIG::print_config(tpipe output, bool plaintext)
if (!plaintext)BRIDGE::print(F("\","), output); if (!plaintext)BRIDGE::print(F("\","), output);
else BRIDGE::print(F("\n"), 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); if (!plaintext)BRIDGE::print(F("\"update_size\":\""), output);
else BRIDGE::print(F("Available Size for update: "), output); else BRIDGE::print(F("Available Size for update: "), output);
uint32_t flashsize = ESP.getFlashChipSize(); uint32_t flashsize = ESP.getFlashChipSize();
if (flashsize > 1024 * 1024) flashsize = 1024 * 1024; 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); if (!plaintext)BRIDGE::print(F("\","), output);
else { else {
if ((flashsize - ESP.getSketchSize()) > (flashsize / 2)) BRIDGE::println(F("(Ok)"), output); if ((flashsize - ESP.getSketchSize()-info.totalBytes) > (flashsize / 2)) BRIDGE::println(F("(Ok)"), output);
else BRIDGE::print(F("(Not enough)"), output); else BRIDGE::println(F("(Not enough)"), output);
} }
if (!plaintext)BRIDGE::print(F("\"spiffs_size\":\""), output); if (!plaintext)BRIDGE::print(F("\"spiffs_size\":\""), output);
else BRIDGE::print(F("Available Size for SPIFFS: "), output); else BRIDGE::print(F("Available Size for SPIFFS: "), output);
fs::FSInfo info;
SPIFFS.info(info);
BRIDGE::print(formatBytes(info.totalBytes).c_str(), output); BRIDGE::print(formatBytes(info.totalBytes).c_str(), output);
if (!plaintext)BRIDGE::print(F("\","), output); if (!plaintext)BRIDGE::print(F("\","), output);
else BRIDGE::print(F("\n"), output); else BRIDGE::print(F("\n"), output);

2
esp3d/config.h
View File

@ -186,7 +186,7 @@ extern "C" {
#endif #endif
#include "wificonf.h" #include "wificonf.h"
//version and sources location //version and sources location
#define FW_VERSION "0.9.101" #define FW_VERSION "0.9.102"
#define REPOSITORY "https://github.com/luc-github/ESP3D" #define REPOSITORY "https://github.com/luc-github/ESP3D"
typedef enum { typedef enum {