From 24b854a1d0fe54e15ff49e838972f964b556e07a Mon Sep 17 00:00:00 2001 From: cfif Date: Sat, 20 Jun 2026 17:21:52 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DeviceStorage.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/DeviceStorage.c b/DeviceStorage.c index 369eb8e..0128a76 100644 --- a/DeviceStorage.c +++ b/DeviceStorage.c @@ -11,6 +11,8 @@ #include "HVAC_preDefine.h" #include "StorageOnFlash.h" #include "FirmwareMetadataSection.h" +#include "fc7xxx_driver_fmc.h" + #define LOGGER env->logger #define LOG_SIGN "Storage" @@ -27,14 +29,22 @@ bool DeviceStorage_LoadParam(tDeviceStorage *env) { bool isLoad = VarsTabDumpObserverParam_Load(&env->dumpObserver); - tFirmwareMetaMap *firmwareMetaMap_Boot = (tFirmwareMetaMap *) ADR_META_BOOT; - tFirmwareMetaMap *firmwareMetaMap_Main = (tFirmwareMetaMap *) ADR_META_MAIN; + FMC_API_ACTIVE_BLOCK_TYPE ActiveBank = FMCDRIVER_GetActiveBlock(FMC_INSTANCE_1); + + tFirmwareMetaMap *firmwareMetaMap_Boot; + tFirmwareMetaMap *firmwareMetaMap_Main; + + firmwareMetaMap_Boot = (tFirmwareMetaMap *) ADR_META_BOOT; + firmwareMetaMap_Main = (tFirmwareMetaMap *) ADR_META_MAIN; + memcpy(&env->dataParam->device.identification.Internal_SW_Version, &firmwareMetaMap_Main->internal_SW_Version, sizeof(tInternal_SW_Version)); - memcpy(&env->dataParam->device.identification.Boot_SW_Fingerprint, &firmwareMetaMap_Boot->fingerprint, sizeof(tFingerprintDev)); - memcpy(&env->dataParam->device.identification.Application_SW_Fingerprint, &firmwareMetaMap_Main->fingerprint, sizeof(tFingerprintDev)); + memcpy(&env->dataParam->device.identification.Boot_SW_Fingerprint, &firmwareMetaMap_Boot->fingerprint, + sizeof(tFingerprintDev)); + memcpy(&env->dataParam->device.identification.Application_SW_Fingerprint, &firmwareMetaMap_Main->fingerprint, + sizeof(tFingerprintDev)); if (isLoad) { if (env->dataParam->version_param == DEVICE_DATA_VERSION_PARAM) {