fix: firmware upgrade (#167)

* fix: firmware upgrade

* Give read permissions

* Quotes

* More permissions

* Remove permissions

Author: richardapeters

postmaster/bootloader/CMakeLists.txt

@@ -22,6 +22,7 @@ target_link_libraries(postmaster.bootloader PUBLIC
     upgrade.boot_loader
     services.util
     hal_st.synchronous_stm32fxxx
+    hal_st.instantiations
 )
 
 halst_target_linker_scripts(TARGET postmaster.bootloader LINKER_SCRIPTS

postmaster/bootloader/Main.cpp

@@ -1,11 +1,13 @@
 #include "generated/stm32fxxx/PinoutTableDefault.hpp"
 #include "hal_st/cortex/InterruptCortex.hpp"
+#include "hal_st/instantiations/NucleoTracerInfrastructure.hpp"
 #include "hal_st/stm32fxxx/GpioStm.hpp"
 #include "hal_st/synchronous_stm32fxxx/SynchronousFlashInternalStm.hpp"
 #include "hal_st/synchronous_stm32fxxx/SynchronousSpiMasterStm.hpp"
 #include "services/synchronous_util/SynchronousFlashRegion.hpp"
 #include "services/synchronous_util/SynchronousFlashSpi.hpp"
 #include "services/synchronous_util/SynchronousSpiMasterWithChipSelect.hpp"
+#include "services/tracer/GlobalTracer.hpp"
 #include "upgrade/boot_loader/DecryptorNone.hpp"
 #include "upgrade/boot_loader/ImageUpgraderFlash.hpp"
 #include "upgrade/boot_loader/PackUpgrader.hpp"
@@ -31,13 +33,10 @@ constexpr services::SynchronousFlashSpiConfig CreateFlashConfig()
 
 void ProcessUpgradePack(infra::ConstByteRange flashMemory, uint32_t flashOffset)
 {
-    static hal::InterruptTable::WithStorage<128> interruptTable;
-    static hal::GpioStm gpio(hal::pinoutTableDefaultStm, hal::analogTableDefaultStm);
-
     static std::array<uint32_t, 12> sectorSizes{
-        0x08000, 0x08000, 0x08000, 0x08000,
-        0x20000, 0x40000, 0x40000, 0x40000,
-        0x40000, 0x40000, 0x40000, 0x40000
+        0x04000, 0x04000, 0x04000, 0x04000,
+        0x10000, 0x20000, 0x20000, 0x20000,
+        0x20000, 0x20000, 0x20000, 0x20000
     };
 
     hal::SynchronousFlashInternalStm internalFlash(infra::MakeRange(sectorSizes), flashMemory);
@@ -94,6 +93,16 @@ int main()
 {
     HAL_Init();
 
+    static hal::InterruptTable::WithStorage<128> interruptTable;
+    static hal::GpioStm gpio(hal::pinoutTableDefaultStm, hal::analogTableDefaultStm);
+
+    static hal::GpioPinStm traceUartTx{ hal::Port::D, 8 };
+    static hal::SynchronousUartStmSendOnly traceUart{ 3, traceUartTx };
+    static services::StreamWriterOnSynchronousSerialCommunication traceWriter{ traceUart };
+    static infra::TextOutputStream::WithErrorPolicy tracerOutputStream{ traceWriter };
+    static services::TracerToStream tracer{ tracerOutputStream };
+    services::SetGlobalTracerInstance(tracer);
+
     extern uint8_t _flash_start;
     extern uint8_t _flash_end;
     infra::ConstByteRange flashMemory(&_flash_start, &_flash_end);

postmaster/instantiations/SelfProgrammer.hpp

@@ -16,6 +16,7 @@ namespace main_
             , firmwareReceptorReporting(firmwareReceptorReboot, receiving)
         {
             page.SetReceptor(firmwareReceptorReporting);
+            firmwareReceptor.FlashInitializationDone();
         }
 
         application::FirmwareReceptorToFlash firmwareReceptor;