From 22af45d69f53ad93d91d1a38c940c4c3294e6907 Mon Sep 17 00:00:00 2001 From: luc lebosse Date: Thu, 16 Jun 2016 21:47:48 +0200 Subject: [PATCH] Use ESP.getFreeHeap() instead of SDK function Add free mem in config report --- esp3d/config.cpp | 6 ++++++ esp3d/webinterface.cpp | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/esp3d/config.cpp b/esp3d/config.cpp index adabef27..6b0540c3 100644 --- a/esp3d/config.cpp +++ b/esp3d/config.cpp @@ -24,6 +24,9 @@ extern "C" { #include "user_interface.h" } + +extern String formatBytes(size_t bytes); + //read a string //a string is multibyte + \0, this is won't work if 1 char is multibyte like chinese char bool CONFIG::read_string(int pos, char byte_buffer[], int size_max) @@ -422,6 +425,9 @@ void CONFIG::print_config() } else { Serial.println(F("Error reading E feed rate")); } + + Serial.print(F("Free memory: ")); + Serial.println(formatBytes(ESP.getFreeHeap())); Serial.print(F("Captive portal: ")); #ifdef CAPTIVE_PORTAL_FEATURE diff --git a/esp3d/webinterface.cpp b/esp3d/webinterface.cpp index bc5a7bd1..c223e621 100644 --- a/esp3d/webinterface.cpp +++ b/esp3d/webinterface.cpp @@ -542,7 +542,7 @@ void GetFreeMem(STORESTRINGS_CLASS & KeysList, STORESTRINGS_CLASS & ValuesList) { //FreeMem KeysList.add(FPSTR(KEY_FREE_MEM)); - ValuesList.add(intTostr(system_get_free_heap_size())); + ValuesList.add(intTostr(ESP.getFreeHeap())); //FW Version KeysList.add(FPSTR(KEY_FW_VER)); ValuesList.add(FPSTR(VALUE_FW_VERSION));