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 nc max

Browse Source
This commit is contained in:
Patrick Grimm
2014-02-19 02:09:35 +01:00
parent 6082e3f380
commit 9cfbf38cfd
2 changed files with 105 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
demo/object/nc.c
View File

@@ -179,6 +179,8 @@ void Notification_Class_Init(
ucidisable = ucix_get_option_int(ctx, sec, idx_c,
"disable", 0);
if ((uciname != 0) && (ucidisable == 0)) {
memset(&NC_Descr[i], 0x00, sizeof(NOTIFICATION_CLASS_DESCR));
NC_Descr[i].Instance=atoi(idx_cc);
NC_Descr[i].Disable=false;
sprintf(name, "%s", uciname);
ucix_string_copy(NC_Descr[i].Object_Name,
@@ -196,9 +198,6 @@ void Notification_Class_Init(
}
ucix_string_copy(NC_Descr[i].Object_Description,
sizeof(NC_Descr[i].Object_Description), description);
} else {
NC_Descr[i].Disable=true;
}
/* set the basic parameters */
NC_Descr[i].Ack_Required = 7; //TODO uci
@@ -256,6 +255,14 @@ void Notification_Class_Init(
recplist[ucirecp_i].Recipient._.Address.mac_len = 6;
recplist[ucirecp_i].Recipient._.Address.len = 0;
recplist[ucirecp_i].ConfirmedNotify = false;
fprintf(stderr,"recp: %i.%i.%i.%i:%i%i\n",
recplist[ucirecp_i].Recipient._.Address.mac[0],
recplist[ucirecp_i].Recipient._.Address.mac[1],
recplist[ucirecp_i].Recipient._.Address.mac[2],
recplist[ucirecp_i].Recipient._.Address.mac[3],
recplist[ucirecp_i].Recipient._.Address.mac[4],
recplist[ucirecp_i].Recipient._.Address.mac[5]
);
}
recplist[ucirecp_i].ProcessIdentifier = ucirecp_i;
recplist[ucirecp_i].Transitions = 7; //bit string 1,1,1 To Alarm,To Fault,To Normal
@@ -278,6 +285,14 @@ void Notification_Class_Init(
} else if (NC_Descr[i].Recipient_List[ucirecp_i].Recipient.
RecipientType == RECIPIENT_TYPE_ADDRESS) {
fprintf(stderr,"recp cp: %i.%i.%i.%i:%i%i\n",
NC_Descr[i].Recipient_List[ucirecp_i].Recipient._.Address.mac[0],
NC_Descr[i].Recipient_List[ucirecp_i].Recipient._.Address.mac[1],
NC_Descr[i].Recipient_List[ucirecp_i].Recipient._.Address.mac[2],
NC_Descr[i].Recipient_List[ucirecp_i].Recipient._.Address.mac[3],
NC_Descr[i].Recipient_List[ucirecp_i].Recipient._.Address.mac[4],
NC_Descr[i].Recipient_List[ucirecp_i].Recipient._.Address.mac[5]
);
/* copy Address */
src = NC_Descr[i].Recipient_List[ucirecp_i].Recipient._.Address;
address_bind_request(BACNET_MAX_INSTANCE, &max_apdu, &src);
@@ -286,6 +301,7 @@ void Notification_Class_Init(
i++;
max_notificaton_classes_int = i;
}
}
#if PRINT_ENABLED
fprintf(stderr, "max_notificaton_classes: %i\n", max_notificaton_classes_int);
#endif
@@ -457,6 +473,7 @@ static bool Notification_Class_Description_Write(
return status;
}
/* note: the object name must be unique within this device */
bool Notification_Class_Object_Name(
uint32_t object_instance,
BACNET_CHARACTER_STRING *object_name)

2
demo/object/nc.h
View File

@@ -44,8 +44,6 @@ extern "C" {
RECIPIENT_TYPE_ADDRESS = 2
} NC_RECIPIENT_TYPE;
int max_notificaton_classes_int;
#if defined(INTRINSIC_REPORTING)
/* BACnetRecipient structure */
/*