Si4684 boot fix: flash encryption off, 16MB flash, NVS enc off, main task stack 8KB, CTS timeout 10s (fixes BootCmd error 6), DMA-safe HOST_LOAD buffer

Software/components/net/include/net/NetBootstrap.hpp

@@ -99,6 +99,21 @@ public:
     NetBootstrap(const NetBootstrap&) = delete;
     NetBootstrap& operator=(const NetBootstrap&) = delete;
 
+    /**
+     * @brief    NetBootstrap — construct a started bootstrap.
+     *
+     * @dname    NetBootstrap
+     * @param    softAp  Optional SoftAP mode host.
+     * @param    sta     Optional STA client instance.
+     * @param    webServer  HTTP server instance.
+     * @param    state   Initial network state.
+     * @pubstate Transfers ownership of optional network resources.
+     */
+    NetBootstrap(std::optional<SoftApHost> softAp,
+                 std::optional<StaClient> sta,
+                 SetupWebServer webServer,
+                 NetState state);
+
     /**
      * @brief    NetBootstrap — move-construct from a started bootstrap.
      *
@@ -148,11 +163,6 @@ public:
     [[nodiscard]] NetState state() const noexcept;
 
 private:
-    NetBootstrap(std::optional<SoftApHost> softAp,
-                 std::optional<StaClient> sta,
-                 SetupWebServer webServer,
-                 NetState state);
-
     std::optional<SoftApHost> softAp_;
     std::optional<StaClient> sta_;
     SetupWebServer webServer_;

Software/components/net/include/net/SetupWebServer.hpp

@@ -23,10 +23,9 @@
 #include "net/NetError.hpp"
 #include "net/NetState.hpp"
 
+#include "esp_http_server.h"
 #include <expected>
 
-struct httpd_req;
-
 namespace audio {
 class AudioService;
 } // namespace audio
@@ -172,7 +171,7 @@ public:
         const core::DeviceIdentity& deviceIdentity);
 
 private:
-    httpd_handle* server_;
+    httpd_handle_t server_;
     core::ISecureStore* store_;
     NetState netState_;
     tuner::TunerService* tuner_;