diff --git a/DataRuntime.c b/DataRuntime.c index 1f4d2e2..abdd1b7 100644 --- a/DataRuntime.c +++ b/DataRuntime.c @@ -8,32 +8,3 @@ void DeviceDataRuntime_InitDefaults(tDeviceDataRuntime *env) { } - - -#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, VARIABLES_GROUP) -#define ADD_VAR_STR_OBJ(TYPE, NAME, VALUE) ADD_VAR_SIZE(TYPE, NAME, &(VALUE).data, &(VALUE).length,VARIABLES_GROUP) - -// Добавление переменных в таблицу -void DeviceDataRuntime_AddToVarTab( - tDeviceDataRuntime *env, - tVariablesTable *variablesTable, - uint32_t VARIABLES_GROUP -) { - ADD_VAR_SIZE(STRING, DEV_VERSION, (void *) META_FW_NAME, (void *) &META_FW_NAME_SIZE, VARIABLES_GROUP); -} - -#undef ADD_VAR_SIZE -#undef ADD_VAR -#undef ADD_VAR_STR_OBJ \ No newline at end of file diff --git a/DataRuntime.h b/DataRuntime.h index d074901..844cac6 100644 --- a/DataRuntime.h +++ b/DataRuntime.h @@ -7,16 +7,10 @@ #include #include -#include typedef struct { } tDeviceDataRuntime; void DeviceDataRuntime_InitDefaults(tDeviceDataRuntime *env); -void DeviceDataRuntime_AddToVarTab( - tDeviceDataRuntime *env, - tVariablesTable *variablesTable, - uint32_t VARIABLES_GROUP -); #endif //HVAC_DEVICEDATARUNTIME_H diff --git a/modular.json b/modular.json index afa4f5c..0dd1901 100644 --- a/modular.json +++ b/modular.json @@ -1,11 +1,4 @@ { - "dep": [ - { - "type": "git", - "provider": "Smart_Components", - "repo": "VariablesTable" - } - ], "cmake": { "inc_dirs": [ "./"