jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-27 05:06:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Code clean-up

Browse Source
This commit is contained in:
fvanroie 2021-04-29 04:26:59 +02:00
parent 8b9154cb82
commit 9fdd3cce8f
2 changed files with 2 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/hasp/hasp.cpp
View File

@ -570,49 +570,6 @@ void haspSetPage(uint8_t pageid)
} }
} }
void haspLoadPage(const char* pagesfile)
{
#if HASP_USE_SPIFFS > 0 || HASP_USE_LITTLEFS > 0
if(pagesfile[0] == '\0') return;
if(!filesystemSetup()) {
LOG_ERROR(TAG_HASP, F("FS not mounted. Failed to load %s"), pagesfile);
return;
}
if(!HASP_FS.exists(pagesfile)) {
LOG_ERROR(TAG_HASP, F("Non existing file %s"), pagesfile);
return;
}
LOG_TRACE(TAG_HASP, F("Loading file %s"), pagesfile);
File file = HASP_FS.open(pagesfile, "r");
dispatch_parse_jsonl(file);
file.close();
LOG_INFO(TAG_HASP, F("File %s loaded"), pagesfile);
#else
#if HASP_USE_EEPROM > 0
LOG_TRACE(TAG_HASP, F("Loading jsonl from EEPROM..."));
EepromStream eepromStream(4096, 1024);
dispatch_parse_jsonl(eepromStream);
LOG_INFO(TAG_HASP, F("Loaded jsonl from EEPROM"));
#endif
std::ifstream ifs("pages.json", std::ifstream::in);
if(ifs) {
LOG_TRACE(TAG_HASP, F("Loading file %s"), pagesfile);
dispatch_parse_jsonl(ifs);
LOG_INFO(TAG_HASP, F("File %s loaded"), pagesfile);
} else {
LOG_ERROR(TAG_HASP, F("Non existing file %s"), pagesfile);
}
#endif
}
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
#if HASP_USE_CONFIG > 0 #if HASP_USE_CONFIG > 0
bool haspGetConfig(const JsonObject& settings) bool haspGetConfig(const JsonObject& settings)

4
src/sys/svc/hasp_http.cpp
View File

@ -695,11 +695,11 @@ void webHandleInfo()
Parser::format_bytes(ESP.getFlashChipSize(), size_buf, sizeof(size_buf)); Parser::format_bytes(ESP.getFlashChipSize(), size_buf, sizeof(size_buf));
httpMessage += size_buf; httpMessage += size_buf;
httpMessage += F("</br><b>Program Size: </b>"); httpMessage += F("</br><b>Program Size Used: </b>");
Parser::format_bytes(ESP.getSketchSize(), size_buf, sizeof(size_buf)); Parser::format_bytes(ESP.getSketchSize(), size_buf, sizeof(size_buf));
httpMessage += size_buf; httpMessage += size_buf;
httpMessage += F("<br/><b>Free Program Space: </b>"); httpMessage += F("<br/><b>Program Size Free: </b>");
Parser::format_bytes(ESP.getFreeSketchSpace(), size_buf, sizeof(size_buf)); Parser::format_bytes(ESP.getFreeSketchSpace(), size_buf, sizeof(size_buf));
httpMessage += size_buf; httpMessage += size_buf;
#endif #endif