Apply ESP32 dashboard design treatment

Author: DeanJ87

src/Config.cpp

@@ -95,6 +95,41 @@ namespace SQM
             }
             return false;
         }
+
+        bool isTimeSourceEnabled(const Config &cfg, TimeSource source)
+        {
+            return source == TimeSource::NTP ? cfg.ntp.enabled : cfg.gps.enabled;
+        }
+
+        void normalizeTimeSources(Config &cfg)
+        {
+            if (!cfg.ntp.enabled && !cfg.gps.enabled)
+            {
+                return;
+            }
+
+            if (!isTimeSourceEnabled(cfg, cfg.primaryTimeSource))
+            {
+                cfg.primaryTimeSource = cfg.ntp.enabled ? TimeSource::NTP : TimeSource::GPS;
+            }
+
+            if (!isTimeSourceEnabled(cfg, cfg.secondaryTimeSource))
+            {
+                cfg.secondaryTimeSource = cfg.gps.enabled && cfg.primaryTimeSource != TimeSource::GPS
+                                            ? TimeSource::GPS
+                                            : TimeSource::NTP;
+            }
+
+            if (cfg.ntp.enabled && cfg.gps.enabled && cfg.primaryTimeSource == cfg.secondaryTimeSource)
+            {
+                cfg.secondaryTimeSource = cfg.primaryTimeSource == TimeSource::NTP ? TimeSource::GPS : TimeSource::NTP;
+            }
+
+            if (!cfg.ntp.enabled || !cfg.gps.enabled)
+            {
+                cfg.secondaryTimeSource = cfg.primaryTimeSource;
+            }
+        }
     } // namespace
 
     std::optional<Config> Config::load()
@@ -352,6 +387,26 @@ namespace SQM
             return setError(error, "Secondary time source is invalid");
         }
 
+        if (!ntp.enabled && !gps.enabled)
+        {
+            return setError(error, "At least one time source must be enabled");
+        }
+
+        if (!isTimeSourceEnabled(*this, primaryTimeSource))
+        {
+            return setError(error, "Primary time source is disabled");
+        }
+
+        if (ntp.enabled && gps.enabled && !isTimeSourceEnabled(*this, secondaryTimeSource))
+        {
+            return setError(error, "Secondary time source is disabled");
+        }
+
+        if (ntp.enabled && gps.enabled && primaryTimeSource == secondaryTimeSource)
+        {
+            return setError(error, "Time sources must be different when both NTP and GPS are enabled");
+        }
+
         if (wifi.reconnectDelayMs == 0 || wifi.maxReconnectDelayMs == 0 ||
             wifi.reconnectDelayMs > 86400000 || wifi.maxReconnectDelayMs > 86400000 ||
             wifi.reconnectDelayMs > wifi.maxReconnectDelayMs)
@@ -615,6 +670,8 @@ namespace SQM
                 cfg.sensor.i2cFrequency = sensor["i2cFrequency"] | 100000;
         }
 
+        normalizeTimeSources(cfg);
+
         std::string validationError;
         if (!cfg.validate(&validationError))
         {

src/WebServer.cpp

@@ -22,6 +22,8 @@ namespace SQM
 {
     namespace
     {
+        constexpr size_t CONFIG_JSON_BUFFER_SIZE = 4096;
+
         esp_timer_handle_t restartTimer = nullptr;
 
         void restartTimerCallback(void *)
@@ -415,7 +417,8 @@ namespace SQM
                 {
                     request->send(500, "application/json", createErrorJson("Failed to save configuration").c_str());
                 }
-            });
+            },
+            CONFIG_JSON_BUFFER_SIZE);
         configHandler->setMethod(HTTP_POST | HTTP_PUT);
         server.addHandler(configHandler);
 

web/src/App.tsx

@@ -6,6 +6,7 @@ import Dashboard from './components/Dashboard';
 import Settings from './components/Settings';
 import System from './components/System';
 import Updates from './components/Updates';
+import NotFound from './components/NotFound';
 
 const isDemo = import.meta.env.VITE_DEMO_MODE === 'true';
 
@@ -36,6 +37,9 @@ const App: FunctionalComponent = () => (
     <Layout path="/updates">
       <Updates />
     </Layout>
+    <Layout default>
+      <NotFound />
+    </Layout>
   </Router>
 );