Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
741a7d9262 | ||
|
|
8bad4fe256 | ||
|
|
185cb5b081 | ||
|
|
0d9132127a | ||
|
|
d39d481c65 | ||
|
|
1cae1e3ae1 |
No files matched your search
+4
-4
@@ -7,12 +7,12 @@
|
|||||||
<link rel="icon" type="image/png" href="/favicon.ico">
|
<link rel="icon" type="image/png" href="/favicon.ico">
|
||||||
<link rel="stylesheet" href="style.css">
|
<link rel="stylesheet" href="style.css">
|
||||||
<script>
|
<script>
|
||||||
fetch('/api/version')
|
fetch('/version.txt')
|
||||||
.then(response => response.json())
|
.then(response => response.text())
|
||||||
.then(data => {
|
.then(version => {
|
||||||
const versionSpan = document.querySelector('.version');
|
const versionSpan = document.querySelector('.version');
|
||||||
if (versionSpan) {
|
if (versionSpan) {
|
||||||
versionSpan.textContent = 'v' + data.version;
|
versionSpan.textContent = 'v' + version.trim();
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.catch(error => console.error('Error fetching version:', error));
|
.catch(error => console.error('Error fetching version:', error));
|
||||||
|
|||||||
+1
-2
@@ -30,8 +30,7 @@
|
|||||||
<nav style="display: flex; gap: 1rem;">
|
<nav style="display: flex; gap: 1rem;">
|
||||||
<a href="/">Start</a>
|
<a href="/">Start</a>
|
||||||
<a href="/waage">Scale</a>
|
<a href="/waage">Scale</a>
|
||||||
<a href="/config">Config</a>
|
<a href="/setup">Setup</a>
|
||||||
<a href="/about">About</a>
|
|
||||||
<a href="/upgrade">Upgrade</a>
|
<a href="/upgrade">Upgrade</a>
|
||||||
</nav>
|
</nav>
|
||||||
<div class="status-container">
|
<div class="status-container">
|
||||||
|
|||||||
+18
-1
@@ -6,13 +6,24 @@
|
|||||||
<title>FilaMan - Setup</title>
|
<title>FilaMan - Setup</title>
|
||||||
<link rel="icon" type="image/png" href="/favicon.ico">
|
<link rel="icon" type="image/png" href="/favicon.ico">
|
||||||
<link rel="stylesheet" href="style.css">
|
<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>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div class="navbar">
|
<div class="navbar">
|
||||||
<div style="display: flex; align-items: center; gap: 2rem;">
|
<div style="display: flex; align-items: center; gap: 2rem;">
|
||||||
<img src="/logo.png" alt="FilaMan Logo" class="logo">
|
<img src="/logo.png" alt="FilaMan Logo" class="logo">
|
||||||
<div class="logo-text">
|
<div class="logo-text">
|
||||||
<h1>FilaMan</h1>
|
<h1>FilaMan<span class="version"></span></h1>
|
||||||
<h4>Filament Management Tool</h4>
|
<h4>Filament Management Tool</h4>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -22,6 +33,12 @@
|
|||||||
<a href="/setup">Setup</a>
|
<a href="/setup">Setup</a>
|
||||||
<a href="/upgrade">Upgrade</a>
|
<a href="/upgrade">Upgrade</a>
|
||||||
</nav>
|
</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>
|
||||||
|
|
||||||
<div class="content">
|
<div class="content">
|
||||||
|
|||||||
+7
-2
@@ -30,10 +30,15 @@
|
|||||||
<nav style="display: flex; gap: 1rem;">
|
<nav style="display: flex; gap: 1rem;">
|
||||||
<a href="/">Start</a>
|
<a href="/">Start</a>
|
||||||
<a href="/waage">Scale</a>
|
<a href="/waage">Scale</a>
|
||||||
<a href="/config">Config</a>
|
<a href="/setup">Setup</a>
|
||||||
<a href="/about">About</a>
|
|
||||||
<a href="/upgrade">Upgrade</a>
|
<a href="/upgrade">Upgrade</a>
|
||||||
</nav>
|
</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>
|
||||||
|
|
||||||
<div class="content">
|
<div class="content">
|
||||||
|
|||||||
+1
-1
@@ -9,7 +9,7 @@
|
|||||||
; https://docs.platformio.org/page/projectconf.html
|
; https://docs.platformio.org/page/projectconf.html
|
||||||
|
|
||||||
[common]
|
[common]
|
||||||
version = "3.0.6"
|
version = "3.0.7"
|
||||||
to_old_version = "2.0.10"
|
to_old_version = "2.0.10"
|
||||||
|
|
||||||
##
|
##
|
||||||
|
|||||||
@@ -50,6 +50,21 @@ bool loadJsonValue(const char* filename, JsonDocument& doc) {
|
|||||||
return true;
|
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() {
|
void initializeFileSystem() {
|
||||||
if (!LittleFS.begin(true)) {
|
if (!LittleFS.begin(true)) {
|
||||||
Serial.println("LittleFS Mount Failed");
|
Serial.println("LittleFS Mount Failed");
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
bool removeJsonValue(const char* filename);
|
bool removeJsonValue(const char* filename);
|
||||||
bool saveJsonValue(const char* filename, const JsonDocument& doc);
|
bool saveJsonValue(const char* filename, const JsonDocument& doc);
|
||||||
bool loadJsonValue(const char* filename, JsonDocument& doc);
|
bool loadJsonValue(const char* filename, JsonDocument& doc);
|
||||||
|
String readFile(const char* filename);
|
||||||
void initializeFileSystem();
|
void initializeFileSystem();
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
+13
-2
@@ -128,14 +128,19 @@ void setupWebserver(AsyncWebServer &server) {
|
|||||||
|
|
||||||
server.on("/waage", HTTP_GET, [](AsyncWebServerRequest *request){
|
server.on("/waage", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||||
Serial.println("Web: Request /waage");
|
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);
|
response->addHeader("Cache-Control", NO_CACHE);
|
||||||
request->send(response);
|
request->send(response);
|
||||||
});
|
});
|
||||||
|
|
||||||
server.on("/setup", HTTP_GET, [](AsyncWebServerRequest *request){
|
server.on("/setup", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||||
Serial.println("Web: Request /setup");
|
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);
|
response->addHeader("Cache-Control", NO_CACHE);
|
||||||
request->send(response);
|
request->send(response);
|
||||||
});
|
});
|
||||||
@@ -154,6 +159,12 @@ void setupWebserver(AsyncWebServer &server) {
|
|||||||
request->send(response);
|
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){
|
server.on("/style.css", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||||
AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/style.css", "text/css");
|
AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/style.css", "text/css");
|
||||||
response->addHeader("Cache-Control", NO_CACHE);
|
response->addHeader("Cache-Control", NO_CACHE);
|
||||||
|
|||||||
Reference in new issue
Block a user