Compare commits
3 Commits
8c53ba5298
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
 bionickatana
|
e593c3fed9 | ||
|
bionickatana
|
5b6b810efd | ||
|
bionickatana
|
b782867c69 |
+2
-2
@@ -12,8 +12,8 @@
|
||||
platform = espressif32
|
||||
board = esp32dev
|
||||
framework = arduino
|
||||
;lib_deps =
|
||||
;; esp32async/ESPAsyncWebServer@^3.12.0
|
||||
lib_deps =
|
||||
WebSockets
|
||||
|
||||
; upload via OTA
|
||||
upload_protocol = espota
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
// Contains configuration constants:
|
||||
|
||||
#define FIRMWARE_VERSION "1.0.2"
|
||||
#define FIRMWARE_VERSION "1.0.3"
|
||||
|
||||
@@ -4,7 +4,8 @@ WebService::WebService(DashboardState& state)
|
||||
:
|
||||
Service("Web", 10),
|
||||
dashboardState(state),
|
||||
server(80)
|
||||
server(80),
|
||||
webSocket(81)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -65,31 +66,35 @@ h1 {
|
||||
</style>
|
||||
|
||||
<script>
|
||||
function updateUptime() {
|
||||
fetch('/uptime')
|
||||
.then(response => response.text())
|
||||
.then(data => {
|
||||
document.getElementById("uptime").innerHTML = data;
|
||||
});
|
||||
|
||||
let socket;
|
||||
|
||||
function connectWebSocket() {
|
||||
socket = new WebSocket(
|
||||
"ws://" + window.location.hostname + ":81/"
|
||||
);
|
||||
|
||||
socket.onopen = function() {
|
||||
console.log("WebSocket connected");
|
||||
};
|
||||
|
||||
socket.onmessage = function(event) {
|
||||
const data = JSON.parse(event.data);
|
||||
|
||||
document.getElementById("uptime").innerHTML = data.uptime;
|
||||
document.getElementById("firmware_version").innerHTML = data.version;
|
||||
};
|
||||
|
||||
socket.onclose = function() {
|
||||
console.log("WebSocket disconnected");
|
||||
setTimeout(connectWebSocket, 2000);
|
||||
};
|
||||
}
|
||||
|
||||
setInterval(updateUptime, 1000);
|
||||
window.onload = updateUptime;
|
||||
window.onload = connectWebSocket;
|
||||
|
||||
</script>
|
||||
|
||||
<script>
|
||||
function getVersion() {
|
||||
fetch('/version')
|
||||
.then(response => response.text())
|
||||
.then(data => {
|
||||
document.getElementById("firmware_version").innerHTML = data;
|
||||
});
|
||||
}
|
||||
|
||||
window.onload = getVersion;
|
||||
</script>
|
||||
|
||||
|
||||
</head>
|
||||
|
||||
<body>
|
||||
@@ -105,18 +110,22 @@ Firmware Version: <div id="firmware_version">Loading...</div>
|
||||
</html>
|
||||
)rawliteral";
|
||||
|
||||
void WebService::broadcastState()
|
||||
{
|
||||
String json = "{";
|
||||
|
||||
// server.send(200, "text/html", html);
|
||||
// }
|
||||
//
|
||||
// void handleUptime() {
|
||||
// server.send(200, "text/plain", formatUptime());
|
||||
// }
|
||||
//
|
||||
// void handleVersion() {
|
||||
// server.send(200, "text/plain", FIRMWARE_VERSION);
|
||||
// }
|
||||
//
|
||||
json += "\"uptime\":\"";
|
||||
json += dashboardState.uptime;
|
||||
json += "\",";
|
||||
|
||||
json += "\"version\":\"";
|
||||
json += dashboardState.firmwareVersion;
|
||||
json += "\"";
|
||||
|
||||
json += "}";
|
||||
|
||||
webSocket.broadcastTXT(json);
|
||||
}
|
||||
|
||||
void WebService::begin() {
|
||||
// Root path
|
||||
@@ -128,34 +137,59 @@ void WebService::begin() {
|
||||
);
|
||||
});
|
||||
|
||||
// Version path
|
||||
server.on("/version", [this](){
|
||||
server.send(
|
||||
200,
|
||||
"text/plain",
|
||||
dashboardState.firmwareVersion
|
||||
);
|
||||
});
|
||||
|
||||
// Uptime path
|
||||
server.on("/uptime", [this]() {
|
||||
server.send(
|
||||
200,
|
||||
"text/plain",
|
||||
dashboardState.uptime
|
||||
);
|
||||
|
||||
});
|
||||
|
||||
|
||||
server.begin();
|
||||
|
||||
webSocket.begin();
|
||||
|
||||
// Manage web socket connections
|
||||
webSocket.onEvent(
|
||||
[this](uint8_t clientNum,
|
||||
WStype_t type,
|
||||
uint8_t *payload,
|
||||
size_t length)
|
||||
{
|
||||
if (type == WStype_TEXT) {
|
||||
handleWebSocketMessage(
|
||||
clientNum,
|
||||
payload,
|
||||
length
|
||||
);
|
||||
}
|
||||
|
||||
if (type == WStype_CONNECTED) {
|
||||
Serial.println("WebSocket client connected");
|
||||
broadcastState();
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
Serial.println("Web server started");
|
||||
}
|
||||
|
||||
void WebService::handleWebSocketMessage(uint8_t clientNum, uint8_t *payload, size_t length) {
|
||||
Serial.println("Client number: " + clientNum);
|
||||
Serial.println("Sent a message of length: " + length);
|
||||
Serial.print("Saying: ");
|
||||
for (int ii = 0; ii < length; ii ++) {
|
||||
Serial.print(payload[ii]);
|
||||
}
|
||||
Serial.print("\n\n\n");
|
||||
}
|
||||
|
||||
|
||||
void WebService::update()
|
||||
{
|
||||
dashboardState.update();
|
||||
|
||||
server.handleClient();
|
||||
webSocket.loop();
|
||||
|
||||
// Brodcast updates once per second
|
||||
static unsigned long lastUpdate = 0;
|
||||
|
||||
if (millis() - lastUpdate >= 1000)
|
||||
{
|
||||
lastUpdate = millis();
|
||||
broadcastState();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
#pragma once
|
||||
|
||||
#include "service.h"
|
||||
#include "../core/dashboard_state.h"
|
||||
#include <WebServer.h>
|
||||
#include <WebSocketsServer.h>
|
||||
|
||||
#include "service.h"
|
||||
|
||||
#include "../core/dashboard_state.h"
|
||||
|
||||
class WebService : public Service {
|
||||
|
||||
@@ -17,5 +19,9 @@ public:
|
||||
private:
|
||||
|
||||
WebServer server;
|
||||
WebSocketsServer webSocket;
|
||||
DashboardState dashboardState;
|
||||
|
||||
void handleWebSocketMessage(uint8_t clientNum, uint8_t *payload, size_t length);
|
||||
void broadcastState();
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user