Compare commits

...
6 Commits
8 changed files with 60 additions and 12 deletions

No files matched your search

+4 -4
View File
@@ -7,12 +7,12 @@
<link rel="icon" type="image/png" href="/favicon.ico">
<link rel="stylesheet" href="style.css">
<script>
fetch('/api/version')
.then(response => response.json())
.then(data => {
fetch('/version.txt')
.then(response => response.text())
.then(version => {
const versionSpan = document.querySelector('.version');
if (versionSpan) {
versionSpan.textContent = 'v' + data.version;
versionSpan.textContent = 'v' + version.trim();
}
})
.catch(error => console.error('Error fetching version:', error));
+1 -2
View File
@@ -30,8 +30,7 @@
<nav style="display: flex; gap: 1rem;">
<a href="/">Start</a>
<a href="/waage">Scale</a>
<a href="/config">Config</a>
<a href="/about">About</a>
<a href="/setup">Setup</a>
<a href="/upgrade">Upgrade</a>
</nav>
<div class="status-container">
+18 -1
View File
@@ -6,13 +6,24 @@
<title>FilaMan - Setup</title>
<link rel="icon" type="image/png" href="/favicon.ico">
<link rel="stylesheet" href="style.css">
<script>
fetch('/api/version')
.then(response => response.json())
.then(data => {
const versionSpan = document.querySelector('.version');
if (versionSpan) {
versionSpan.textContent = 'v' + data.version;
}
})
.catch(error => console.error('Error fetching version:', error));
</script>
</head>
<body>
<div class="navbar">
<div style="display: flex; align-items: center; gap: 2rem;">
<img src="/logo.png" alt="FilaMan Logo" class="logo">
<div class="logo-text">
<h1>FilaMan</h1>
<h1>FilaMan<span class="version"></span></h1>
<h4>Filament Management Tool</h4>
</div>
</div>
@@ -22,6 +33,12 @@
<a href="/setup">Setup</a>
<a href="/upgrade">Upgrade</a>
</nav>
<div class="status-container">
<div class="status-item">
<span class="status-dot" id="filamanDot"></span>F
</div>
<div class="ram-status" id="ramStatus"></div>
</div>
</div>
<div class="content">
+7 -2
View File
@@ -30,10 +30,15 @@
<nav style="display: flex; gap: 1rem;">
<a href="/">Start</a>
<a href="/waage">Scale</a>
<a href="/config">Config</a>
<a href="/about">About</a>
<a href="/setup">Setup</a>
<a href="/upgrade">Upgrade</a>
</nav>
<div class="status-container">
<div class="status-item">
<span class="status-dot" id="filamanDot"></span>F
</div>
<div class="ram-status" id="ramStatus"></div>
</div>
</div>
<div class="content">
+1 -1
View File
@@ -9,7 +9,7 @@
; https://docs.platformio.org/page/projectconf.html
[common]
version = "3.0.6"
version = "3.0.7"
to_old_version = "2.0.10"
##
+15
View File
@@ -50,6 +50,21 @@ bool loadJsonValue(const char* filename, JsonDocument& doc) {
return true;
}
String readFile(const char* filename) {
File file = LittleFS.open(filename, "r");
if (!file) {
Serial.print("Fehler beim Öffnen der Datei: ");
Serial.println(filename);
return "";
}
String content = "";
while (file.available()) {
content += (char)file.read();
}
file.close();
return content;
}
void initializeFileSystem() {
if (!LittleFS.begin(true)) {
Serial.println("LittleFS Mount Failed");
+1
View File
@@ -8,6 +8,7 @@
bool removeJsonValue(const char* filename);
bool saveJsonValue(const char* filename, const JsonDocument& doc);
bool loadJsonValue(const char* filename, JsonDocument& doc);
String readFile(const char* filename);
void initializeFileSystem();
#endif
+13 -2
View File
@@ -128,14 +128,19 @@ void setupWebserver(AsyncWebServer &server) {
server.on("/waage", HTTP_GET, [](AsyncWebServerRequest *request){
Serial.println("Web: Request /waage");
AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/waage.html", "text/html");
String html = readFile("/waage.html");
html.replace("{{autoTare}}", autoTare ? "checked" : "");
auto response = request->beginResponse(200, "text/html", html);
response->addHeader("Cache-Control", NO_CACHE);
request->send(response);
});
server.on("/setup", HTTP_GET, [](AsyncWebServerRequest *request){
Serial.println("Web: Request /setup");
AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/setup.html", "text/html");
String html = readFile("/setup.html");
html.replace("{{registered}}", filamanRegistered ? "Registered" : "Not Registered");
html.replace("{{filamanUrl}}", filamanUrl);
auto response = request->beginResponse(200, "text/html", html);
response->addHeader("Cache-Control", NO_CACHE);
request->send(response);
});
@@ -154,6 +159,12 @@ void setupWebserver(AsyncWebServer &server) {
request->send(response);
});
server.on("/version.txt", HTTP_GET, [](AsyncWebServerRequest *request){
AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/version.txt", "text/plain");
response->addHeader("Cache-Control", NO_CACHE);
request->send(response);
});
server.on("/style.css", HTTP_GET, [](AsyncWebServerRequest *request){
AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/style.css", "text/css");
response->addHeader("Cache-Control", NO_CACHE);