From 038b9a4fe22882d6351e3bfc4f3932ca5946e6c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kudl=C3=A1=C4=8Dek?= Date: Fri, 3 Jan 2020 20:50:59 +0100 Subject: [PATCH] Fixing ATMEGA168 port paths and includes according to changes in directory structure --- .gitignore | 1 + ports/atmega168/Makefile | 6 +++--- ports/atmega168/bv.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index b0abf4bd..a2aa41c6 100644 --- a/.gitignore +++ b/.gitignore @@ -44,6 +44,7 @@ *.7z *.hex *.elf +*.eep *.emSession *.depend *.layout diff --git a/ports/atmega168/Makefile b/ports/atmega168/Makefile index 5055bd8c..61ff9630 100644 --- a/ports/atmega168/Makefile +++ b/ports/atmega168/Makefile @@ -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) diff --git a/ports/atmega168/bv.c b/ports/atmega168/bv.c index 416033fe..db8b8ab0 100644 --- a/ports/atmega168/bv.c +++ b/ports/atmega168/bv.c @@ -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;