dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change uci device_init from src to apps. it is more maintainable. (#219)

Browse Source 
* Change uci device_init from src/bacnet/basic/object/device to apps/server to make it more maintainable

Signed-off-by: Patrick Grimm <patrick@lunatiki.de>
This commit is contained in:
Patrick Grimm
2022-01-29 23:08:08 +01:00
committed by GitHub
parent 295f127c2b
commit 5daa34dae3
2 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/server/main.c
+20 -3
View File
@@ -226,7 +226,6 @@ int main(int argc, char *argv[])
if (!ctx) if (!ctx)
fprintf(stderr, "Failed to load config file bacnet_dev\n"); fprintf(stderr, "Failed to load config file bacnet_dev\n");
uciId = ucix_get_option_int(ctx, "bacnet_dev", "0", "Id", 0); uciId = ucix_get_option_int(ctx, "bacnet_dev", "0", "Id", 0);
printf("ID: %i", uciId);
if (uciId != 0) { if (uciId != 0) {
Device_Set_Object_Instance_Number(uciId); Device_Set_Object_Instance_Number(uciId);
} else { } else {
@@ -250,9 +249,27 @@ int main(int argc, char *argv[])
in our device bindings list */ in our device bindings list */
address_init(); address_init();
Init_Service_Handlers(); Init_Service_Handlers();
if (argc > 2) { #if defined(BAC_UCI)
Device_Object_Name_ANSI_Init(argv[2]); const char *uciname;
ctx = ucix_init("bacnet_dev");
if (!ctx)
fprintf(stderr, "Failed to load config file bacnet_dev\n");
uciname = ucix_get_option(ctx, "bacnet_dev", "0", "Name");
if (uciname != 0) {
Device_Object_Name_ANSI_Init(uciname);
} else {
#endif /* defined(BAC_UCI) */
if (argc > 2) {
Device_Object_Name_ANSI_Init(argv[2]);
}
#if defined(BAC_UCI)
} }
ucix_cleanup(ctx);
#endif /* defined(BAC_UCI) */
BACNET_CHARACTER_STRING DeviceName;
if (Device_Object_Name(Device_Object_Instance_Number(),&DeviceName))
printf("BACnet Device Name: %s\n", DeviceName.value);
dlenv_init(); dlenv_init();
atexit(datalink_cleanup); atexit(datalink_cleanup);
/* configure the timeout values */ /* configure the timeout values */
src/bacnet/basic/object/device.c
+1 -20
View File
@@ -75,9 +75,6 @@
#if defined(BACFILE) #if defined(BACFILE)
#include "bacnet/basic/object/bacfile.h" #include "bacnet/basic/object/bacfile.h"
#endif /* defined(BACFILE) */ #endif /* defined(BACFILE) */
#if defined(BAC_UCI)
#include "bacnet/basic/ucix/ucix.h"
#endif /* defined(BAC_UCI) */
/* local forward (semi-private) and external prototypes */ /* local forward (semi-private) and external prototypes */
int Device_Read_Property_Local(BACNET_READ_PROPERTY_DATA *rpdata); int Device_Read_Property_Local(BACNET_READ_PROPERTY_DATA *rpdata);
@@ -1805,23 +1802,7 @@ bool Device_Value_List_Supported(BACNET_OBJECT_TYPE object_type)
void Device_Init(object_functions_t *object_table) void Device_Init(object_functions_t *object_table)
{ {
struct object_functions *pObject = NULL; struct object_functions *pObject = NULL;
#if defined(BAC_UCI) characterstring_init_ansi(&My_Object_Name, "SimpleServer");
const char *uciname;
struct uci_context *ctx;
fprintf(stderr, "Device_Init\n");
ctx = ucix_init("bacnet_dev");
if (!ctx)
fprintf(stderr, "Failed to load config file bacnet_dev\n");
uciname = ucix_get_option(ctx, "bacnet_dev", "0", "Name");
if (uciname != 0) {
characterstring_init_ansi(&My_Object_Name, uciname);
} else {
#endif /* defined(BAC_UCI) */
characterstring_init_ansi(&My_Object_Name, "SimpleServer");
#if defined(BAC_UCI)
}
ucix_cleanup(ctx);
#endif /* defined(BAC_UCI) */
datetime_init(); datetime_init();
if (object_table) { if (object_table) {
Object_Table = object_table; Object_Table = object_table;