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

To build the Routing demo define BAC_ROUTING in the top Makefile. The value is not important - the symbol has to be defined.

Browse Source
This commit is contained in:
bacpack
2010-11-25 05:10:01 +00:00
parent 6a523e4d23
commit 47ecaeabaa
9 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/Makefile
+1 -1
View File
@@ -36,7 +36,7 @@ LFLAGS = -Wl,$(LIBRARIES)
SUBDIRS = readprop writeprop readfile writefile reinit server dcc \
whohas whois ucov timesync epics readpropm mstpcap
ifneq (,$(findstring BAC_ROUTING=1,$(BACNET_DEFINES)))
ifneq (,$(findstring -DBAC_ROUTING,$(BACNET_DEFINES)))
SUBDIRS += whoisrouter iamrouter initrouter gateway
endif
bacnet-stack/demo/handler/h_whohas.c
+1 -1
View File
@@ -65,7 +65,7 @@ void handler_who_has(
if (len > 0) {
if ((data.low_limit == -1) || (data.high_limit == -1))
directed_to_me = true;
#if BAC_ROUTING
#ifdef BAC_ROUTING
else if ((Routed_Device_Object_Instance_Number() >= (uint32_t) data.low_limit)
&& (Routed_Device_Object_Instance_Number() <= (uint32_t) data.high_limit))
#else
bacnet-stack/demo/handler/h_whois.c
+2 -2
View File
@@ -63,7 +63,7 @@ void handler_who_is(
Send_I_Am(&Handler_Transmit_Buffer[0]);
else if (len != -1) {
/* is my device id within the limits? */
#if BAC_ROUTING
#ifdef BAC_ROUTING
if (((Routed_Device_Object_Instance_Number() >= (uint32_t) low_limit) &&
(Routed_Device_Object_Instance_Number() <= (uint32_t) high_limit))
||
@@ -107,7 +107,7 @@ void handler_who_is_unicast(
Send_I_Am_Unicast(&Handler_Transmit_Buffer[0], src);
else if (len != -1) {
/* is my device id within the limits? */
#if BAC_ROUTING
#ifdef BAC_ROUTING
if (((Routed_Device_Object_Instance_Number() >= (uint32_t) low_limit) &&
(Routed_Device_Object_Instance_Number() <= (uint32_t) high_limit))
||
bacnet-stack/demo/object/device.c
+2 -2
View File
@@ -353,7 +353,7 @@ uint32_t Device_Index_To_Instance(
uint32_t Device_Object_Instance_Number(
void)
{
#if BAC_ROUTING
#ifdef BAC_ROUTING
return Routed_Device_Object_Instance_Number();
#else
return Object_Instance_Number;
@@ -1380,7 +1380,7 @@ bool DeviceGetRRInfo(
}
#if BAC_ROUTING
#ifdef BAC_ROUTING
/****************************************************************************
************* BACnet Routing Functionality (Optional) **********************
****************************************************************************
bacnet-stack/demo/object/gw_device.c
+1 -1
View File
@@ -78,7 +78,7 @@ bool Routed_Device_Write_Property_Local(
BACNET_WRITE_PROPERTY_DATA * wp_data);
#if !BAC_ROUTING
#if !defined(BAC_ROUTING)
#warning This file should not be included in the build unless BAC_ROUTING is enabled.
#endif