Crash_Override/ESP32_ChinaDieselHeater_Control
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Single shot SQuery (stops JSON Time & UpTime constantly being sent).

Browse source 
Working on SPIFFS upload abort if out of space....
This commit is contained in:
Ray Jones 2019-07-16 06:29:23 +10:00
parent 16ee16f97f
commit 4d6ab5b280
2 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Afterburner/src/Utility/BTC_JSON.cpp
View file

@ -41,6 +41,7 @@ CModerator MQTTmoderator;
CModerator IPmoderator; CModerator IPmoderator;
CModerator GPIOmoderator; CModerator GPIOmoderator;
CModerator SysModerator; CModerator SysModerator;
bool bTriggerSysParams = false;
void validateTimer(int ID); void validateTimer(int ID);
void Expand(std::string& str); void Expand(std::string& str);
@ -195,6 +196,7 @@ void interpretJsonCommand(char* pLine)
// system info // system info
else if(strcmp("SQuery", it->key) == 0) { else if(strcmp("SQuery", it->key) == 0) {
SysModerator.reset(); // force MQTT params to be sent SysModerator.reset(); // force MQTT params to be sent
bTriggerSysParams = true;
} }
// MQTT parameters // MQTT parameters
else if(strcmp("MQuery", it->key) == 0) { else if(strcmp("MQuery", it->key) == 0) {
@ -557,7 +559,8 @@ void updateJSONclients(bool report)
// report System info // report System info
{ {
if(makeJSONStringSysInfo(SysModerator, jsonStr, sizeof(jsonStr))) { if(bTriggerSysParams && makeJSONStringSysInfo(SysModerator, jsonStr, sizeof(jsonStr))) {
bTriggerSysParams = false;
if (report) { if (report) {
DebugPort.printf("JSON send: %s\r\n", jsonStr); DebugPort.printf("JSON send: %s\r\n", jsonStr);
} }

21
src/Afterburner/src/WiFi/BTCWebServer.cpp
View file

@ -598,16 +598,22 @@ void listSPIFFS(const char * dirname, uint8_t levels, String& HTMLreport, int wi
if(withHTMLanchors) { if(withHTMLanchors) {
String fn2; String fn2;
if(fn.endsWith(".html") || fn.endsWith(".htm")) { if(fn.endsWith(".html") || fn.endsWith(".htm")) {
// can hyperlink .html files
fn2 = fn; fn2 = fn;
} }
else if(fn.endsWith(".html.gz") || fn.endsWith(".htm.gz")) { else if(fn.endsWith(".html.gz") || fn.endsWith(".htm.gz")) {
fn2 = fn.substring(0, fn.length()-3); // can hyperlink .html.gz files but we must strip .gz extension for
// the hyperlink otherwise you get asked if you want to download the .gz, not view web page!
// fn2 = fn.substring(0, fn.length()-3); // strip ".gz"
fn2 = fn;
fn2.remove(fn2.length()-3, 3); // strip trailing ".gz"
} }
if(fn2.length() != 0) { if(fn2.length() != 0) {
// create hyperlink if web page file
fn = "<a href=\"" + fn2 + "\">" + file.name() + "</a>"; fn = "<a href=\"" + fn2 + "\">" + file.name() + "</a>";
} }
} }
String sz; sz += int(file.size()); String sz( int(file.size()));
addTableData(HTMLreport, ""); addTableData(HTMLreport, "");
addTableData(HTMLreport, fn); addTableData(HTMLreport, fn);
addTableData(HTMLreport, sz); addTableData(HTMLreport, sz);
@ -755,7 +761,16 @@ void onUploadProgression()
DebugPort.print("."); DebugPort.print(".");
if(fsUploadFile) { if(fsUploadFile) {
fsUploadFile.write(upload.buf, upload.currentSize); // Write the received bytes to the file if(fsUploadFile.write(upload.buf, upload.currentSize) != upload.currentSize) { // Write the received bytes to the file
Update.printError(DebugPort);
fsUploadFile.close();
fsUploadFile.flush();
DebugPort.println("WEB: SPIFFS WRITE FAIL");
server.send(500, "text/plain", "500: couldn't create file");
String filename = upload.filename;
SPIFFS.remove(filename.c_str()); // remove the file
SPIFFSupload = 2;
}
} }
else { else {
if (Update.write(upload.buf, upload.currentSize) != upload.currentSize) { if (Update.write(upload.buf, upload.currentSize) != upload.currentSize) {