diff --git a/DataNonVolatile.c b/DataNonVolatile.c index 4f14a25..945a273 100644 --- a/DataNonVolatile.c +++ b/DataNonVolatile.c @@ -10,13 +10,11 @@ #include "Rs_Cal_4_Mpv.h" void DeviceDataParam_InitDefaults(tDeviceDataNonVolatile *env) { - DeviceStorageInitDeviceSettings(&env->device); - - env->version = DEVICE_DATA_NO_VOLATILE_VERSION; - + env->version_param = DEVICE_DATA_VERSION_PARAM; } -void DeviceDataCalib_InitDefaults(uint8_t *env) { +void DeviceDataCalib_InitDefaults(tDeviceDataNonVolatile *env) { Rs_Cal_0_SedanL(); + env->version_calib = DEVICE_DATA_VERSION_CALIB; } diff --git a/DataNonVolatile.h b/DataNonVolatile.h index eba1410..8040081 100644 --- a/DataNonVolatile.h +++ b/DataNonVolatile.h @@ -8,7 +8,8 @@ #include "DataRuntime.h" #include "HVAC_preDefine.h" -#define DEVICE_DATA_NO_VOLATILE_VERSION 0x01 +#define DEVICE_DATA_VERSION_CALIB 0x01 +#define DEVICE_DATA_VERSION_PARAM 0x01 // BCD в двоичное число #define bcd_to_binary(bcd) (((bcd >> 4) * 10) + (bcd & 0x0F)) @@ -58,12 +59,13 @@ typedef struct { typedef struct { - uint32_t version; + uint32_t version_param; + uint32_t version_calib; tDeviceSettings device; } tDeviceDataNonVolatile; void DeviceDataParam_InitDefaults(tDeviceDataNonVolatile *env); -void DeviceDataCalib_InitDefaults(uint8_t *env); +void DeviceDataCalib_InitDefaults(tDeviceDataNonVolatile *env); #endif //HVAC_DEVICEDATANONVOLATILE_H