fix: update display when hostname changes (#168)

richardapeters · web-flow · commit a214a2b18682 · 2026-01-08T20:15:10.000+01:00
* fix: update display when hostname changes

* Refactor

* Fix refactoring

* Connect observer
diff --git a/postmaster/CMakeLists.txt b/postmaster/CMakeLists.txt
@@ -4,9 +4,10 @@ add_subdirectory(bootloader)
 add_subdirectory(discovery)
 add_subdirectory(frontend)
 add_subdirectory(flex)
-add_subdirectory(instantiations_st)
+add_subdirectory(programmer)
+add_subdirectory(application)
 add_subdirectory(instantiations)
+add_subdirectory(instantiations_st)
 add_subdirectory(postmaster_stm32f407)
-add_subdirectory(programmer)
 add_subdirectory(prototype_win)
 add_subdirectory(upgrade_pack_builder)
diff --git a/postmaster/application/CMakeLists.txt b/postmaster/application/CMakeLists.txt
@@ -0,0 +1,28 @@
+add_library(postmaster.application STATIC)
+
+target_include_directories(postmaster.application PUBLIC
+    "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/../..>"
+    "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
+)
+
+target_sources(postmaster.application PRIVATE
+    HttpPageConfiguration.cpp
+    HttpPageConfiguration.hpp
+    HttpPageDiscovery.cpp
+    HttpPageDiscovery.hpp
+    MdnsDiscovery.cpp
+    MdnsDiscovery.hpp
+    ViewNetworkStatus.cpp
+    ViewNetworkStatus.hpp
+    ViewStatus.cpp
+    ViewStatus.hpp
+)
+
+add_version_header_dependency(postmaster.application postmaster.version)
+
+target_link_libraries(postmaster.application PUBLIC
+    infra.syntax
+    preview.views
+    preview.fonts
+    lwip.lwip_cpp
+)
diff --git a/postmaster/application/HttpPageConfiguration.cpp b/postmaster/application/HttpPageConfiguration.cpp
@@ -1,4 +1,4 @@
-#include "postmaster/instantiations/HttpPageConfiguration.hpp"
+#include "postmaster/application/HttpPageConfiguration.hpp"
 #include "generated/Version.h"
 #include "infra/syntax/JsonFormatter.hpp"
 #include "services/network/HttpErrors.hpp"
diff --git a/postmaster/application/HttpPageConfiguration.hpp b/postmaster/application/HttpPageConfiguration.hpp
diff --git a/postmaster/application/HttpPageDiscovery.cpp b/postmaster/application/HttpPageDiscovery.cpp
@@ -1,4 +1,4 @@
-#include "postmaster/instantiations/HttpPageDiscovery.hpp"
+#include "postmaster/application/HttpPageDiscovery.hpp"
 #include "infra/syntax/JsonFormatter.hpp"
 #include "services/network/Address.hpp"
 #include "services/network/HttpErrors.hpp"
diff --git a/postmaster/application/HttpPageDiscovery.hpp b/postmaster/application/HttpPageDiscovery.hpp
@@ -1,7 +1,7 @@
 #ifndef POSTMASTER_HTTP_PAGE_DISCOVERY_HPP
 #define POSTMASTER_HTTP_PAGE_DISCOVERY_HPP
 
-#include "postmaster/instantiations/MdnsDiscovery.hpp"
+#include "postmaster/application/MdnsDiscovery.hpp"
 #include "services/network/HttpServer.hpp"
 
 namespace application
diff --git a/postmaster/application/MdnsDiscovery.cpp b/postmaster/application/MdnsDiscovery.cpp
@@ -1,4 +1,4 @@
-#include "postmaster/instantiations/MdnsDiscovery.hpp"
+#include "postmaster/application/MdnsDiscovery.hpp"
 #include "infra/stream/ByteInputStream.hpp"
 
 namespace application
diff --git a/postmaster/application/MdnsDiscovery.hpp b/postmaster/application/MdnsDiscovery.hpp
diff --git a/postmaster/application/ViewNetworkStatus.cpp b/postmaster/application/ViewNetworkStatus.cpp
@@ -1,4 +1,4 @@
-#include "postmaster/instantiations/ViewNetworkStatus.hpp"
+#include "postmaster/application/ViewNetworkStatus.hpp"
 #include "infra/stream/StringOutputStream.hpp"
 #include "lwip/netif.h"
 
diff --git a/postmaster/application/ViewNetworkStatus.hpp b/postmaster/application/ViewNetworkStatus.hpp
diff --git a/postmaster/application/ViewStatus.cpp b/postmaster/application/ViewStatus.cpp
@@ -1,10 +1,11 @@
-#include "postmaster/instantiations/ViewStatus.hpp"
+#include "postmaster/application/ViewStatus.hpp"
 #include "infra/stream/StringOutputStream.hpp"
 
 namespace application
 {
-    ViewStatus::ViewStatus(infra::BoundedConstString hostname)
+    ViewStatus::ViewStatus(const infra::BoundedString& hostname, services::ConfigurationStoreInterface& configurationStore)
         : services::ViewText(services::TextAttributes{ infra::Colour::white, infra::freeSans9pt7b })
+        , services::ConfigurationStoreObserver(configurationStore)
         , hostname(hostname)
     {
         Update();
@@ -32,6 +33,11 @@ namespace application
         Update();
     }
 
+    void ViewStatus::OperationDone(uint32_t id)
+    {
+        Update();
+    }
+
     void ViewStatus::Update()
     {
         status.clear();
diff --git a/postmaster/application/ViewStatus.hpp b/postmaster/application/ViewStatus.hpp
@@ -4,24 +4,30 @@
 #include "infra/util/BoundedString.hpp"
 #include "preview/views/ViewText.hpp"
 #include "services/network/Address.hpp"
+#include "services/util/ConfigurationStore.hpp"
 
 namespace application
 {
     class ViewStatus
         : public services::ViewText
+        , private services::ConfigurationStoreObserver
     {
     public:
-        ViewStatus(infra::BoundedConstString hostname);
+        ViewStatus(const infra::BoundedString& hostname, services::ConfigurationStoreInterface& configurationStore);
 
         void SetConnectionOpen(bool open, services::IPAddress newAddress);
         void SetReceivingTarget(bool receiving);
         void SetReceivingSelf(bool receiving);
 
+    private:
+        // Implementation of ConfigurationStoreObserver
+        void OperationDone(uint32_t id) override;
+
     private:
         void Update();
 
     private:
-        infra::BoundedConstString hostname;
+        const infra::BoundedString& hostname;
 
         bool connectionOpen = false;
         services::IPAddress address;
diff --git a/postmaster/discovery/Main.cpp b/postmaster/discovery/Main.cpp
@@ -3,7 +3,7 @@
 #include "hal/generic/TimerServiceGeneric.hpp"
 #include "infra/stream/StdStringOutputStream.hpp"
 #include "infra/syntax/JsonFormatter.hpp"
-#include "postmaster/instantiations/MdnsDiscovery.hpp"
+#include "postmaster/application/MdnsDiscovery.hpp"
 #include "services/network/Http.hpp"
 #include "services/network/HttpErrors.hpp"
 #include "services/network/HttpServer.hpp"
diff --git a/postmaster/instantiations/CMakeLists.txt b/postmaster/instantiations/CMakeLists.txt
@@ -14,38 +14,23 @@ target_sources(postmaster.instantiations PRIVATE
     Configuration.hpp
     EchoServer.cpp
     EchoServer.hpp
-    HttpPageConfiguration.cpp
-    HttpPageConfiguration.hpp
-    HttpPageDiscovery.cpp
-    HttpPageDiscovery.hpp
     HttpServer.cpp
     HttpServer.hpp
     HttpServerFrontEnd.cpp
     HttpServerFrontEnd.hpp
     Mdns.cpp
     Mdns.hpp
-    MdnsDiscovery.cpp
-    MdnsDiscovery.hpp
     SelfProgrammer.hpp
     TargetProgrammer.hpp
     TargetUart.cpp
     TargetUart.hpp
     TargetUartEcho.cpp
     TargetUartEcho.hpp
     UartCreator.hpp
-    ViewNetworkStatus.cpp
-    ViewNetworkStatus.hpp
-    ViewStatus.cpp
-    ViewStatus.hpp
 )
 
-add_version_header_dependency(postmaster.instantiations postmaster.version)
-
 target_link_libraries(postmaster.instantiations PUBLIC
-    infra.syntax
+    postmaster.application
     postmaster.programmer
     postmaster.frontend
-    preview.views
-    preview.fonts
-    lwip.lwip_cpp
 )
diff --git a/postmaster/instantiations/HttpServer.hpp b/postmaster/instantiations/HttpServer.hpp
@@ -1,7 +1,7 @@
 #ifndef POSTMASTER_HTTP_SERVER_HPP
 #define POSTMASTER_HTTP_SERVER_HPP
 
-#include "postmaster/instantiations/HttpPageDiscovery.hpp"
+#include "postmaster/application/HttpPageDiscovery.hpp"
 #include "postmaster/instantiations/HttpServerFrontEnd.hpp"
 #include "postmaster/instantiations/SelfProgrammer.hpp"
 #include "postmaster/instantiations/TargetProgrammer.hpp"
diff --git a/postmaster/instantiations/HttpServerFrontEnd.hpp b/postmaster/instantiations/HttpServerFrontEnd.hpp
@@ -4,9 +4,9 @@
 #include "generated/page_contents/IndexHtml.hpp"
 #include "generated/page_contents/StyleCss.hpp"
 #include "generated/page_contents/UploadJs.hpp"
+#include "postmaster/application/HttpPageConfiguration.hpp"
 #include "postmaster/frontend/AuthenticatedHttpPage.hpp"
 #include "postmaster/frontend/ReportingHttpServer.hpp"
-#include "postmaster/instantiations/HttpPageConfiguration.hpp"
 #include "services/network/HttpServer.hpp"
 #include "services/util/ConfigurationStore.hpp"
 
diff --git a/postmaster/instantiations_st/Display.cpp b/postmaster/instantiations_st/Display.cpp
@@ -2,8 +2,8 @@
 
 namespace main_
 {
-    Display::Display(const postmaster_configuration::Configuration& configuration)
-        : viewStatus{ std::chrono::milliseconds(25), 1, std::chrono::seconds(2), configuration.hostname }
+    Display::Display(const postmaster_configuration::Configuration& configuration, services::ConfigurationStoreInterface& configurationStore)
+        : viewStatus{ std::chrono::milliseconds(25), 1, std::chrono::seconds(2), configuration.hostname, configurationStore }
         , networkQrCode{ configuration.password }
     {
         displayView.SetViewRegion(display.DisplayRegion());
diff --git a/postmaster/instantiations_st/Display.hpp b/postmaster/instantiations_st/Display.hpp
@@ -3,8 +3,8 @@
 
 #include "generated/echo/PostmasterConfiguration.pb.hpp"
 #include "hal_st/stm32fxxx/I2cStm.hpp"
-#include "postmaster/instantiations/ViewNetworkStatus.hpp"
-#include "postmaster/instantiations/ViewStatus.hpp"
+#include "postmaster/application/ViewNetworkStatus.hpp"
+#include "postmaster/application/ViewStatus.hpp"
 #include "preview/interfaces/BitmapPainter.hpp"
 #include "preview/interfaces/BufferedDisplaySsd1306.hpp"
 #include "preview/interfaces/ViewPainterBufferedDisplay.hpp"
@@ -19,7 +19,7 @@ namespace main_
 {
     struct Display
     {
-        Display(const postmaster_configuration::Configuration& configuration);
+        Display(const postmaster_configuration::Configuration& configuration, services::ConfigurationStoreInterface& configurationStore);
 
         hal::GpioPinStm scl{ hal::Port::B, 8, hal::Drive::OpenDrain };
         hal::GpioPinStm sda{ hal::Port::B, 9, hal::Drive::OpenDrain };
diff --git a/postmaster/instantiations_st/EthernetPostmaster.hpp b/postmaster/instantiations_st/EthernetPostmaster.hpp
@@ -4,8 +4,8 @@
 #include "hal_st/stm32fxxx/ResetStm.hpp"
 #include "hal_st/synchronous_stm32fxxx/SynchronousRandomDataGeneratorStm.hpp"
 #include "hal_st_lwip/instantiations_lwip/Ethernet.hpp"
+#include "postmaster/application/ViewStatus.hpp"
 #include "postmaster/instantiations/Configuration.hpp"
-#include "postmaster/instantiations/ViewStatus.hpp"
 #include "postmaster/instantiations_st/NetworkConnected.hpp"
 
 namespace main_
diff --git a/postmaster/instantiations_st/NetworkConnected.hpp b/postmaster/instantiations_st/NetworkConnected.hpp
@@ -3,11 +3,11 @@
 
 #include "generated/Version.h"
 #include "lwip/lwip_cpp/LightweightIp.hpp"
+#include "postmaster/application/MdnsDiscovery.hpp"
+#include "postmaster/application/ViewNetworkStatus.hpp"
+#include "postmaster/application/ViewStatus.hpp"
 #include "postmaster/instantiations/EchoServer.hpp"
 #include "postmaster/instantiations/Mdns.hpp"
-#include "postmaster/instantiations/MdnsDiscovery.hpp"
-#include "postmaster/instantiations/ViewNetworkStatus.hpp"
-#include "postmaster/instantiations/ViewStatus.hpp"
 #include "postmaster/instantiations_st/HttpServerSt.hpp"
 
 namespace main_
diff --git a/postmaster/postmaster_stm32f407/Main.cpp b/postmaster/postmaster_stm32f407/Main.cpp
@@ -103,7 +103,7 @@ int main()
         flash.configurationStore[0], flash.configurationStore[1], hal::UniqueDeviceId(), []()
         {
             static main_::TargetUarts targetUarts(dma);
-            static main_::Display display(configuration.store.Configuration());
+            static main_::Display display(configuration.store.Configuration(), configuration.store);
             static main_::EthernetPostmaster ethernet(ethernetPins, configuration, flash.upgradePack, targetUarts.uartProgrammerCreator, targetUarts.uartExternalCreator, display.viewStatus.SubView());
         },
         tracer.tracer);
diff --git a/postmaster/prototype_win/Main.cpp b/postmaster/prototype_win/Main.cpp
@@ -2,10 +2,10 @@
 #include "hal/generic/SynchronousRandomDataGeneratorGeneric.hpp"
 #include "hal/generic/TimerServiceGeneric.hpp"
 #include "hal/windows/UartWindows.hpp"
+#include "postmaster/application/MdnsDiscovery.hpp"
 #include "postmaster/instantiations/EchoServer.hpp"
 #include "postmaster/instantiations/HttpServer.hpp"
 #include "postmaster/instantiations/Mdns.hpp"
-#include "postmaster/instantiations/MdnsDiscovery.hpp"
 #include "services/network_instantiations/NetworkAdapter.hpp"
 #include "services/st_util/FlashOnStBootloaderCommunicator.hpp"
 #include "services/st_util/StBootloaderCommunicatorUart.hpp"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "postmaster/instantiations/HttpPageConfiguration.hpp"`
	`1`	`+#include "postmaster/application/HttpPageConfiguration.hpp"`
`2`	`2`	`#include "generated/Version.h"`
`3`	`3`	`#include "infra/syntax/JsonFormatter.hpp"`
`4`	`4`	`#include "services/network/HttpErrors.hpp"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "postmaster/instantiations/MdnsDiscovery.hpp"`
	`1`	`+#include "postmaster/application/MdnsDiscovery.hpp"`
`2`	`2`	`#include "infra/stream/ByteInputStream.hpp"`
`3`	`3`
`4`	`4`	`namespace application`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "postmaster/instantiations/ViewNetworkStatus.hpp"`
	`1`	`+#include "postmaster/application/ViewNetworkStatus.hpp"`
`2`	`2`	`#include "infra/stream/StringOutputStream.hpp"`
`3`	`3`	`#include "lwip/netif.h"`
`4`	`4`