chore: update submodules (#128)

richardapeters · web-flow · commit d4da1197c2be · 2025-11-07T08:42:44.000+01:00
* Reapply "chore: update submodules (#121)" (#123) This reverts commit 3064c40. * Zero-terminate hostname * Invoke lambda
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -62,8 +62,7 @@
       "svdFile": "${workspaceFolder}/amp-hal-st/STM32F407.svd",
       "servertype": "jlink",
       "serverpath": "/opt/segger/jlink/JLinkGDBServer",
-      "objdumpPath": "arm-none-eabi-objdump",
-      "runToEntryPoint": "main"
+      "objdumpPath": "arm-none-eabi-objdump"
     }
   ]
 }
diff --git a/amp-embedded-infra-lib b/amp-embedded-infra-lib
@@ -1 +1 @@
-Subproject commit 9d3718fe966a1b4308b1f7ee4deb572958733cf9
+Subproject commit 45e1f5d94a2fcd1c4f66f949064a1a34be060fd4
diff --git a/amp-hal-st b/amp-hal-st
@@ -1 +1 @@
-Subproject commit ff2fb12cde89a3e1b35895b95f44ad3ca68b2c72
+Subproject commit adc8f0bb1a460ec7a9963d77e5864df0e13be052
diff --git a/amp-preview b/amp-preview
@@ -1 +1 @@
-Subproject commit 308b0c18c396df9a5f2aa169df655b008ea2ca9c
+Subproject commit 793f904fd603e79ea5020f47520316f080d4f01f
diff --git a/postmaster/flex/EchoWebSocketClientFactory.cpp b/postmaster/flex/EchoWebSocketClientFactory.cpp
@@ -42,7 +42,7 @@ namespace application
         connection.Attach(webSocketConnection);
         webSocketConnection->Attach(echo.Emplace(serializerFactoryWebSocket));
 
-        listener.Emplace(connectionFactory, 1234, services::SingleConnectionListener::Creators{ connectionCreator });
+        listener.emplace(connectionFactory, 1234, services::SingleConnectionListener::Creators{ connectionCreator });
     }
 
     void EchoWebSocketClientFactory::WebSocketInitiationError(WebSocketClientObserverFactory::ConnectFailReason reason)
diff --git a/postmaster/flex/EchoWebSocketClientFactory.hpp b/postmaster/flex/EchoWebSocketClientFactory.hpp
@@ -36,25 +36,25 @@ namespace application
         services::MethodSerializerFactory::OnHeap serializerFactoryListener;
         infra::SharedOptional<services::WebSocketClientConnectionObserver> webSocket;
         infra::SharedOptional<services::EchoOnConnection> echo;
-        infra::Optional<services::SingleConnectionListener> listener;
-        infra::Optional<services::EchoOnConnection> listenConnection;
+        std::optional<services::SingleConnectionListener> listener;
+        std::optional<services::EchoOnConnection> listenConnection;
 
         infra::CreatorExternal<services::ConnectionObserver, void(services::IPAddress address)> connectionCreator{ [this](services::IPAddress address) -> services::ConnectionObserver&
             {
-                listenConnection.Emplace(serializerFactoryListener);
-                forwarder1.Emplace(*echo, *listenConnection);
-                forwarder2.Emplace(*listenConnection, *echo);
+                listenConnection.emplace(serializerFactoryListener);
+                forwarder1.emplace(*echo, *listenConnection);
+                forwarder2.emplace(*listenConnection, *echo);
                 return *listenConnection;
             },
             [this]()
             {
-                forwarder1 = infra::none;
-                forwarder2 = infra::none;
-                listenConnection = infra::none;
+                forwarder1 = std::nullopt;
+                forwarder2 = std::nullopt;
+                listenConnection = std::nullopt;
             } };
 
-        infra::Optional<services::ServiceForwarderAll> forwarder1;
-        infra::Optional<services::ServiceForwarderAll> forwarder2;
+        std::optional<services::ServiceForwarderAll> forwarder1;
+        std::optional<services::ServiceForwarderAll> forwarder2;
     };
 }
 
diff --git a/postmaster/flex/Main.cpp b/postmaster/flex/Main.cpp
@@ -57,12 +57,12 @@ int main(int argc, const char* argv[], const char* env[])
         static services::HttpClientConnectorWithNameResolverImpl<> connector(network.ConnectionFactoryWithNameResolver());
         static infra::BoundedString::WithStorage<512> httpUrl{ urlArg };
         static infra::BoundedString::WithStorage<512> webSocketUrl{ urlArg };
-        static application::EchoWebSocketClientFactory webSocketFactory(webSocketUrl, services::PortFromUrl(webSocketUrl).ValueOr(80), network.ConnectionFactory(), tracer.tracer);
+        static application::EchoWebSocketClientFactory webSocketFactory(webSocketUrl, services::PortFromUrl(webSocketUrl).value_or(80), network.ConnectionFactory(), tracer.tracer);
         static services::HttpClientWebSocketInitiation webSocketInitiation(webSocketFactory, connector,
             webSocketFactory, randomDataGenerator, services::noAutoConnect);
         static application::HttpClientAuthenticationDigest::WithMaxHeaders<10> clientAuthentication{ passwordArg, randomDataGenerator };
         static services::HttpClientAuthenticationConnector clientAuthenticationConnector{ connector, clientAuthentication };
-        static application::FlexHttpClient httpClient(httpUrl, services::PortFromUrl(httpUrl).ValueOr(80), clientAuthenticationConnector, firmware, webSocketInitiation, tracer.tracer);
+        static application::FlexHttpClient httpClient(httpUrl, services::PortFromUrl(httpUrl).value_or(80), clientAuthenticationConnector, firmware, webSocketInitiation, tracer.tracer);
 
         network.ExecuteUntil([&]()
             {
diff --git a/postmaster/frontend/ReportingHttpServer.cpp b/postmaster/frontend/ReportingHttpServer.cpp
@@ -18,9 +18,9 @@ namespace application
         : SingleConnectionListener(connectionFactory, port, { connectionCreator })
         , reporter(reporter)
         , buffer(buffer)
-        , connectionCreator([this](infra::Optional<ReportingHttpServerConnectionObserver>& value, services::IPAddress address)
+        , connectionCreator([this](std::optional<ReportingHttpServerConnectionObserver>& value, services::IPAddress address)
               {
-                  value.Emplace(this->buffer, *this, this->reporter, address);
+                  value.emplace(this->buffer, *this, this->reporter, address);
               })
     {}
 }
diff --git a/postmaster/instantiations/EchoServer.hpp b/postmaster/instantiations/EchoServer.hpp
@@ -30,9 +30,9 @@ namespace main_
 
         UartCreator& serialCreator;
 
-        infra::Creator<services::ConnectionObserver, Bridge, void(services::IPAddress address)> bridgeCreator{ [this](infra::Optional<Bridge>& value, services::IPAddress address)
+        infra::Creator<services::ConnectionObserver, Bridge, void(services::IPAddress address)> bridgeCreator{ [this](std::optional<Bridge>& value, services::IPAddress address)
             {
-                value.Emplace(serialCreator);
+                value.emplace(serialCreator);
             } };
 
         services::SingleConnectionListener listener;
diff --git a/postmaster/instantiations/Mdns.cpp b/postmaster/instantiations/Mdns.cpp
@@ -7,7 +7,7 @@ namespace main_
         , version{ Create<16>(version, "vs") }
         , versionFull{ Create<19>(versionFull, "vf") }
         , attributes{ Create<67>(attributes, "at") }
-        , server(factory, multicast, hostname, "postmaster", "_tcp", infra::MakeOptional(ipAddress), infra::none, 80, text)
+        , server(factory, multicast, hostname, "postmaster", "_tcp", std::make_optional(ipAddress), std::nullopt, 80, text)
     {}
 
     template<std::size_t Size>
diff --git a/postmaster/instantiations/TargetProgrammer.hpp b/postmaster/instantiations/TargetProgrammer.hpp
@@ -24,7 +24,7 @@ namespace main_
             , stateCreator([this]() -> application::FirmwareReceptor&
                   {
                       really_assert(!state);
-                      state.Emplace(
+                      state.emplace(
                           this->uartProgrammerCreator, [this]()
                           {
                               state->firmwareReceptorToFlash.FlashInitializationDone();
@@ -44,7 +44,7 @@ namespace main_
                       // this as an event, other events are first handled
                       infra::EventDispatcher::Instance().Schedule([this]()
                           {
-                              state = infra::none;
+                              state = std::nullopt;
                           });
                   })
         {
@@ -91,7 +91,7 @@ namespace main_
 
         application::FirmwareReceptorResetTarget receptorResetTarget;
         application::FirmwareReceptorReporting firmwareReceptorReporting;
-        infra::Optional<State> state;
+        std::optional<State> state;
         infra::CreatorExternal<application::FirmwareReceptor, void()> stateCreator;
     };
 }
diff --git a/postmaster/instantiations/TargetUart.cpp b/postmaster/instantiations/TargetUart.cpp
@@ -4,9 +4,9 @@ namespace main_
 {
     TargetUart::TargetUart(application::Authentication& authentication, infra::BoundedConstString url, UartCreator& serialCreator)
         : serialCreator(serialCreator)
-        , targetUartConnection([this](infra::Optional<services::WebSocketServerConnectionObserver::WithBufferSizes<4096, 4096>>& value)
+        , targetUartConnection([this](std::optional<services::WebSocketServerConnectionObserver::WithBufferSizes<4096, 4096>>& value)
               {
-                  value.Emplace();
+                  value.emplace();
                   auto bridgePtr = bridge.Emplace(this->serialCreator);
                   value->services::Connection::Attach(infra::MakeContainedSharedObject(bridgePtr->uartConnection, bridgePtr));
               })
diff --git a/postmaster/instantiations/TargetUartEcho.cpp b/postmaster/instantiations/TargetUartEcho.cpp
@@ -4,9 +4,9 @@ namespace main_
 {
     TargetUartEcho::TargetUartEcho(application::Authentication& authentication, infra::BoundedConstString url, UartCreator& serialCreator)
         : serialCreator(serialCreator)
-        , targetUartConnectionCreator([this](infra::Optional<Bridge>& value)
+        , targetUartConnectionCreator([this](std::optional<Bridge>& value)
               {
-                  value.Emplace(this->serialCreator);
+                  value.emplace(this->serialCreator);
               })
         , page{ authentication, url, factory }
     {}
diff --git a/postmaster/instantiations_st/EthernetPostmaster.hpp b/postmaster/instantiations_st/EthernetPostmaster.hpp
@@ -21,11 +21,18 @@ namespace main_
             , attributes{ configuration.store, configuration.store.Configuration().attributes }
             , password{ configuration.store, configuration.store.Configuration().password }
             , authentication{ password, randomDataGenerator }
-            , networkCreator([this](infra::Optional<main_::NetworkConnected>& value, services::LightweightIp& lightweightIp)
+            , networkCreator([this](std::optional<main_::NetworkConnected>& value, services::LightweightIp& lightweightIp)
                   {
-                      value.Emplace(lightweightIp, hostname, attributes, password, authentication, this->upgradePack, this->uartProgrammerCreator, this->uartExternalCreator, this->reset, this->viewStatus);
+                      value.emplace(lightweightIp, hostname, attributes, password, authentication, this->upgradePack, this->uartProgrammerCreator, this->uartExternalCreator, this->reset, this->viewStatus);
                   })
-            , ethernet{ ethernetPins, configuration.DeviceMacAddress(), configuration.store.Configuration().hostname, randomDataGenerator, networkCreator }
+            , zeroTerminatedHostname([&configuration]()
+                  {
+                      infra::BoundedString::WithStorage<65> result{ configuration.store.Configuration().hostname };
+                      result.push_back(0);
+                      return result;
+                  }())
+
+            , ethernet{ ethernetPins, configuration.DeviceMacAddress(), zeroTerminatedHostname, randomDataGenerator, networkCreator }
         {}
 
         hal::Flash& upgradePack;
@@ -42,6 +49,7 @@ namespace main_
         application::Authentication authentication;
         infra::Creator<services::Stoppable, main_::NetworkConnected, void(services::LightweightIp& lightweightIp)> networkCreator;
 
+        infra::BoundedString::WithStorage<65> zeroTerminatedHostname = {};
         main_::Ethernet<3, 0, 4> ethernet;
     };
 }
diff --git a/postmaster/postmaster_stm32f407/Main.cpp b/postmaster/postmaster_stm32f407/Main.cpp
@@ -62,13 +62,13 @@ namespace main_
     {
         TargetUarts(hal::DmaStm& dma)
             : uartTransmitStream{ dma, hal::DmaChannelId{ 2, 7, 4 } }
-            , uartProgrammerCreator{ [this, &dma](infra::Optional<hal::UartStmDma>& value, const UartConfig& config)
+            , uartProgrammerCreator{ [this, &dma](std::optional<hal::UartStmDma>& value, const UartConfig& config)
                 {
-                    value.Emplace(uartTransmitStream, 1, uartProgrammerTx, uartProgrammerRx, Convert(config));
+                    value.emplace(uartTransmitStream, 1, uartProgrammerTx, uartProgrammerRx, Convert(config));
                 } }
-            , uartExternalCreator{ [this, &dma](infra::Optional<hal::UartStmDma>& value, const UartConfig& config)
+            , uartExternalCreator{ [this, &dma](std::optional<hal::UartStmDma>& value, const UartConfig& config)
                 {
-                    value.Emplace(uartTransmitStream, 1, uartExternalTx, uartExternalRx, Convert(config));
+                    value.emplace(uartTransmitStream, 1, uartExternalTx, uartExternalRx, Convert(config));
                 } }
         {}
 
diff --git a/postmaster/programmer/FirmwareReceptorResetTarget.cpp b/postmaster/programmer/FirmwareReceptorResetTarget.cpp
@@ -11,22 +11,22 @@ namespace application
     void FirmwareReceptorResetTarget::ReceptionStarted()
     {
         starting = true;
-        activateReset.Emplace(reset, false);
-        activateBoot0.Emplace(boot0, true);
+        activateReset.emplace(reset, false);
+        activateBoot0.emplace(boot0, true);
 
         timer.Start(std::chrono::milliseconds(1), [this]()
             {
                 activateReset->Set(true);
 
                 timer.Start(std::chrono::milliseconds(1), [this]()
                     {
-                        activateReset = infra::none;
+                        activateReset = std::nullopt;
 
                         timer.Start(std::chrono::milliseconds(100), [this]()
                             {
                                 starting = false;
 
-                                delegate.Emplace(delegateCreator);
+                                delegate.emplace(delegateCreator);
                                 (*delegate)->ReceptionStarted();
 
                                 if (saveReader != nullptr)
@@ -51,9 +51,9 @@ namespace application
         (*delegate)->ReceptionStopped([this]()
         {
             hal::OutputPin activateReset(reset, false);
-            activateBoot0 = infra::none;
+            activateBoot0 = std::nullopt;
 
-            delegate = infra::none;
+            delegate = std::nullopt;
             this->onDone();
         });
     }
diff --git a/postmaster/programmer/FirmwareReceptorResetTarget.hpp b/postmaster/programmer/FirmwareReceptorResetTarget.hpp
@@ -22,10 +22,10 @@ namespace application
         hal::GpioPin& boot0;
 
         infra::CreatorBase<FirmwareReceptor, void()>& delegateCreator;
-        infra::Optional<infra::ProxyCreator<decltype(delegateCreator)>> delegate;
+        std::optional<infra::ProxyCreator<decltype(delegateCreator)>> delegate;
 
-        infra::Optional<hal::OutputPin> activateBoot0;
-        infra::Optional<hal::OutputPin> activateReset;
+        std::optional<hal::OutputPin> activateBoot0;
+        std::optional<hal::OutputPin> activateReset;
 
         bool starting = false;
 
diff --git a/postmaster/prototype_win/Main.cpp b/postmaster/prototype_win/Main.cpp
@@ -29,7 +29,7 @@ namespace main_
         void ReInitialize(infra::BoundedConstString reason)
         {
             page.ResetReceptor(reason);
-            state.Emplace([this]()
+            state.emplace([this]()
                 {
                     page.SetReceptor(state->firmwareReceptorToFlash);
                 },
@@ -60,7 +60,7 @@ namespace main_
         };
 
         application::HttpPageFirmware& page;
-        infra::Optional<State> state;
+        std::optional<State> state;
     };
 }
 
@@ -135,9 +135,9 @@ int main()
     static services::ConfigurationStoreAccess<infra::BoundedString> attributesAccess{ configurationStore, attributes };
     static services::ConfigurationStoreAccess<infra::BoundedString> passwordAccess{ configurationStore, password };
 
-    infra::Creator<hal::SerialCommunication, hal::UartWindows, void(const main_::UartConfig& config)> serialCreator([](infra::Optional<hal::UartWindows>& value, const main_::UartConfig& config)
+    infra::Creator<hal::SerialCommunication, hal::UartWindows, void(const main_::UartConfig& config)> serialCreator([](std::optional<hal::UartWindows>& value, const main_::UartConfig& config)
         {
-            value.Emplace("COM13");
+            value.emplace("COM13");
         });
 
     static main_::Mdns mdns{ "richard", networkAdapter.DatagramFactory(), networkAdapter.Multicast(), services::IPv4Address{ 1, 2, 5, 6 }, Postmaster::generated::VERSION, Postmaster::generated::VERSION_FULL, "attributes" };

Original file line number	Diff line number	Diff line change
`@@ -62,8 +62,7 @@`
`62`	`62`	`"svdFile": "${workspaceFolder}/amp-hal-st/STM32F407.svd",`
`63`	`63`	`"servertype": "jlink",`
`64`	`64`	`"serverpath": "/opt/segger/jlink/JLinkGDBServer",`
`65`		`- "objdumpPath": "arm-none-eabi-objdump",`
`66`		`- "runToEntryPoint": "main"`
	`65`	`+ "objdumpPath": "arm-none-eabi-objdump"`
`67`	`66`	`}`
`68`	`67`	`]`
`69`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ namespace application`
`42`	`42`	`connection.Attach(webSocketConnection);`
`43`	`43`	`webSocketConnection->Attach(echo.Emplace(serializerFactoryWebSocket));`
`44`	`44`
`45`		`- listener.Emplace(connectionFactory, 1234, services::SingleConnectionListener::Creators{ connectionCreator });`
	`45`	`+ listener.emplace(connectionFactory, 1234, services::SingleConnectionListener::Creators{ connectionCreator });`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`void EchoWebSocketClientFactory::WebSocketInitiationError(WebSocketClientObserverFactory::ConnectFailReason reason)`
Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,9 @@ namespace application`
`18`	`18`	`: SingleConnectionListener(connectionFactory, port, { connectionCreator })`
`19`	`19`	`, reporter(reporter)`
`20`	`20`	`, buffer(buffer)`
`21`		`- , connectionCreator([this](infra::Optional<ReportingHttpServerConnectionObserver>& value, services::IPAddress address)`
	`21`	`+ , connectionCreator([this](std::optional<ReportingHttpServerConnectionObserver>& value, services::IPAddress address)`
`22`	`22`	`{`
`23`		`- value.Emplace(this->buffer, *this, this->reporter, address);`
	`23`	`+ value.emplace(this->buffer, *this, this->reporter, address);`
`24`	`24`	`})`
`25`	`25`	`{}`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,9 +30,9 @@ namespace main_`
`30`	`30`
`31`	`31`	`UartCreator& serialCreator;`
`32`	`32`
`33`		`- infra::Creator<services::ConnectionObserver, Bridge, void(services::IPAddress address)> bridgeCreator{ [this](infra::Optional<Bridge>& value, services::IPAddress address)`
	`33`	`+ infra::Creator<services::ConnectionObserver, Bridge, void(services::IPAddress address)> bridgeCreator{ [this](std::optional<Bridge>& value, services::IPAddress address)`
`34`	`34`	`{`
`35`		`- value.Emplace(serialCreator);`
	`35`	`+ value.emplace(serialCreator);`
`36`	`36`	`} };`
`37`	`37`
`38`	`38`	`services::SingleConnectionListener listener;`