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

Ability to compile the project without INTRINSIC_REPORTING.

Browse Source
This commit is contained in:
k001a
2011-07-07 20:06:43 +00:00
parent ad27b84949
commit 90fcf9706d
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/object/av.c
+4
View File
@@ -118,6 +118,7 @@ void Analog_Value_Init(
AV_Descr[i].Priority_Array[j] = ANALOG_LEVEL_NULL; AV_Descr[i].Priority_Array[j] = ANALOG_LEVEL_NULL;
} }
AV_Descr[i].Units = UNITS_PERCENT; AV_Descr[i].Units = UNITS_PERCENT;
#if defined(INTRINSIC_REPORTING)
AV_Descr[i].Event_State = EVENT_STATE_NORMAL; AV_Descr[i].Event_State = EVENT_STATE_NORMAL;
/* notification class not connected */ /* notification class not connected */
AV_Descr[i].Notification_Class = BACNET_MAX_INSTANCE; AV_Descr[i].Notification_Class = BACNET_MAX_INSTANCE;
@@ -125,6 +126,7 @@ void Analog_Value_Init(
for (j = 0; j < MAX_BACNET_EVENT_TRANSITION; j++) { for (j = 0; j < MAX_BACNET_EVENT_TRANSITION; j++) {
datetime_wildcard_set(&AV_Descr[i].Event_Time_Stamps[j]); datetime_wildcard_set(&AV_Descr[i].Event_Time_Stamps[j]);
} }
#endif
} }
return; return;
@@ -719,6 +721,7 @@ bool Analog_Value_Write_Property(
void Analog_Value_Intrinsic_Reporting(uint32_t object_instance) void Analog_Value_Intrinsic_Reporting(uint32_t object_instance)
{ {
#if defined(INTRINSIC_REPORTING)
BACNET_EVENT_NOTIFICATION_DATA event_data; BACNET_EVENT_NOTIFICATION_DATA event_data;
BACNET_CHARACTER_STRING msgText; BACNET_CHARACTER_STRING msgText;
ANALOG_VALUE_DESCR *CurrentAV; ANALOG_VALUE_DESCR *CurrentAV;
@@ -933,6 +936,7 @@ void Analog_Value_Intrinsic_Reporting(uint32_t object_instance)
/* add data from notification class */ /* add data from notification class */
Notification_Class_common_reporting_function(&event_data); Notification_Class_common_reporting_function(&event_data);
} }
#endif /* defined(INTRINSIC_REPORTING) */
} }
bacnet-stack/demo/object/device.c
+2
View File
@@ -1487,6 +1487,7 @@ bool Device_Encode_Value_List(
void Device_local_reporting(uint32_t milliseconds) void Device_local_reporting(uint32_t milliseconds)
{ {
#if defined(INTRINSIC_REPORTING)
struct object_functions *pObject; struct object_functions *pObject;
uint32_t objects_count; uint32_t objects_count;
uint32_t object_instance; uint32_t object_instance;
@@ -1512,6 +1513,7 @@ void Device_local_reporting(uint32_t milliseconds)
} }
} }
} }
#endif
} }
/** Looks up the requested Object to see if the functionality is supported. /** Looks up the requested Object to see if the functionality is supported.
bacnet-stack/demo/object/nc.c
+3 -1
View File
@@ -47,6 +47,7 @@
#endif #endif
#if defined(INTRINSIC_REPORTING)
static NOTIFICATION_CLASS_INFO NC_Info[MAX_NOTIFICATION_CLASSES]; static NOTIFICATION_CLASS_INFO NC_Info[MAX_NOTIFICATION_CLASSES];
/* These three arrays are used by the ReadPropertyMultiple handler */ /* These three arrays are used by the ReadPropertyMultiple handler */
@@ -120,7 +121,7 @@ void Notification_Class_Init(void)
// NC_Info[0].Recipient_List[0].Recipient._.Address.mac[0] = 0xC0; // NC_Info[0].Recipient_List[0].Recipient._.Address.mac[0] = 0xC0;
// NC_Info[0].Recipient_List[0].Recipient._.Address.mac[1] = 0xA8; // NC_Info[0].Recipient_List[0].Recipient._.Address.mac[1] = 0xA8;
// NC_Info[0].Recipient_List[0].Recipient._.Address.mac[2] = 0x01; // NC_Info[0].Recipient_List[0].Recipient._.Address.mac[2] = 0x01;
// NC_Info[0].Recipient_List[0].Recipient._.Address.mac[3] = 0x65; // NC_Info[0].Recipient_List[0].Recipient._.Address.mac[3] = 0xFF;
// NC_Info[0].Recipient_List[0].Recipient._.Address.mac[4] = 0xBA; // NC_Info[0].Recipient_List[0].Recipient._.Address.mac[4] = 0xBA;
// NC_Info[0].Recipient_List[0].Recipient._.Address.mac[5] = 0xC0; // NC_Info[0].Recipient_List[0].Recipient._.Address.mac[5] = 0xC0;
// NC_Info[0].Recipient_List[0].Recipient._.Address.mac_len = 6; // NC_Info[0].Recipient_List[0].Recipient._.Address.mac_len = 6;
@@ -890,3 +891,4 @@ void Notification_Class_find_recipient(void)
} }
} }
} }
#endif /* defined(INTRINSIC_REPORTING) */