Working on getting diagnostics working
This commit is contained in:
+3
-2
@@ -14,7 +14,8 @@ board = esp32dev
|
||||
framework = arduino
|
||||
lib_deps =
|
||||
WebSockets
|
||||
;build_type = debug
|
||||
|
||||
; upload via OTA
|
||||
upload_protocol = espota
|
||||
upload_port = 192.168.4.1
|
||||
;upload_protocol = espota
|
||||
;upload_port = 192.168.4.1
|
||||
|
||||
@@ -13,29 +13,37 @@ void DiagnosticsState::update()
|
||||
current.cpuFrequency =
|
||||
ESP.getCpuFreqMHz();
|
||||
|
||||
history[historyIndex] = current;
|
||||
|
||||
historyIndex++;
|
||||
if(historyIndex >= DIAGNOSTIC_HISTORY_SIZE)
|
||||
{
|
||||
historyIndex = 0;
|
||||
}
|
||||
//history[historyIndex] = current;
|
||||
//
|
||||
//historyIndex++;
|
||||
//if(historyIndex >= DIAGNOSTIC_HISTORY_SIZE)
|
||||
//{
|
||||
// historyIndex = 0;
|
||||
//}
|
||||
Serial.print("#update: ");
|
||||
Serial.println(current.freeHeap);
|
||||
Serial.println("Calling current from update");
|
||||
getCurrent();
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
DiagnosticSample DiagnosticsState::getCurrent()
|
||||
{
|
||||
Serial.print("#getCurrent: ");
|
||||
Serial.println(current.freeHeap);
|
||||
Serial.println(current.timestamp);
|
||||
return current;
|
||||
}
|
||||
|
||||
|
||||
|
||||
DiagnosticSample DiagnosticsState::getHistory(uint8_t index)
|
||||
{
|
||||
if(index >= DIAGNOSTIC_HISTORY_SIZE)
|
||||
{
|
||||
return current;
|
||||
}
|
||||
return history[index];
|
||||
}
|
||||
//DiagnosticSample DiagnosticsState::getHistory(uint8_t index)
|
||||
//{
|
||||
// if(index >= DIAGNOSTIC_HISTORY_SIZE)
|
||||
// {
|
||||
// return current;
|
||||
// }
|
||||
// return history[index];
|
||||
//}
|
||||
|
||||
@@ -23,12 +23,12 @@ public:
|
||||
|
||||
|
||||
DiagnosticSample getCurrent();
|
||||
DiagnosticSample getHistory(uint8_t index);
|
||||
//DiagnosticSample getHistory(uint8_t index);
|
||||
|
||||
|
||||
private:
|
||||
|
||||
DiagnosticSample current;
|
||||
DiagnosticSample history[DIAGNOSTIC_HISTORY_SIZE];
|
||||
uint8_t historyIndex = 0;
|
||||
//DiagnosticSample history[DIAGNOSTIC_HISTORY_SIZE];
|
||||
//uint8_t historyIndex = 0;
|
||||
};
|
||||
|
||||
@@ -128,6 +128,7 @@ Firmware Version: <div id="firmware_version">Loading...</div>
|
||||
void WebService::broadcastState()
|
||||
{
|
||||
DiagnosticSample diagnostics = diagnosticsState.getCurrent();
|
||||
Serial.println(diagnostics.freeHeap);
|
||||
String json = "{";
|
||||
|
||||
// Opening system tag:
|
||||
@@ -148,6 +149,7 @@ void WebService::broadcastState()
|
||||
|
||||
json += "\"free_heap\":\"";
|
||||
json += diagnostics.freeHeap;
|
||||
//json += ESP.getFreeHeap();
|
||||
json += "\",";
|
||||
|
||||
json += "\"minimum_free_heap\":\"";
|
||||
@@ -165,7 +167,7 @@ void WebService::broadcastState()
|
||||
json += "}";
|
||||
|
||||
|
||||
Serial.println(json);
|
||||
//Serial.println(json);
|
||||
webSocket.broadcastTXT(json);
|
||||
}
|
||||
|
||||
@@ -179,6 +181,16 @@ void WebService::begin() {
|
||||
);
|
||||
});
|
||||
|
||||
#ifdef DEBUGGING
|
||||
// Prints out paths that are requested but not found.
|
||||
server.onNotFound([this]() {
|
||||
Serial.print("HTTP not found: ");
|
||||
Serial.println(server.uri());
|
||||
|
||||
server.send(404, "text/plain", "Not found");
|
||||
});
|
||||
#endif
|
||||
|
||||
server.begin();
|
||||
|
||||
webSocket.begin();
|
||||
|
||||
Reference in New Issue
Block a user