diff --git a/html/header.html b/html/header.html
index 53eb785..224a246 100644
--- a/html/header.html
+++ b/html/header.html
@@ -30,8 +30,7 @@
diff --git a/html/rfid.html b/html/rfid.html
deleted file mode 100644
index 89358e7..0000000
--- a/html/rfid.html
+++ /dev/null
@@ -1,68 +0,0 @@
-
-
-
-
-
-
FilaMan - Status
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/html/rfid.js b/html/rfid.js
deleted file mode 100644
index 12597ac..0000000
--- a/html/rfid.js
+++ /dev/null
@@ -1,80 +0,0 @@
-let socket;
-let isConnected = false;
-const RECONNECT_INTERVAL = 5000;
-
-function initWebSocket() {
- if (socket) {
- socket.close();
- socket = null;
- }
-
- try {
- socket = new WebSocket('ws://' + window.location.host + '/ws');
-
- socket.onopen = function() {
- isConnected = true;
- console.log("WebSocket connected");
- };
-
- socket.onclose = function() {
- isConnected = false;
- setTimeout(initWebSocket, RECONNECT_INTERVAL);
- };
-
- socket.onmessage = function(event) {
- const data = JSON.parse(event.data);
- if (data.type === 'nfcData') {
- updateNfcDisplay(data.payload);
- } else if (data.type === 'heartbeat') {
- updateStatusDots(data);
- } else if (data.type === 'weight') {
- document.getElementById('weightDisplay').textContent = data.value + 'g';
- }
- };
- } catch (error) {
- isConnected = false;
- setTimeout(initWebSocket, RECONNECT_INTERVAL);
- }
-}
-
-function updateStatusDots(data) {
- const filamanDot = document.getElementById('filamanDot');
- const ramStatus = document.getElementById('ramStatus');
-
- if (filamanDot) {
- filamanDot.style.backgroundColor = data.filaman_connected ? '#4caf50' : '#f44336';
- }
- if (ramStatus) {
- ramStatus.textContent = `${data.freeHeap}k free`;
- }
-}
-
-function updateNfcDisplay(data) {
- const nfcInfo = document.getElementById('nfcInfo');
- if (data.error || data.info || !data || Object.keys(data).length === 0) {
- nfcInfo.textContent = data.info || data.error || "No tag detected";
- return;
- }
-
- let html = "
Tag detected:";
- if (data.sm_id) {
- html += `Spool ID: ${data.sm_id}
`;
- if (data.brand) html += `Brand: ${data.brand}
`;
- if (data.type) html += `Material: ${data.type}
`;
- } else if (data.location_id) {
- html += `Location ID: ${data.location_id}
`;
- } else {
- html += "Unknown Tag Format";
- }
- nfcInfo.innerHTML = html;
-}
-
-document.addEventListener("DOMContentLoaded", function() {
- initWebSocket();
- // Heartbeat loop
- setInterval(() => {
- if (socket && socket.readyState === WebSocket.OPEN) {
- socket.send(JSON.stringify({ type: 'heartbeat' }));
- }
- }, 5000);
-});
diff --git a/html/config.html b/html/setup.html
similarity index 83%
rename from html/config.html
rename to html/setup.html
index 2c8b24b..147fcfc 100644
--- a/html/config.html
+++ b/html/setup.html
@@ -3,41 +3,29 @@
-
FilaMan - Configuration
+
FilaMan - Setup
-
-
Device Configuration
+
Device Setup
diff --git a/html/upgrade.html b/html/upgrade.html
index d34d4a8..3ecbd75 100644
--- a/html/upgrade.html
+++ b/html/upgrade.html
@@ -1,4 +1,4 @@
-
+
@@ -30,8 +30,7 @@
@@ -42,8 +41,6 @@
-
-
Firmware Upgrade
@@ -58,7 +55,7 @@
@@ -69,7 +66,7 @@
@@ -82,12 +79,6 @@
-
\ No newline at end of file
+
diff --git a/html/wifi.html b/html/wifi.html
index 0ffef42..8dcee67 100644
--- a/html/wifi.html
+++ b/html/wifi.html
@@ -1,4 +1,4 @@
-
+
@@ -30,8 +30,7 @@
@@ -42,16 +41,27 @@
-
-
-
WiFi Configuration Page
-
-
Configure your WiFi settings here.
+
WiFi Configuration
+
Your device is connected to WiFi.
+
To change WiFi settings, you can reset the WiFi configuration by holding the hardware button (if available) or using the WiFi manager portal.
+
+
diff --git a/src/display.cpp b/src/display.cpp
index c515b3d..be9b50b 100644
--- a/src/display.cpp
+++ b/src/display.cpp
@@ -145,7 +145,7 @@ void oledShowMultilineMessage(const String &message, uint8_t size) {
display.display();
}
-void oledShowMessage(const String &message, uint8_t size) {
+void oledDisplayText(const String &message, uint8_t size) {
oledcleardata();
display.setTextSize(size);
display.setTextWrap(false);
@@ -177,19 +177,7 @@ void oledShowTopRow() {
// Do not show status indicators during boot
if(!booting){
- if(bambuDisabled == false) {
- if (bambu_connected == 1) {
- display.drawBitmap(50, 0, bitmap_bambu_on , 16, 16, WHITE);
- } else {
- if(iconToggle){
- display.drawBitmap(50, 0, bitmap_bambu_on , 16, 16, WHITE);
- display.drawLine(50, 15, 66, 0, WHITE);
- display.drawLine(51, 15, 67, 0, WHITE);
- }
- }
- }
-
- if (spoolmanConnected) {
+ if (filamanConnected) {
display.drawBitmap(80, 0, bitmap_spoolman_on , 16, 16, WHITE);
} else {
if(iconToggle){
diff --git a/src/display.h b/src/display.h
index c4cdb08..06e55a7 100644
--- a/src/display.h
+++ b/src/display.h
@@ -19,7 +19,7 @@ int oled_center_v(const String &text);
void oledShowProgressBar(const uint8_t step, const uint8_t numSteps, const char* largeText, const char* statusMessage);
void oledShowWeight(uint16_t weight);
-void oledShowMessage(const String &message, uint8_t size = 2);
+void oledDisplayText(const String &message, uint8_t size = 2);
void oledShowTopRow();
void oledShowIcon(const char* icon);
diff --git a/src/main.cpp b/src/main.cpp
index 10e3f82..78a230b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,6 +1,8 @@
#include