OTA: STM32H7 Add storage type constexpr

Author: pennam

src/ota/implementation/OTASTM32H7.cpp

@@ -84,7 +84,7 @@ OTACloudProcessInterface::State STM32H7OTACloudProcess::flashOTA() {
 
   // this sets the registries in RTC to load the firmware from the storage selected at the next reboot
   STM32H747::writeBackupRegister(RTCBackup::DR0, 0x07AA);
-  STM32H747::writeBackupRegister(RTCBackup::DR1, STM32H747OTA::StorageType::QSPI_FLASH_FATFS_MBR);
+  STM32H747::writeBackupRegister(RTCBackup::DR1, STM32H747OTA::STORAGE_TYPE);
   STM32H747::writeBackupRegister(RTCBackup::DR2, data_offset);
   STM32H747::writeBackupRegister(RTCBackup::DR3, _program_length);
 

src/ota/implementation/OTASTM32H7.h

@@ -21,20 +21,9 @@
 #include "WiFi.h" /* WiFi from ArduinoCore-mbed */
 #include <SocketHelpers.h>
 
-#define APOTA_QSPI_FLASH_FLAG         (1 << 2)
-#define APOTA_SDCARD_FLAG             (1 << 3)
-#define APOTA_RAW_FLAG                (1 << 4)
-#define APOTA_FATFS_FLAG              (1 << 5)
-#define APOTA_LITTLEFS_FLAG           (1 << 6)
-#define APOTA_MBR_FLAG                (1 << 7)
-
 namespace STM32H747OTA {
-  enum StorageType {
-      QSPI_FLASH_FATFS        = APOTA_QSPI_FLASH_FLAG | APOTA_FATFS_FLAG,
-      QSPI_FLASH_FATFS_MBR    = APOTA_QSPI_FLASH_FLAG | APOTA_FATFS_FLAG | APOTA_MBR_FLAG,
-      SD_FATFS                = APOTA_SDCARD_FLAG | APOTA_FATFS_FLAG,
-      SD_FATFS_MBR            = APOTA_SDCARD_FLAG | APOTA_FATFS_FLAG | APOTA_MBR_FLAG,
-  };
+  /* External QSPI flash + MBR + FatFs */
+  static const uint32_t constexpr STORAGE_TYPE = ((1 << 2) | (1 << 5) | (1 << 7));
 }
 
 class STM32H7OTACloudProcess: public OTADefaultCloudProcessInterface {