fix: align flash writes to 16 bytes (#80)

richardapeters · web-flow · commit 0e34eeb55f1b · 2025-05-22T15:56:38.000Z
* fix: align flash writes to 16 bytes

* Wait for flash initialization done

* FlexHttpClient: Move attaching of websocket

* FirmwareReceptorResetTarget: Use timers instead of HAL_Delay

* Set starting

* Update container

* Flush aligned buffer on end of reception

* Reset when reception is completely stopped

* Update amp-hal-st
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,3 +1,3 @@
-FROM ghcr.io/philips-software/amp-devcontainer-cpp:v6.0.1@sha256:0b238dbdd0e39a9704fc5317269f654b8bfd23868bad9491e806ae417d645352
+FROM ghcr.io/philips-software/amp-devcontainer-cpp:v6.0.2@sha256:36afaaa5ba4bc4e9bb471012db9733c26a210e315ddb33600f73bb9532b02a25 # 6.0.2
 
 HEALTHCHECK NONE
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -25,7 +25,7 @@ jobs:
           - target: "stm32f407"
             configuration: "MinSizeRel"
     runs-on: [ubuntu-latest]
-    container: ghcr.io/philips-software/amp-devcontainer-cpp:v5.6.1@sha256:04cda0c73cd01f0d97879aba7871c5118147ea0478616c49e8c0643653fbbc8b # 5.6.1
+    container: ghcr.io/philips-software/amp-devcontainer-cpp:v6.0.2@sha256:36afaaa5ba4bc4e9bb471012db9733c26a210e315ddb33600f73bb9532b02a25 # 6.0.2
     steps:
       - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
         if: ${{ matrix.target == 'windows' }}
@@ -34,7 +34,7 @@ jobs:
           path: /winsdk
           key: cache-winsdk
       - if: ${{ matrix.target == 'windows' && steps.cache-winsdk.outputs.cache-hit != 'true' }}
-        run: xwin --accept-license splat --preserve-ms-arch-notation --include-debug-libs && mv .xwin-cache/splat/ /winsdk
+        run: xwin --accept-license --sdk-version "10.0.26100" --crt-version "14.43.17.13" splat --preserve-ms-arch-notation --include-debug-libs && mv .xwin-cache/splat/ /winsdk
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
diff --git a/Dockerfile.flex b/Dockerfile.flex
@@ -1,4 +1,4 @@
-FROM ghcr.io/philips-software/amp-devcontainer-cpp:5.1.4@sha256:46239906460dedb3baf3c33d9275f3de4f17d7a237fc136c2013b021589a6dbd AS builder
+FROM ghcr.io/philips-software/amp-devcontainer-cpp:v6.0.2@sha256:36afaaa5ba4bc4e9bb471012db9733c26a210e315ddb33600f73bb9532b02a25 AS builder
 
 HEALTHCHECK NONE
 
diff --git a/amp-embedded-infra-lib b/amp-embedded-infra-lib
@@ -1 +1 @@
-Subproject commit e39b38e2cc8ad15d2ad80d31718635c69255e650
+Subproject commit 43db523f76363e31125c2a2d63d4b10cc4786cdd
diff --git a/amp-hal-st b/amp-hal-st
@@ -1 +1 @@
-Subproject commit 42a3d6a52664ee430dd5c5b5203a8a4396e62b2a
+Subproject commit 0406bf4e5bbe349500ca6616063d7809052c3fac
diff --git a/postmaster/flex/FlexHttpClient.cpp b/postmaster/flex/FlexHttpClient.cpp
@@ -51,11 +51,16 @@ namespace application
             tracer.Trace() << infra::ByteRangeAsString(stream.ContiguousRange());
     }
 
+    void FlexHttpClient::BodyComplete()
+    {
+        inBodyComplete = true;
+        HttpClientBasic::BodyComplete();
+        inBodyComplete = false;
+    }
+
     void FlexHttpClient::Done()
     {
         tracer.Trace() << "Done";
-
-        httpClient->Attach(infra::UnOwnedSharedPtr(webSocketInitiation));
     }
 
     void FlexHttpClient::Error(bool intermittentFailure)
@@ -69,5 +74,8 @@ namespace application
     void FlexHttpClient::CloseConnection()
     {
         Subject().Detach();
+
+        if (inBodyComplete)
+            httpClient->Attach(infra::UnOwnedSharedPtr(webSocketInitiation));
     }
 }
diff --git a/postmaster/flex/FlexHttpClient.hpp b/postmaster/flex/FlexHttpClient.hpp
@@ -21,6 +21,7 @@ namespace application
         void StatusAvailable(services::HttpStatusCode statusCode) override;
         void HeaderAvailable(services::HttpHeader header) override;
         void BodyAvailable(infra::SharedPtr<infra::StreamReader>&& reader);
+        void BodyComplete() override;
         void Done() override;
         void Error(bool intermittentFailure) override;
         void CloseConnection() override;
@@ -32,6 +33,7 @@ namespace application
 
         services::HttpClient* httpClient = nullptr;
         bool detached = false;
+        bool inBodyComplete = false;
     };
 }
 
diff --git a/postmaster/instantiations/TargetProgrammer.hpp b/postmaster/instantiations/TargetProgrammer.hpp
@@ -1,11 +1,13 @@
 #ifndef POSTMASTER_TARGET_PROGRAMMER_HPP
 #define POSTMASTER_TARGET_PROGRAMMER_HPP
 
+#include "infra/event/EventDispatcher.hpp"
 #include "infra/util/Function.hpp"
 #include "postmaster/instantiations/UartCreator.hpp"
 #include "postmaster/programmer/FirmwareReceptorReporting.hpp"
 #include "postmaster/programmer/FirmwareReceptorResetTarget.hpp"
 #include "postmaster/programmer/FirmwareReceptorToFlash.hpp"
+#include "postmaster/programmer/FlashAligner.hpp"
 #include "postmaster/programmer/HttpPageFirmware.hpp"
 #include "services/st_util/FlashOnStBootloaderCommunicator.hpp"
 #include "services/st_util/StBootloaderCommunicatorUart.hpp"
@@ -21,7 +23,13 @@ namespace main_
             , firmwareReceptorReporting(receptorResetTarget, receiving)
             , stateCreator([this]() -> application::FirmwareReceptor&
                   {
-                      state.Emplace(this->uartProgrammerCreator, infra::emptyFunction, [this](infra::BoundedConstString reason)
+                      really_assert(!state);
+                      state.Emplace(
+                          this->uartProgrammerCreator, [this]()
+                          {
+                              state->firmwareReceptorToFlash.FlashInitializationDone();
+                          },
+                          [this](infra::BoundedConstString reason)
                           {
                               this->page.Close();
                               this->page.ResetReceptor(reason);
@@ -31,7 +39,13 @@ namespace main_
                   },
                   [this]()
                   {
-                      state = infra::none;
+                      state->Stop();
+                      // The state is not destroyed immediately; any scheduled UART data must first be processed. By scheduling
+                      // this as an event, other events are first handled
+                      infra::EventDispatcher::Instance().Schedule([this]()
+                          {
+                              state = infra::none;
+                          });
                   })
         {
             this->page.SetReceptor(firmwareReceptorReporting);
@@ -55,12 +69,21 @@ namespace main_
                 , communicator(*serial, onInitialized, onError)
             {}
 
+            void Stop()
+            {
+                communicator.Stop();
+            }
+
             infra::ProxyCreator<UartCreator&> serial;
 
             services::StBootloaderCommunicatorUart communicator;
             std::array<uint32_t, 12> sectors{ 0x8000, 0x8000, 0x8000, 0x8000, 0x20000, 0x40000, 0x40000, 0x40000, 0x40000, 0x40000, 0x40000, 0x40000 };
             services::FlashHeterogeneousOnStBootloaderCommunicator communicatorFlash{ sectors, communicator };
-            application::FirmwareReceptorToFlash firmwareReceptorToFlash{ communicatorFlash };
+            services::FlashAligner::WithAlignment<16> alignedFlash{ communicatorFlash };
+            application::FirmwareReceptorToFlash firmwareReceptorToFlash{ alignedFlash, [this](const infra::Function<void()>& onDone)
+                {
+                    alignedFlash.Flush(onDone);
+                } };
         };
 
         UartCreator& uartProgrammerCreator;
diff --git a/postmaster/programmer/CMakeLists.txt b/postmaster/programmer/CMakeLists.txt
@@ -15,6 +15,8 @@ target_sources(postmaster.programmer PRIVATE
     FirmwareReceptorResetWhenDone.hpp
     FirmwareReceptorToFlash.cpp
     FirmwareReceptorToFlash.hpp
+    FlashAligner.cpp
+    FlashAligner.hpp
     HttpPageFirmware.cpp
     HttpPageFirmware.hpp
     TargetUartConnection.cpp
diff --git a/postmaster/programmer/FirmwareReceptor.hpp b/postmaster/programmer/FirmwareReceptor.hpp
@@ -17,7 +17,7 @@ namespace application
     public:
         virtual void ReceptionStarted() = 0;
         virtual void DataReceived(infra::SharedPtr<infra::StreamReaderWithRewinding>&& reader) = 0;
-        virtual void ReceptionStopped() = 0;
+        virtual void ReceptionStopped(const infra::Function<void()>& onDone) = 0;
     };
 }
 
diff --git a/postmaster/programmer/FirmwareReceptorReporting.cpp b/postmaster/programmer/FirmwareReceptorReporting.cpp
@@ -18,9 +18,9 @@ namespace application
         delegate.DataReceived(std::move(reader));
     }
 
-    void FirmwareReceptorReporting::ReceptionStopped()
+    void FirmwareReceptorReporting::ReceptionStopped(const infra::Function<void()>& onDone)
     {
-        delegate.ReceptionStopped();
+        delegate.ReceptionStopped(onDone);
         reporter(false);
     }
 }
diff --git a/postmaster/programmer/FirmwareReceptorReporting.hpp b/postmaster/programmer/FirmwareReceptorReporting.hpp
@@ -14,7 +14,7 @@ namespace application
 
         virtual void ReceptionStarted() override;
         virtual void DataReceived(infra::SharedPtr<infra::StreamReaderWithRewinding>&& reader) override;
-        virtual void ReceptionStopped() override;
+        virtual void ReceptionStopped(const infra::Function<void()>& onDone) override;
 
     private:
         FirmwareReceptor& delegate;
diff --git a/postmaster/programmer/FirmwareReceptorResetTarget.cpp b/postmaster/programmer/FirmwareReceptorResetTarget.cpp
@@ -10,30 +10,51 @@ namespace application
 
     void FirmwareReceptorResetTarget::ReceptionStarted()
     {
-        {
-            hal::OutputPin activateReset(reset, false);
-            activateBoot0.Emplace(boot0, true);
-
-            delegate.Emplace(delegateCreator);
-        }
-
-        (*delegate)->ReceptionStarted();
+        starting = 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;
+
+                        timer.Start(std::chrono::milliseconds(100), [this]()
+                            {
+                                starting = false;
+
+                                delegate.Emplace(delegateCreator);
+                                (*delegate)->ReceptionStarted();
+
+                                if (saveReader != nullptr)
+                                    DataReceived(std::move(saveReader));
+                            });
+                    });
+            });
     }
 
     void FirmwareReceptorResetTarget::DataReceived(infra::SharedPtr<infra::StreamReaderWithRewinding>&& reader)
     {
-        (*delegate)->DataReceived(std::move(reader));
+        if (starting)
+            saveReader = std::move(reader);
+        else
+            (*delegate)->DataReceived(std::move(reader));
     }
 
-    void FirmwareReceptorResetTarget::ReceptionStopped()
+    void FirmwareReceptorResetTarget::ReceptionStopped(const infra::Function<void()>& onDone)
     {
-        (*delegate)->ReceptionStopped();
-
+        this->onDone = onDone;
+        
+        (*delegate)->ReceptionStopped([this]()
         {
             hal::OutputPin activateReset(reset, false);
             activateBoot0 = infra::none;
 
             delegate = infra::none;
-        }
+            this->onDone();
+        });
     }
 }
diff --git a/postmaster/programmer/FirmwareReceptorResetTarget.hpp b/postmaster/programmer/FirmwareReceptorResetTarget.hpp
@@ -1,4 +1,6 @@
 #include "hal/interfaces/Gpio.hpp"
+#include "infra/timer/Timer.hpp"
+#include "infra/util/AutoResetFunction.hpp"
 #include "infra/util/Optional.hpp"
 #include "infra/util/ProxyCreator.hpp"
 #include "postmaster/programmer/FirmwareReceptor.hpp"
@@ -13,7 +15,7 @@ namespace application
 
         virtual void ReceptionStarted() override;
         virtual void DataReceived(infra::SharedPtr<infra::StreamReaderWithRewinding>&& reader) override;
-        virtual void ReceptionStopped() override;
+        virtual void ReceptionStopped(const infra::Function<void()>& onDone) override;
 
     private:
         hal::GpioPin& reset;
@@ -23,5 +25,13 @@ namespace application
         infra::Optional<infra::ProxyCreator<decltype(delegateCreator)>> delegate;
 
         infra::Optional<hal::OutputPin> activateBoot0;
+        infra::Optional<hal::OutputPin> activateReset;
+
+        bool starting = false;
+
+        infra::TimerSingleShot timer;
+        infra::SharedPtr<infra::StreamReaderWithRewinding> saveReader;
+
+        infra::AutoResetFunction<void()> onDone;
     };
 }
diff --git a/postmaster/programmer/FirmwareReceptorResetWhenDone.cpp b/postmaster/programmer/FirmwareReceptorResetWhenDone.cpp
@@ -18,9 +18,9 @@ namespace application
         delegate.DataReceived(std::move(reader));
     }
 
-    void FirmwareReceptorResetWhenDone::ReceptionStopped()
+    void FirmwareReceptorResetWhenDone::ReceptionStopped(const infra::Function<void()>& onDone)
     {
-        delegate.ReceptionStopped();
+        delegate.ReceptionStopped(onDone);
         delayedReboot.Start(std::chrono::seconds(1), [this]()
             {
                 reset.ResetModule("Firmare reception done");
diff --git a/postmaster/programmer/FirmwareReceptorResetWhenDone.hpp b/postmaster/programmer/FirmwareReceptorResetWhenDone.hpp
@@ -15,7 +15,7 @@ namespace application
 
         virtual void ReceptionStarted() override;
         virtual void DataReceived(infra::SharedPtr<infra::StreamReaderWithRewinding>&& reader) override;
-        virtual void ReceptionStopped() override;
+        virtual void ReceptionStopped(const infra::Function<void()>& onDone) override;
 
     private:
         FirmwareReceptor& delegate;
diff --git a/postmaster/programmer/FirmwareReceptorToFlash.cpp b/postmaster/programmer/FirmwareReceptorToFlash.cpp
@@ -3,19 +3,22 @@
 
 namespace application
 {
-    FirmwareReceptorToFlash::FirmwareReceptorToFlash(hal::Flash& flash)
+    FirmwareReceptorToFlash::FirmwareReceptorToFlash(hal::Flash& flash, const infra::Function<void(const infra::Function<void()>& onDone)>& onReceptionDone)
         : flash(flash)
+        , onReceptionDone(onReceptionDone)
     {}
 
-    void FirmwareReceptorToFlash::ReceptionStarted()
+    void FirmwareReceptorToFlash::FlashInitializationDone()
     {
-        index = 0;
+        busy = false;
 
-        busy = true;
-        flash.EraseAll([this]()
-            {
-                OnEraseDone();
-            });
+        TryEraseAll();
+    }
+
+    void FirmwareReceptorToFlash::ReceptionStarted()
+    {
+        receptionStarted = true;
+        TryEraseAll();
     }
 
     void FirmwareReceptorToFlash::DataReceived(infra::SharedPtr<infra::StreamReaderWithRewinding>&& reader)
@@ -24,8 +27,10 @@ namespace application
         TryWrite();
     }
 
-    void FirmwareReceptorToFlash::ReceptionStopped()
-    {}
+    void FirmwareReceptorToFlash::ReceptionStopped(const infra::Function<void()>& onDone)
+    {
+        onReceptionDone(onDone);
+    }
 
     void FirmwareReceptorToFlash::OnEraseDone()
     {
@@ -44,4 +49,18 @@ namespace application
                 });
         }
     }
+
+    void FirmwareReceptorToFlash::TryEraseAll()
+    {
+        if (!busy && receptionStarted)
+        {
+            index = 0;
+
+            busy = true;
+            flash.EraseAll([this]()
+                {
+                    OnEraseDone();
+                });
+        }
+    }
 }
diff --git a/postmaster/programmer/FirmwareReceptorToFlash.hpp b/postmaster/programmer/FirmwareReceptorToFlash.hpp
@@ -10,21 +10,30 @@ namespace application
         : public FirmwareReceptor
     {
     public:
-        FirmwareReceptorToFlash(hal::Flash& flash);
+        FirmwareReceptorToFlash(
+            hal::Flash& flash, const infra::Function<void(const infra::Function<void()>& onDone)>& onReceptionDone = [](const infra::Function<void()>& onDone)
+                               {
+                                   onDone();
+                               });
+
+        void FlashInitializationDone();
 
         virtual void ReceptionStarted() override;
         virtual void DataReceived(infra::SharedPtr<infra::StreamReaderWithRewinding>&& reader) override;
-        virtual void ReceptionStopped() override;
+        virtual void ReceptionStopped(const infra::Function<void()>& onDone) override;
 
     private:
         void OnEraseDone();
         void TryWrite();
+        void TryEraseAll();
 
     private:
         hal::Flash& flash;
+        infra::Function<void(const infra::Function<void()>& onDone)> onReceptionDone;
         infra::SharedPtr<infra::StreamReaderWithRewinding> reader;
         uint32_t index = 0;
-        bool busy = false;
+        bool busy = true;
+        bool receptionStarted = false;
     };
 }
 
diff --git a/postmaster/programmer/FlashAligner.cpp b/postmaster/programmer/FlashAligner.cpp
diff --git a/postmaster/programmer/FlashAligner.hpp b/postmaster/programmer/FlashAligner.hpp
diff --git a/postmaster/programmer/HttpPageFirmware.cpp b/postmaster/programmer/HttpPageFirmware.cpp

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-FROM ghcr.io/philips-software/amp-devcontainer-cpp:v6.0.1@sha256:0b238dbdd0e39a9704fc5317269f654b8bfd23868bad9491e806ae417d645352`
	`1`	`+FROM ghcr.io/philips-software/amp-devcontainer-cpp:v6.0.2@sha256:36afaaa5ba4bc4e9bb471012db9733c26a210e315ddb33600f73bb9532b02a25 # 6.0.2`
`2`	`2`
`3`	`3`	`HEALTHCHECK NONE`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM ghcr.io/philips-software/amp-devcontainer-cpp:5.1.4@sha256:46239906460dedb3baf3c33d9275f3de4f17d7a237fc136c2013b021589a6dbd AS builder`
	`1`	`+FROM ghcr.io/philips-software/amp-devcontainer-cpp:v6.0.2@sha256:36afaaa5ba4bc4e9bb471012db9733c26a210e315ddb33600f73bb9532b02a25 AS builder`
`2`	`2`
`3`	`3`	`HEALTHCHECK NONE`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -51,11 +51,16 @@ namespace application`
`51`	`51`	`tracer.Trace() << infra::ByteRangeAsString(stream.ContiguousRange());`
`52`	`52`	`}`
`53`	`53`
	`54`	`+ void FlexHttpClient::BodyComplete()`
	`55`	`+ {`
	`56`	`+ inBodyComplete = true;`
	`57`	`+ HttpClientBasic::BodyComplete();`
	`58`	`+ inBodyComplete = false;`
	`59`	`+ }`
	`60`	`+`
`54`	`61`	`void FlexHttpClient::Done()`
`55`	`62`	`{`
`56`	`63`	`tracer.Trace() << "Done";`
`57`		`-`
`58`		`- httpClient->Attach(infra::UnOwnedSharedPtr(webSocketInitiation));`
`59`	`64`	`}`
`60`	`65`
`61`	`66`	`void FlexHttpClient::Error(bool intermittentFailure)`
`@@ -69,5 +74,8 @@ namespace application`
`69`	`74`	`void FlexHttpClient::CloseConnection()`
`70`	`75`	`{`
`71`	`76`	`Subject().Detach();`
	`77`	`+`
	`78`	`+ if (inBodyComplete)`
	`79`	`+ httpClient->Attach(infra::UnOwnedSharedPtr(webSocketInitiation));`
`72`	`80`	`}`
`73`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ namespace application`
`17`	`17`	`public:`
`18`	`18`	`virtual void ReceptionStarted() = 0;`
`19`	`19`	`virtual void DataReceived(infra::SharedPtr<infra::StreamReaderWithRewinding>&& reader) = 0;`
`20`		`- virtual void ReceptionStopped() = 0;`
	`20`	`+ virtual void ReceptionStopped(const infra::Function<void()>& onDone) = 0;`
`21`	`21`	`};`
`22`	`22`	`}`
`23`	`23`