Merge /u/mkudlacek/bacnet/ branch master into master
https://sourceforge.net/p/bacnet/src/merge-requests/2/
This commit is contained in:
@@ -44,6 +44,7 @@
|
||||
*.7z
|
||||
*.hex
|
||||
*.elf
|
||||
*.eep
|
||||
*.emSession
|
||||
*.depend
|
||||
*.layout
|
||||
|
||||
@@ -29,8 +29,8 @@ AVRDUDE_PROGRAMMERID = avrispmkII
|
||||
AVRDUDE_PORT = /dev/ttyUSB0
|
||||
|
||||
# Source locations
|
||||
BACNET_CORE = ../../src
|
||||
BACNET_INCLUDE = $(BACNET_CORE)
|
||||
BACNET_SRC = ../../src
|
||||
BACNET_CORE = $(BACNET_SRC)/bacnet
|
||||
BACNET_BASIC = $(BACNET_CORE)/basic
|
||||
|
||||
# local files for this project
|
||||
@@ -72,7 +72,7 @@ CORESRC = \
|
||||
$(BACNET_CORE)/bacapp.c
|
||||
|
||||
## Include Directories
|
||||
INCLUDES = -I. -I$(BACNET_INCLUDE)
|
||||
INCLUDES = -I. -I$(BACNET_SRC) -I$(BACNET_CORE)
|
||||
|
||||
# Source to Object conversion
|
||||
COBJ = $(CSRC:.c=.o)
|
||||
|
||||
@@ -82,7 +82,7 @@ unsigned Binary_Value_Instance_To_Index(
|
||||
return index;
|
||||
}
|
||||
|
||||
static BACNET_BINARY_PV Binary_Value_Present_Value(
|
||||
BACNET_BINARY_PV Binary_Value_Present_Value(
|
||||
uint32_t object_instance)
|
||||
{
|
||||
BACNET_BINARY_PV value = BINARY_INACTIVE;
|
||||
|
||||
Reference in New Issue
Block a user