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

fix device instance

Browse Source
This commit is contained in:
Patrick Grimm 2013-09-28 21:54:16 +02:00
parent 45c29da1bd
commit bf5c8a6514
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
demo/object/device.c
View File

@ -479,12 +479,15 @@ bool Device_Reinitialize(
bool status = false; bool status = false;
const char *uci_password; const char *uci_password;
bool enable_pw = false; bool enable_pw = false;
char *pEnv = NULL;
pEnv = getenv("UCI_SECTION");
ctx = ucix_init("bacnet_dev"); ctx = ucix_init("bacnet_dev");
if(ctx) { if(ctx) {
enable_pw = ucix_get_option_int(ctx, "bacnet_dev", "0", enable_pw = ucix_get_option_int(ctx, "bacnet_dev", pEnv,
"enable_pw", false); "enable_pw", false);
if (enable_pw) { if (enable_pw) {
uci_password = ucix_get_option(ctx, "bacnet_dev", "0", "password"); uci_password = ucix_get_option(ctx, "bacnet_dev", pEnv, "password");
} }
} else { } else {
fprintf(stderr, "Failed to open config file bacnet_dev\n"); fprintf(stderr, "Failed to open config file bacnet_dev\n");
@ -699,14 +702,16 @@ bool Device_Set_Object_Name(
BACNET_CHARACTER_STRING * object_name) BACNET_CHARACTER_STRING * object_name)
{ {
bool status = false; /*return value */ bool status = false; /*return value */
char *pEnv = NULL;
pEnv = getenv("UCI_SECTION");
if (!characterstring_same(&My_Object_Name, object_name)) { if (!characterstring_same(&My_Object_Name, object_name)) {
/* Make the change and update the database revision */ /* Make the change and update the database revision */
status = characterstring_copy(&My_Object_Name, object_name); status = characterstring_copy(&My_Object_Name, object_name);
Device_Inc_Database_Revision(); Device_Inc_Database_Revision();
ctx = ucix_init("bacnet_dev"); ctx = ucix_init("bacnet_dev");
if(ctx) { if(ctx) {
ucix_add_option(ctx, "bacnet_dev", "0", "name", object_name->value); ucix_add_option(ctx, "bacnet_dev", pEnv, "name", object_name->value);
ucix_commit(ctx, "bacnet_dev"); ucix_commit(ctx, "bacnet_dev");
ucix_cleanup(ctx); ucix_cleanup(ctx);
} else { } else {
@ -869,13 +874,15 @@ bool Device_Set_Description(
size_t length) size_t length)
{ {
bool status = false; /*return value */ bool status = false; /*return value */
char *pEnv = NULL;
pEnv = getenv("UCI_SECTION");
if (length < sizeof(Description)) { if (length < sizeof(Description)) {
memmove(Description, name, length); memmove(Description, name, length);
Description[length] = 0; Description[length] = 0;
ctx = ucix_init("bacnet_dev"); ctx = ucix_init("bacnet_dev");
if(ctx) { if(ctx) {
ucix_add_option(ctx, "bacnet_dev", "0", "description", name); ucix_add_option(ctx, "bacnet_dev", pEnv, "description", name);
ucix_commit(ctx, "bacnet_dev"); ucix_commit(ctx, "bacnet_dev");
ucix_cleanup(ctx); ucix_cleanup(ctx);
} else { } else {
@ -898,13 +905,15 @@ bool Device_Set_Location(
size_t length) size_t length)
{ {
bool status = false; /*return value */ bool status = false; /*return value */
char *pEnv = NULL;
pEnv = getenv("UCI_SECTION");
if (length < sizeof(Location)) { if (length < sizeof(Location)) {
memmove(Location, name, length); memmove(Location, name, length);
Location[length] = 0; Location[length] = 0;
ctx = ucix_init("bacnet_dev"); ctx = ucix_init("bacnet_dev");
if(ctx) { if(ctx) {
ucix_add_option(ctx, "bacnet_dev", "0", "location", name); ucix_add_option(ctx, "bacnet_dev", pEnv, "location", name);
ucix_commit(ctx, "bacnet_dev"); ucix_commit(ctx, "bacnet_dev");
ucix_cleanup(ctx); ucix_cleanup(ctx);
} else { } else {