✨ Final refactoring finished

mawoka-myblock · Feb 3, 2025 · 52813b7 · 52813b7
1 parent efccc08
commit 52813b7
Show file tree

Hide file tree

Showing 6 changed files with 281 additions and 238 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -27,19 +27,19 @@ esp-idf-svc = { version = "0.51", features= ["experimental", "embassy-time-drive
 embedded-hal = "1"
 heapless = "0.8"
 edge-http = "0.5.1"
-embedded-io-async = "0.6"
-edge-nal-std = { version = "0.5", features = ["async-io-mini"] }
+edge-captive = "0.5"
 edge-nal = "0.5"
 edge-ws = "0.4"
-
-
+edge-nal-std = { version = "0.5", features = ["async-io-mini"] }
+embedded-io-async = "0.6"
 anyhow = "1"
 url = "2.5"
-
-
 veml7700 = "0.2.0"
 embassy-time = { version = "0.4", features = ["log", "generic-queue-8"] }
+embassy-futures = "0.1"
 async-std = {version = "1.13"}
+smart-leds = "*"
+ws2812-esp32-rmt-driver = { version = "*", features = ["smart-leds-trait"] }
 
 [build-dependencies]
 embuild = {version = "0.33", features = ["espidf"]}

diff --git a/sdkconfig.defaults b/sdkconfig.defaults
@@ -1,2 +1,2 @@
-CONFIG_ESP_MAIN_TASK_STACK_SIZE=30000
+CONFIG_ESP_MAIN_TASK_STACK_SIZE=50000
 CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=4096
diff --git a/src/index.html b/src/index.html
@@ -35,22 +35,6 @@
             margin-bottom: 20px;
         }
 
-        .message {
-            background-color: #e0f7fa;
-            border-left: 4px solid #00796b;
-            padding: 10px;
-            margin: 10px 0;
-            border-radius: 5px;
-            color: #00796b;
-            word-wrap: break-word;
-        }
-
-        .timestamp {
-            font-size: 0.8em;
-            color: #666;
-            text-align: right;
-        }
-
         .status {
             text-align: center;
             padding: 10px;
@@ -75,6 +59,17 @@
             margin: auto;
             font-size: 3rem;
         }
+
+        .fallback-btn {
+            display: none;
+            margin: 10px auto;
+            padding: 10px 20px;
+            background-color: #00796b;
+            color: white;
+            border: none;
+            border-radius: 5px;
+            cursor: pointer;
+        }
     </style>
 </head>
 
@@ -83,6 +78,7 @@
         <h1>Td-Free</h1>
         <div id="status" class="status">Connecting...</div>
         <p id="content"></p>
+        <button id="fallback-btn" class="fallback-btn" onclick="enableFallback()">Enable Fallback Mode</button>
         <div style="display: flex; flex-direction: column; margin-top: auto;">
             <a href="/wifi" class="wifi-link" onclick="wifi_cfg">Wifi Config</a>
             <p class="wifi-link" style="color: gray; font-size: smaller;">Version {{VERSION}}</p>
@@ -91,78 +87,82 @@ <h1>Td-Free</h1>
     </div>
 
     <script>
-        // Replace this URL with your WebSocket server URL
-        const socket = new WebSocket(`ws://${window.location.hostname}/ws`);
-
-        const messagesContainer = document.getElementById("messages");
-        const statusContainer = document.getElementById("status");
-
-        let intervalId
-
-        const wifi_cfg = (e) => {
-            e.preventDefault()
-            socket.close()
-            window.location.assign("/wifi")
+        let socket;
+        let intervalId;
+        let fallbackInterval;
+        let fallbackEnabled = false;
+
+        function connectWebSocket() {
+            socket = new WebSocket(`ws://${window.location.hostname}/ws`);
+            const statusContainer = document.getElementById("status");
+
+            socket.addEventListener("open", () => {
+                statusContainer.textContent = "Connected to WebSocket server";
+                statusContainer.classList.add("connected");
+                document.getElementById("fallback-btn").style.display = "none";
+                if (intervalId) clearInterval(intervalId);
+                intervalId = setInterval(() => {
+                    if (socket.readyState === WebSocket.OPEN) {
+                        socket.send("p");
+                    }
+                }, 1000);
+            });
+
+            socket.addEventListener("message", (event) => {
+                if (event.data === 'p') return;
+                updateContent(event.data);
+            });
+
+            socket.addEventListener("close", () => {
+                statusContainer.textContent = "Disconnected from WebSocket server";
+                statusContainer.classList.remove("connected");
+                clearInterval(intervalId);
+                document.getElementById("fallback-btn").style.display = "block";
+            });
+
+            socket.addEventListener("error", () => {
+                statusContainer.textContent = "Error connecting to WebSocket server";
+                statusContainer.classList.remove("connected");
+                clearInterval(intervalId);
+                document.getElementById("fallback-btn").style.display = "block";
+            });
+
+            window.addEventListener("beforeunload", () => {
+                socket.close();
+            });
         }
-        const update_fw = (e) => {
-            e.preventDefault()
-            socket.close()
-            window.location.assign("/update")
-        }
-
-        // When the connection is open
-        socket.addEventListener("open", () => {
-            statusContainer.textContent = "Connected to WebSocket server";
-            statusContainer.classList.add("connected");
-
-            if (intervalId) {
-                clearInterval(intervalId); // Clear any existing interval
-            }
-            intervalId = setInterval(() => {
-                if (socket.readyState === WebSocket.OPEN) {
-                    socket.send("p");
-                    console.log("Sent: p");
-                }
-            }, 1000);
 
+        function enableFallback() {
+            fallbackEnabled = true;
+            document.getElementById("status").textContent = "Fallback mode enabled";
+            document.getElementById("fallback-btn").style.display = "none";
+            fallbackInterval = setInterval(fetchFallbackData, 1000);
+        }
 
-        });
+        function fetchFallbackData() {
+            fetch("/fallback")
+                .then(response => response.text())
+                .then(data => updateContent(data))
+                .catch(() => {
+                    document.getElementById("status").textContent = "Error fetching fallback data";
+                });
+        }
 
-        // When a message is received
-        socket.addEventListener("message", (event) => {
-            if (event.data === 'p') {
-                return
-            }
-            const el = document.getElementById("content")
-            if (event.data === "no_filament") {
-                el.innerText = "No filament inserted! Insert some"
+        function updateContent(data) {
+            const el = document.getElementById("content");
+            if (data === "no_filament") {
+                el.innerText = "No filament inserted! Insert some";
             } else {
-                const num = parseFloat(event.data)
+                const num = parseFloat(data);
                 if (isNaN(num)) {
-                    el.innerText = "An error occured!"
-                    return
+                    el.innerText = "An error occurred!";
+                    return;
                 }
-                el.innerText = num.toFixed(2)
+                el.innerText = num.toFixed(2);
             }
-        });
-
-        // When the connection is closed or there's an error
-        socket.addEventListener("close", () => {
-            statusContainer.textContent = "Disconnected from WebSocket server";
-            statusContainer.classList.remove("connected");
-            clearInterval(intervalId)
-
-        });
-
-        socket.addEventListener("error", () => {
-            statusContainer.textContent = "Error connecting to WebSocket server";
-            statusContainer.classList.remove("connected");
-            clearInterval(intervalId)
-        });
+        }
 
-        window.addEventListener("beforeunload", () => {
-            socket.close()
-        })
+        connectWebSocket();
     </script>
 </body>