Embed website, add LED breathing, tweak thresholds

Embed generated website assets into firmware and prefer PROGMEM pages over SPIFFS; add helpers to serve PROGMEM strings and update root handler. Implement LED breathing brightness (sinusoidal pulse) and adjust LED behavior per status. Lower alignment/intensity thresholds in the Justage page and JS logic (Optimal: 50000->4000, Gut: 20000->1500). Add extra startup/version logging, handle captive-portal URI variants (/generate_204*), and update build/version metadata. Minor README esptool port adjustment and regenerated HTML header files.

Author: beniroquai

Production_Files/Software/ODMR_Server/README.md

@@ -400,9 +400,10 @@ cd /Users/bene/Dropbox/Dokumente/Promotion/PROJECTS/TechnicalDocs-openUC2-QBox/P
 # Output: build/fw-images/seeed_xiao_esp32c3.bin  → direkt an 0x0 flashen
 /Users/bene/.platformio/penv/bin/pio run -e seeed_xiao_esp32c3 -t upload_merged --upload-port /dev/cu.usbmodem101 
 
+# Rather use this: (same as webserial)
 /Users/bene/.platformio/penv/bin/python -m esptool \
   --chip esp32c3 \
-  -p /dev/cu.usbmodem101 \
+  -p /dev/cu.usbmodem1101 \
   -b 460800 \
   write-flash \
   --flash-mode keep \

Production_Files/Software/ODMR_Server/build/fw-images/seeed_xiao_esp32c3.bin

@@ -104,7 +104,7 @@ <h5>Messbereich</h5>
             <div class="card-body">
               <p><strong>Minimal:</strong> 0</p>
               <p><strong>Maximal:</strong> 65535</p>
-              <p><strong>Optimal:</strong> > 50000</p>
+              <p><strong>Optimal:</strong> > 4000</p>
             </div>
           </div>
 
@@ -238,11 +238,11 @@ <h5>Sensor-Einstellungen</h5>
           intensityBar.setAttribute('aria-valuenow', percentage);
 
           // Update status based on intensity
-          if (intensity > 50000) {
+          if (intensity > 4000) {
             alignmentStatus.textContent = 'Optimal';
             alignmentStatus.className = 'badge bg-success';
             intensityBar.className = 'progress-bar bg-success';
-          } else if (intensity > 20000) {
+          } else if (intensity > 1500) {
             alignmentStatus.textContent = 'Gut';
             alignmentStatus.className = 'badge bg-warning';
             intensityBar.className = 'progress-bar bg-warning';

Production_Files/Software/ODMR_Server/data/justage.html

@@ -12,6 +12,14 @@
 // Version info (auto-generated)
 #include "version_info.h"
 
+// Embedded website files (auto-generated by build_website.py)
+#include "website/index_html.h"
+#include "website/messung_html.h"
+#include "website/justage_html.h"
+#include "website/ratio_html.h"
+#include "website/infos_html.h"
+#include "website/style_css.h"
+
 #define ADF_FREQ_MIN 2200.0f // Min frequency for ADF4351 (2.2 GHz)
 #define ADF_FREQ_MAX 4400.0f // Max frequency for ADF4351 (4.4 GHz)
 
@@ -125,20 +133,25 @@ void updateLEDs()
     return;
   lastLEDUpdate = millis();
 
-  strip.setBrightness(100); // Set to 50% brightness
+  // Breathing brightness: sinusoidal pulse between ~20 and 100 over ~3 seconds
+  float breathPhase = (float)(millis() % 3000) / 3000.0f; // 0..1 over 3 s
+  float breathVal   = (sin(breathPhase * 2.0f * PI) + 1.0f) / 2.0f; // 0..1
+  uint8_t breathBri = (uint8_t)(20 + breathVal * 80); // range 20..100
 
   switch (currentLEDStatus)
   {
   case LED_NO_CLIENT:
-    // White color for no client connected
+    // White breathing for no client connected
+    strip.setBrightness(breathBri);
     for (int i = 0; i < strip.numPixels(); i++)
     {
-      strip.setPixelColor(i, strip.Color(100, 100, 100)); // TODO: Make it glowing?
+      strip.setPixelColor(i, strip.Color(100, 100, 100));
     }
     break;
 
   case LED_CONNECTED:
     // Rainbow effect when client connected but idle
+    strip.setBrightness(100);
     for (int i = 0; i < strip.numPixels(); i++)
     {
       int pixelHue = firstPixelHue + (i * 65536L / strip.numPixels());
@@ -150,25 +163,69 @@ void updateLEDs()
     break;
 
   case LED_MEASURING:
-    // Red color when measuring frequency sweep
+    // Red breathing when measuring frequency sweep
+    strip.setBrightness(breathBri);
     for (int i = 0; i < strip.numPixels(); i++)
     {
-      strip.setPixelColor(i, strip.Color(100, 0, 0)); // TODO: Make it glowing?
+      strip.setPixelColor(i, strip.Color(100, 0, 0));
     }
     break;
 
   case LED_INTENSITY:
-    // Blue color when monitoring intensity for alignment
+    // Blue breathing when monitoring intensity for alignment
+    strip.setBrightness(breathBri);
     for (int i = 0; i < strip.numPixels(); i++)
     {
-      strip.setPixelColor(i, strip.Color(0, 0, 100)); // TODO: Make it glowing?
+      strip.setPixelColor(i, strip.Color(0, 0, 100));
     }
     break;
   }
 
   strip.show();
 }
 
+// Utility to serve a PROGMEM string with the given content type
+void servePROGMEM(const char *content, const char *contentType)
+{
+  server.send_P(200, contentType, content);
+}
+
+// Try embedded PROGMEM pages first; return true if handled.
+bool serveEmbeddedPage(const String &path)
+{
+  if (path == "/index.html" || path == "/")
+  {
+    servePROGMEM(INDEX_HTML, "text/html");
+    return true;
+  }
+  if (path == "/messung.html")
+  {
+    servePROGMEM(MESSUNG_HTML, "text/html");
+    return true;
+  }
+  if (path == "/justage.html")
+  {
+    servePROGMEM(JUSTAGE_HTML, "text/html");
+    return true;
+  }
+  if (path == "/ratio.html")
+  {
+    servePROGMEM(RATIO_HTML, "text/html");
+    return true;
+  }
+  if (path == "/infos.html")
+  {
+    servePROGMEM(INFOS_HTML, "text/html");
+    return true;
+  }
+  if (path == "/style.css")
+  {
+    servePROGMEM(STYLE_CSS, "text/css");
+    return true;
+  }
+  return false;
+}
+
 // Utility to serve static files from header files
 // Determine MIME content type from file extension
 String getContentType(const String &path)
@@ -183,7 +240,7 @@ String getContentType(const String &path)
   return "text/plain";
 }
 
-// Serve files from SPIFFS, fall back to index.html for SPA navigation
+// Serve files: try embedded PROGMEM first, then SPIFFS fallback
 void handleFileRequest(const String &path)
 {
   String actualPath = path;
@@ -197,7 +254,11 @@ void handleFileRequest(const String &path)
     actualPath = "/" + actualPath;
   }
 
-  // Try to serve from SPIFFS
+  // 1) Try serving from embedded PROGMEM (fast, no flash read)
+  if (serveEmbeddedPage(actualPath))
+    return;
+
+  // 2) Try to serve from SPIFFS (images, bootstrap, etc.)
   if (SPIFFS.exists(actualPath))
   {
     File file = SPIFFS.open(actualPath, "r");
@@ -210,22 +271,13 @@ void handleFileRequest(const String &path)
     }
   }
 
-  // File not found — for HTML navigation requests fall back to index.html
+  // File not found — for HTML navigation requests fall back to embedded index
   String accept = server.header("Accept");
   if (actualPath.endsWith(".html") || accept.indexOf("text/html") >= 0)
   {
-    Serial.print("Unknown HTML path -> index: ");
+    Serial.print("Unknown HTML path -> index (PROGMEM): ");
     Serial.println(actualPath);
-    if (SPIFFS.exists("/index.html"))
-    {
-      File idx = SPIFFS.open("/index.html", "r");
-      server.streamFile(idx, "text/html");
-      idx.close();
-    }
-    else
-    {
-      server.send(200, "text/html", "<h1>ODMR Server</h1><p>SPIFFS not mounted or index.html missing.</p>");
-    }
+    servePROGMEM(INDEX_HTML, "text/html");
   }
   else
   {
@@ -743,6 +795,11 @@ void setup()
   Serial.begin(115200);
   delay(1500); // Allow time to connect
   Serial.println("Booting...");
+  Serial.println("=========================================");
+  Serial.printf("  openUC2 ODMR Server %s\n", VERSION_STRING);
+  Serial.printf("  Build : %s %s\n", BUILD_DATE, BUILD_TIME);
+  Serial.printf("  Git   : %s (%s)\n", GIT_HASH, GIT_BRANCH);
+  Serial.println("=========================================");
 
   disableLoopWDT(); // Deactivate Watchdog for loop
   // Check WiFi capabilities
@@ -890,9 +947,9 @@ void setup()
   // adf.updateFrequency(2.2e9); // 2.2 GHz // 1.800 GHz ─ writes R5…R0
 
   // Setup routes
-  // Root handler — serve index.html from SPIFFS
+  // Root handler — serve index.html from PROGMEM
   server.on("/", HTTP_GET, []()
-            { handleFileRequest("/index.html"); });
+            { servePROGMEM(INDEX_HTML, "text/html"); });
 
   // Captive portal detection endpoints (P0 #1)
   // Returning a non-"Success" HTML page triggers the OS captive portal popup.
@@ -965,11 +1022,19 @@ void setup()
     // Silently return 404 for known OS background requests (Windows Update, etc.)
     // to avoid log spam from e.g. /msdownload/update/... certificate fetches
     if (uri.startsWith("/msdownload/") || uri.endsWith(".cab") ||
-        uri.startsWith("/GTSLT") || uri.startsWith("/ocsp"))
+        uri.startsWith("/GTSLT") || uri.startsWith("/ocsp") ||
+        uri.startsWith("/en-GB/") || uri.startsWith("/en-US/"))
     {
       server.send(404, "text/plain", "");
       return;
     }
+    // Android / Windows append a UUID to /generate_204, e.g. /generate_204_abc123
+    // Match any URI starting with /generate_204 to catch these variants.
+    if (uri.startsWith("/generate_204"))
+    {
+      server.send(200, "text/html", PORTAL_HTML);
+      return;
+    }
     handleFileRequest(uri);
   });
   server.on("/odmr_act", HTTP_POST, handleOdmrAct);

Production_Files/Software/ODMR_Server/src/main.cpp

@@ -5,11 +5,11 @@
 #define __VERSION_INFO_H__
 
 #define FIRMWARE_VERSION "1.0.0"
-#define BUILD_DATE "2026-03-03"
-#define BUILD_TIME "12:58:56"
-#define BUILD_TIMESTAMP "20260303125856"
-#define GIT_HASH "7f03fb3"
-#define GIT_BRANCH "main"
+#define BUILD_DATE "2026-03-09"
+#define BUILD_TIME "14:54:53"
+#define BUILD_TIMESTAMP "20260309145453"
+#define GIT_HASH "83740a3"
+#define GIT_BRANCH "fix-listoferrors"
 
 // Combined version string
 #define VERSION_STRING "v" FIRMWARE_VERSION " (" BUILD_DATE " " BUILD_TIME " - " GIT_HASH ")"

Production_Files/Software/ODMR_Server/src/version_info.h

@@ -103,7 +103,7 @@ <h5>Messbereich</h5>
             <div class="card-body">
               <p><strong>Minimal:</strong> 0</p>
               <p><strong>Maximal:</strong> 65535</p>
-              <p><strong>Optimal:</strong> > 50000</p>
+              <p><strong>Optimal:</strong> > 4000</p>
             </div>
           </div>
 
@@ -238,11 +238,11 @@ <h5>Sensor-Einstellungen</h5>
           intensityBar.setAttribute('aria-valuenow', percentage);
 
           // Update status based on intensity
-          if (intensity > 50000) {
+          if (intensity > 4000) {
             alignmentStatus.textContent = 'Optimal';
             alignmentStatus.className = 'badge bg-success';
             intensityBar.className = 'progress-bar bg-success';
-          } else if (intensity > 20000) {
+          } else if (intensity > 1500) {
             alignmentStatus.textContent = 'Gut';
             alignmentStatus.className = 'badge bg-warning';
             intensityBar.className = 'progress-bar bg-warning';