From 875484b8928c97279cfa0d7e5e220f87f329bf38 Mon Sep 17 00:00:00 2001 From: cfif Date: Fri, 5 Dec 2025 13:47:21 +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 --- DataNonVolatile.h | 7 --- DataNonVolatile_AddToVarTab.c | 84 ----------------------------- DataNonVolatile_InitDeviceSetting.c | 24 --------- modular.json | 7 --- 4 files changed, 122 deletions(-) delete mode 100644 DataNonVolatile_AddToVarTab.c diff --git a/DataNonVolatile.h b/DataNonVolatile.h index e0a2741..eba1410 100644 --- a/DataNonVolatile.h +++ b/DataNonVolatile.h @@ -5,7 +5,6 @@ #ifndef HVAC_DEVICEDATANONVOLATILE_H #define HVAC_DEVICEDATANONVOLATILE_H -#include #include "DataRuntime.h" #include "HVAC_preDefine.h" @@ -67,10 +66,4 @@ void DeviceDataParam_InitDefaults(tDeviceDataNonVolatile *env); void DeviceDataCalib_InitDefaults(uint8_t *env); -void DeviceDataNonVolatile_AddToVarTab( - tDeviceDataNonVolatile *env, - tVariablesTable *variablesTable, - uint32_t VARIABLES_GROUP -); - #endif //HVAC_DEVICEDATANONVOLATILE_H diff --git a/DataNonVolatile_AddToVarTab.c b/DataNonVolatile_AddToVarTab.c deleted file mode 100644 index a511b91..0000000 --- a/DataNonVolatile_AddToVarTab.c +++ /dev/null @@ -1,84 +0,0 @@ -// -// Created by CFIF on 20.10.25. -// - -#include "DataNonVolatatile_Private.h" - -#define ADD_VAR_SIZE(TYPE, NAME, VALUE, LEN, GROUP) \ - VariablesTableAdd( \ - variablesTable, \ - #NAME, \ - sizeof (#NAME)-1, \ - VARIABLE_TYPE_##TYPE, \ - (VALUE), \ - (LEN), \ - 0, \ - GROUP \ - ) - -#define ADD_VAR(TYPE, NAME, VALUE) ADD_VAR_SIZE(TYPE, NAME, VALUE, 0, group) -#define ADD_VAR_STR_OBJ(TYPE, NAME, VALUE) ADD_VAR_SIZE(TYPE, NAME, &(VALUE).data, &(VALUE).length,group) - - -#define ADD_VAR_WITH_ID_SIZE(TYPE, NAME, VALUE, LEN, ID, LIMIT, GROUP) \ - VariablesTableWithIdAdd( \ - variablesTable, \ - #NAME, \ - sizeof (#NAME)-1, \ - VARIABLE_TYPE_##TYPE, \ - (VALUE), \ - (LEN), \ - (ID), \ - (LIMIT), \ - 0, \ - GROUP \ - ) - -#define ADD_WITH_ID_VAR(TYPE, NAME, VALUE, ID) ADD_VAR_WITH_ID_SIZE(TYPE, NAME, VALUE, 0, ID, 0, group) -#define ADD_WITH_ID_VAR_STR_OBJ(TYPE, NAME, VALUE, ID, LIMIT) ADD_VAR_WITH_ID_SIZE(TYPE, NAME, &(VALUE).data, &(VALUE).length, ID, LIMIT, group) -#define ADD_WITH_ID_LEN_VAR_STR_OBJ(TYPE, NAME, VALUE, LEN, ID, LIMIT) ADD_VAR_WITH_ID_SIZE(TYPE, NAME, VALUE, LEN, ID, LIMIT, group) - -// Добавление переменных в таблицу -void DeviceDataNonVolatile_AddToVarTab( - tDeviceDataNonVolatile *env, - tVariablesTable *variablesTable, - uint32_t group -) { - - -//Devices - - ADD_WITH_ID_VAR_STR_OBJ(STRING, SOFTWARE_CLASS_ID, env->device.identification.software_classification, 0xF151, 15); - - ADD_WITH_ID_VAR(UINT32, APP_FINGERPRINT_SOTWARE_CRC, &env->device.identification.application_info.software_crc, 0xF184); - ADD_WITH_ID_VAR(UINT16, APP_FINGERPRINT_MAJOR_VER, &env->device.identification.application_info.major_version, 0xF184); - ADD_WITH_ID_VAR(UINT16, APP_FINGERPRINT_MINOR_VER, &env->device.identification.application_info.minor_version, 0xF184); - ADD_WITH_ID_VAR(UINT16, APP_FINGERPRINT_PATH_VER, &env->device.identification.application_info.patch_version, 0xF184); - ADD_WITH_ID_VAR(UINT8, APP_FINGERPRINT_BUILD_NUM, &env->device.identification.application_info.build_number, 0xF184); - ADD_WITH_ID_VAR(UINT8, APP_FINGERPRINT_STRUCT_CRC, &env->device.identification.application_info.checksum, 0xF184); - - ADD_WITH_ID_VAR(UINT32, BOOT_FINGERPRINT_SOTWARE_CRC, &env->device.identification.bootloader_info.software_crc, 0xF1F4); - ADD_WITH_ID_VAR(UINT16, BOOT_FINGERPRINT_MAJOR_VER, &env->device.identification.bootloader_info.major_version, 0xF1F4); - ADD_WITH_ID_VAR(UINT16, BOOT_FINGERPRINT_MINOR_VER, &env->device.identification.bootloader_info.minor_version, 0xF1F4); - ADD_WITH_ID_VAR(UINT16, BOOT_FINGERPRINT_PATH_VER, &env->device.identification.bootloader_info.patch_version, 0xF1F4); - ADD_WITH_ID_VAR(UINT8, BOOT_FINGERPRINT_BUILD_NUM, &env->device.identification.bootloader_info.build_number, 0xF1F4); - ADD_WITH_ID_VAR(UINT8, BOOT_FINGERPRINT_STRUCT_CRC, &env->device.identification.bootloader_info.checksum, 0xF1F4); - - ADD_WITH_ID_VAR(UINT8, TESTER_FINGERPRINT_YEAR, &env->device.identification.tester_fingerprint.year, 0xF15A); - ADD_WITH_ID_VAR(UINT8, TESTER_FINGERPRINT_MONTH, &env->device.identification.tester_fingerprint.month, 0xF15A); - ADD_WITH_ID_VAR(UINT8, TESTER_FINGERPRINT_DAY, &env->device.identification.tester_fingerprint.day, 0xF15A); - ADD_WITH_ID_VAR_STR_OBJ(STRING, TESTER_FINGERPRINT_SERIAL, env->device.identification.tester_fingerprint.tester_serial, 0xF15A, 9); - - ADD_WITH_ID_VAR_STR_OBJ(STRING, SPARE_PART_NUMBER, env->device.identification.spare_part_number, 0xF187, 27); - ADD_WITH_ID_VAR_STR_OBJ(STRING, SERIAL_NUMBER, env->device.identification.serial_number, 0xF18C, 26); - ADD_WITH_ID_VAR_STR_OBJ(STRING, VIN, env->device.identification.vin, 0xF190, 17); - ADD_WITH_ID_VAR_STR_OBJ(STRING, HARDWARE_NAMI, env->device.identification.hardware_nami, 0xF191, 27); - ADD_WITH_ID_VAR_STR_OBJ(STRING, HARDWARE_ESTRA, env->device.identification.hardware_estra, 0xF192, 13); - ADD_WITH_ID_VAR_STR_OBJ(STRING, SOFTWARE_ESTRA, env->device.identification.software_estra, 0xF194, 2); - ADD_WITH_ID_VAR_STR_OBJ(STRING, BOOT_SOFTWARE_ESTRA, env->device.identification.boot_version, 0xF1F4, 2); - -} - -#undef ADD_VAR_SIZE -#undef ADD_VAR -#undef ADD_VAR_STR_OBJ \ No newline at end of file diff --git a/DataNonVolatile_InitDeviceSetting.c b/DataNonVolatile_InitDeviceSetting.c index 39d5247..811d90a 100644 --- a/DataNonVolatile_InitDeviceSetting.c +++ b/DataNonVolatile_InitDeviceSetting.c @@ -5,32 +5,8 @@ #include "memory.h" void DeviceStorageInitDeviceSettings(tDeviceSettings *env) { - String16CopyStatic(&env->identification.software_classification, " "); - env->identification.tester_fingerprint.year = 0x18; - env->identification.tester_fingerprint.month = 0x10; - env->identification.tester_fingerprint.day = 0x16; - String16CopyStatic(&env->identification.tester_fingerprint.tester_serial, "123456789"); - env->identification.bootloader_info.software_crc = 0; // CRC программного обеспечения - env->identification.bootloader_info.major_version = 0; // Старшая версия - env->identification.bootloader_info.minor_version = 0; // Младшая версия - env->identification.bootloader_info.patch_version = 0; // Патч-версия - env->identification.bootloader_info.build_number = 0; // Номер сборки - env->identification.bootloader_info.checksum = 0; // Контрольная сумма структуры - env->identification.application_info.software_crc = 0; // CRC программного обеспечения - env->identification.application_info.major_version = 0; // Старшая версия - env->identification.application_info.minor_version = 0; // Младшая версия - env->identification.application_info.patch_version = 0; // Патч-версия - env->identification.application_info.build_number = 0; // Номер сборки - env->identification.application_info.checksum = 0; // Контрольная сумма структуры - String32CopyStatic(&env->identification.spare_part_number, " "); - String32CopyStatic(&env->identification.serial_number, " "); - String32CopyStatic(&env->identification.vin, " "); - String32CopyStatic(&env->identification.hardware_nami, " "); - String16CopyStatic(&env->identification.hardware_estra, " "); - String8CopyStatic(&env->identification.software_estra, " "); - String8CopyStatic(&env->identification.boot_version, " "); } diff --git a/modular.json b/modular.json index 923b519..393a9c7 100644 --- a/modular.json +++ b/modular.json @@ -1,11 +1,4 @@ { - "dep": [ - { - "type": "git", - "provider": "HVAC_M7", - "repo": "VariablesTable" - } - ], "cmake": { "inc_dirs": [ "./calib",