Change Notifications to initially be disabled.

This commit is contained in:
Steve Karg
2022-09-15 10:12:32 -05:00
parent a3838cb7b5
commit bda33b987e
+8 -3
View File
@@ -118,8 +118,9 @@ void Notification_Class_Init(void)
NC_Info[NotifyIdx].Recipient_List->ConfirmedNotify = false; NC_Info[NotifyIdx].Recipient_List->ConfirmedNotify = false;
NC_Info[NotifyIdx].Recipient_List->Recipient.RecipientType = NC_Info[NotifyIdx].Recipient_List->Recipient.RecipientType =
RECIPIENT_TYPE_DEVICE; RECIPIENT_TYPE_DEVICE;
/* initialize to *wildcard* device instance - invalid! */
NC_Info[NotifyIdx].Recipient_List->Recipient._.DeviceIdentifier = NC_Info[NotifyIdx].Recipient_List->Recipient._.DeviceIdentifier =
4194303; BACNET_MAX_INSTANCE;
} }
return; return;
@@ -961,8 +962,12 @@ void Notification_Class_find_recipient(void)
.Recipient._.DeviceIdentifier; .Recipient._.DeviceIdentifier;
/* Send who_ is request only when address of device is unknown. /* Send who_ is request only when address of device is unknown.
*/ */
if (!address_bind_request(DeviceID, &max_apdu, &src)) if (DeviceID < BACNET_MAX_INSTANCE) {
Send_WhoIs(DeviceID, DeviceID); /* note: BACNET_MAX_INSTANCE = wildcard, not valid */
if (!address_bind_request(DeviceID, &max_apdu, &src)) {
Send_WhoIs(DeviceID, DeviceID);
}
}
} else if (CurrentNotify->Recipient_List[idx] } else if (CurrentNotify->Recipient_List[idx]
.Recipient.RecipientType == RECIPIENT_TYPE_ADDRESS) { .Recipient.RecipientType == RECIPIENT_TYPE_ADDRESS) {
} }