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

Bugfix/network port object link speeds (#488)

Browse Source 
* fix ports/xplained build under Linux

* fix network port object link-speeds property

---------

Co-authored-by: Steve Karg <skarg@users.sourceforge.net>
This commit is contained in:
Steve Karg
2023-09-08 17:41:56 -05:00
committed by GitHub
parent bd597082d2
commit 0001f85f29
20 changed files with 404 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ports/xplained/Makefile
+41 -12
View File
@@ -6,13 +6,30 @@
MCU = atxmega256a3bu
TARGET = bacnet
## Tools
#Set the toolchain command names (only the ones needed are defined)
PREFIX ?= "C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-"
# Choose a BACnet Ports Directory for the example applications target OS
ifeq (${PREFIX},)
ifeq ($(OS),Windows_NT)
PREFIX := "C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-"
else
UNAME_S := $(shell uname -s)
ifeq ($(UNAME_S),Linux)
PREFIX := avr-
endif
ifeq ($(UNAME_S),Darwin)
PREFIX := avr-
endif
endif
endif
#Set the toolchain command names (only the ones needed are defined)
CC = $(PREFIX)gcc
OBJCOPY = $(PREFIX)objcopy
OBJDUMP = $(PREFIX)objdump
AR = $(PREFIX)ar
AS = $(PREFIX)as
LD = $(PREFIX)ld
NM = $(PREFIX)nm
STRIP = $(PREFIX)strip
SIZE = $(PREFIX)size
# Source locations
@@ -25,27 +42,33 @@ BACNET_BASIC = $(BACNET_CORE)/basic
CSRC = main.c \
adc-hdw.c \
ai.c \
mstimer-init.c \
bacnet.c \
bname.c \
device.c \
dlmstp.c \
led.c \
mstimer-init.c \
netport.c \
stack.c \
nvmdata.c \
rs485.c \
led.c
stack.c
# common demo files needed
BASICSRC = $(BACNET_BASIC)/tsm/tsm.c \
$(BACNET_BASIC)/sys/bigend.c \
$(BACNET_BASIC)/sys/debug.c \
$(BACNET_BASIC)/sys/fifo.c \
$(BACNET_BASIC)/sys/ringbuf.c \
$(BACNET_BASIC)/sys/mstimer.c \
$(BACNET_BASIC)/npdu/h_npdu.c \
$(BACNET_BASIC)/service/h_apdu.c \
$(BACNET_BASIC)/service/h_dcc.c \
$(BACNET_BASIC)/service/h_rd.c \
$(BACNET_BASIC)/service/h_rp.c \
$(BACNET_BASIC)/service/h_rpm.c \
$(BACNET_BASIC)/service/h_whois.c \
$(BACNET_BASIC)/service/h_whohas.c \
$(BACNET_BASIC)/service/h_wp.c \
$(BACNET_BASIC)/service/s_cov.c \
$(BACNET_BASIC)/service/s_iam.c \
$(BACNET_BASIC)/service/s_ihave.c \
@@ -92,7 +115,6 @@ SDK_CSRC = \
$(SDK_DIR)/xmega/drivers/adc/adc.c \
$(SDK_DIR)/xmega/drivers/adc/xmega_aau/adc_aau.c \
$(SDK_DIR)/xmega/drivers/rtc32/rtc32.c \
$(SDK_DIR)/xmega/drivers/tc/tc.c \
$(SDK_DIR)/common/drivers/nvm/xmega/xmega_nvm.c \
$(SDK_DIR)/common/services/serial/usart_serial.c \
$(SDK_DIR)/common/utils/stdio/read.c \
@@ -104,8 +126,8 @@ SDK_CSRC = \
$(SDK_DIR)/xmega/services/timeout/timeout.c
SDK_ASRC = \
$(SDK_DIR)/xmega/drivers/cpu/ccp.s \
$(SDK_DIR)/xmega/drivers/nvm/nvm_asm.s
$(SDK_DIR)/xmega/drivers/cpu/ccp.S \
$(SDK_DIR)/xmega/drivers/nvm/nvm_asm.S
## Include Directories
SDK_INCLUDES = -I$(SDK_DIR)/xmega/drivers/rtc32
@@ -142,7 +164,7 @@ COBJ = $(CSRC:.c=.o)
BASICOBJ = $(BASICSRC:.c=.o)
COREOBJ = $(CORESRC:.c=.o)
SDK_COBJ = $(SDK_CSRC:.c=.o)
SDK_AOBJ = $(SDK_ASRC:.s=.o)
SDK_AOBJ = $(SDK_ASRC:.S=.o)
LIBRARY = lib$(TARGET).a
@@ -159,6 +181,11 @@ BFLAGS += -DMSTP_PDU_PACKET_COUNT=2
BFLAGS += -DMAX_ADDRESS_CACHE=32
BFLAGS += -DMAX_ANALOG_INPUTS=8
BFLAGS += -DBACNET_PROTOCOL_REVISION=9
BFLAGS += -DBACAPP_MINIMAL
ifeq (${LEGACY},true)
# disable deprecated function warnings for legacy builds
BFLAGS += -DBACNET_STACK_DEPRECATED_DISABLE
endif
CFLAGS = $(SDK_FLAGS)
# dead code removal
@@ -177,7 +204,9 @@ CFLAGS += -DIOPORT_XMEGA_COMPAT
CFLAGS += -Wno-switch
## Assembly specific flags
AFLAGS = -Wa,-gdwarf2
AFLAGS = $(SDK_FLAGS)
AFLAGS += $(SDK_INCLUDES)
AFLAGS += -Wa,-gdwarf2
## Linker flags
LDFLAGS = $(SDK_FLAGS)
@@ -220,8 +249,8 @@ $(LIBRARY): $(COREOBJ) Makefile
.c.o:
$(CC) -c $(INCLUDES) $(CFLAGS) $*.c -o $@
.s.o:
$(CC) -c $(AFLAGS) $*.s -o $@
.S.o:
$(CC) -c $(AFLAGS) $*.S -o $@
size: ${TARGET_ELF}
@echo