mirror/bacnet-stack
1
0
Fork 0
mirror of https://github.com/stargieg/bacnet-stack synced 2025-10-26 23:35:52 +08:00
Code Issues Releases Wiki Activity

tl cleanups

Browse Source
This commit is contained in:
Patrick Grimm
2014-02-22 21:06:15 +01:00
parent 8d7227c6eb
commit 4bba8ea862
1 changed files with 11 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
demo/object/trendlog.c
View File

@@ -169,11 +169,11 @@ void Trend_Log_Init(
int uciobject_instance; int uciobject_instance;
int uciinterval; int uciinterval;
int uciinterval_default; int uciinterval_default;
char i_string[64];
char i_instance_string[64]; char i_instance_string[64];
int iEntry; #if 0
struct tm TempTime; struct tm TempTime;
time_t tClock; time_t tClock;
#endif
const char *sec = "bacnet_tl"; const char *sec = "bacnet_tl";
char *section; char *section;
@@ -200,14 +200,14 @@ void Trend_Log_Init(
ucix_for_each_section_type(ctx, section, type, ucix_for_each_section_type(ctx, section, type,
(void *)Trend_Log_Load_UCI_List, &itr_m); (void *)Trend_Log_Load_UCI_List, &itr_m);
ucidescription_default = ucix_get_option(ctx, "bacnet_tl", "default", ucidescription_default = ucix_get_option(ctx, sec, "default",
"description"); "description");
uciinterval_default = ucix_get_option_int(ctx, "bacnet_tl", uciinterval_default = ucix_get_option_int(ctx, sec,
"default", "interval", 900); "default", "interval", 900);
ucidevice_type_default = ucix_get_option_int(ctx, "bacnet_tl", ucidevice_type_default = ucix_get_option_int(ctx, sec,
i_string, "device_type", OBJECT_DEVICE); "default", "device_type", OBJECT_DEVICE);
uciobject_type_default = ucix_get_option_int(ctx, "bacnet_tl", uciobject_type_default = ucix_get_option_int(ctx, sec,
i_string, "object_type", 255); "default", "object_type", 255);
/* initialize all the values */ /* initialize all the values */
@@ -227,7 +227,6 @@ void Trend_Log_Init(
/* init with zeros */ /* init with zeros */
strncpy(idx_cc, cur->idx, sizeof(idx_cc)); strncpy(idx_cc, cur->idx, sizeof(idx_cc));
idx_c = idx_cc; idx_c = idx_cc;
sprintf(i_string,"%d",i);
ucidevice_type = ucix_get_option_int(ctx, sec, ucidevice_type = ucix_get_option_int(ctx, sec,
idx_c, "device_type", ucidevice_type_default); idx_c, "device_type", ucidevice_type_default);
uciobject_type = ucix_get_option_int(ctx, sec, uciobject_type = ucix_get_option_int(ctx, sec,
@@ -292,8 +291,8 @@ void Trend_Log_Init(
} }
ucix_string_copy(TL_Descr[i].Object_Description, ucix_string_copy(TL_Descr[i].Object_Description,
sizeof(TL_Descr[i].Object_Description), description); sizeof(TL_Descr[i].Object_Description), description);
uciinterval = ucix_get_option_int(ctx, "bacnet_tl", uciinterval = ucix_get_option_int(ctx, sec,
i_string, "interval", uciinterval_default); idx_c, "interval", uciinterval_default);
#if 0 #if 0
/* We will just fill the logs with some entries for testing /* We will just fill the logs with some entries for testing
@@ -318,8 +317,8 @@ void Trend_Log_Init(
Logs[i][iEntry].ucStatus = 0; Logs[i][iEntry].ucStatus = 0;
tClock += 900; /* advance 15 minutes */ tClock += 900; /* advance 15 minutes */
} }
#endif
TL_Descr[i].tLastDataTime = tClock - 900; TL_Descr[i].tLastDataTime = tClock - 900;
#endif
TL_Descr[i].bAlignIntervals = true; TL_Descr[i].bAlignIntervals = true;
TL_Descr[i].bEnable = true; TL_Descr[i].bEnable = true;
TL_Descr[i].bStopWhenFull = false; TL_Descr[i].bStopWhenFull = false;
@@ -539,38 +538,6 @@ bool Trend_Log_Object_Name(
return status; return status;
} }
/* note: the object name must be unique within this device */
bool Trend_Log_Object_Name_Set(
uint32_t object_instance,
char *new_name)
{
TREND_LOG_DESCR *CurrentTL;
unsigned index = 0; /* offset from instance lookup */
size_t i = 0; /* loop counter */
bool status = false; /* return value */
if (Trend_Log_Valid_Instance(object_instance)) {
index = Trend_Log_Instance_To_Index(object_instance);
CurrentTL = &TL_Descr[index];
status = true;
/* FIXME: check to see if there is a matching name */
if (new_name) {
for (i = 0; i < sizeof(CurrentTL->Object_Name); i++) {
CurrentTL->Object_Name[i] = new_name[i];
if (new_name[i] == 0) {
break;
}
}
} else {
for (i = 0; i < sizeof(CurrentTL->Object_Name); i++) {
CurrentTL->Object_Name[i] = 0;
}
}
}
return status;
}
static bool Trend_Log_Object_Name_Write( static bool Trend_Log_Object_Name_Write(
uint32_t object_instance, uint32_t object_instance,
BACNET_CHARACTER_STRING *char_string, BACNET_CHARACTER_STRING *char_string,
@@ -1307,7 +1274,6 @@ bool TrendLogGetRRInfo(
BACNET_READ_RANGE_DATA * pRequest, /* Info on the request */ BACNET_READ_RANGE_DATA * pRequest, /* Info on the request */
RR_PROP_INFO * pInfo) RR_PROP_INFO * pInfo)
{ /* Where to put the information */ { /* Where to put the information */
unsigned index;
if (!Trend_Log_Valid_Instance(pRequest->object_instance)) { if (!Trend_Log_Valid_Instance(pRequest->object_instance)) {
pRequest->error_class = ERROR_CLASS_OBJECT; pRequest->error_class = ERROR_CLASS_OBJECT;