Updated the library in the ATmega makefile, and updated the tsm module.
This commit is contained in:
@@ -13,41 +13,57 @@ OBJCOPY = avr-objcopy
|
|||||||
OBJDUMP = avr-objdump
|
OBJDUMP = avr-objdump
|
||||||
SIZE = avr-size
|
SIZE = avr-size
|
||||||
|
|
||||||
|
# Source locations
|
||||||
|
BACNET_ROOT = ../..
|
||||||
|
|
||||||
CSRC = main.c \
|
CSRC = main.c \
|
||||||
timer.c \
|
timer.c \
|
||||||
rs485.c \
|
rs485.c \
|
||||||
dlmstp.c \
|
dlmstp.c \
|
||||||
../../npdu.c \
|
$(BACNET_ROOT)/crc.c
|
||||||
../../bacint.c \
|
|
||||||
../../bacaddr.c \
|
|
||||||
../../crc.c
|
|
||||||
|
|
||||||
DEMOSRC = h_rp.c \
|
DEMOSRC = h_rp.c \
|
||||||
h_wp.c \
|
h_wp.c \
|
||||||
device.c \
|
device.c \
|
||||||
ai.c \
|
ai.c \
|
||||||
../../demo/handler/txbuf.c \
|
$(BACNET_ROOT)/demo/handler/txbuf.c \
|
||||||
../../demo/handler/h_whois.c \
|
$(BACNET_ROOT)/demo/handler/h_whois.c \
|
||||||
../../demo/handler/h_rd.c \
|
$(BACNET_ROOT)/demo/handler/h_rd.c \
|
||||||
../../demo/handler/h_dcc.c
|
$(BACNET_ROOT)/demo/handler/h_dcc.c
|
||||||
|
|
||||||
CORESRC = \
|
CORESRC = \
|
||||||
../../bacint.c \
|
$(BACNET_ROOT)/apdu.c \
|
||||||
../../apdu.c \
|
$(BACNET_ROOT)/npdu.c \
|
||||||
../../bacdcode.c \
|
$(BACNET_ROOT)/bacdcode.c \
|
||||||
../../bacstr.c \
|
$(BACNET_ROOT)/bacint.c \
|
||||||
../../abort.c \
|
$(BACNET_ROOT)/bacapp.c \
|
||||||
../../bacerror.c \
|
$(BACNET_ROOT)/bacprop.c \
|
||||||
../../reject.c \
|
$(BACNET_ROOT)/bacstr.c \
|
||||||
../../bacapp.c \
|
$(BACNET_ROOT)/bactext.c \
|
||||||
../../datetime.c \
|
$(BACNET_ROOT)/datetime.c \
|
||||||
../../rp.c \
|
$(BACNET_ROOT)/indtext.c \
|
||||||
../../wp.c \
|
$(BACNET_ROOT)/bigend.c \
|
||||||
../../dcc.c \
|
$(BACNET_ROOT)/arf.c \
|
||||||
../../rd.c \
|
$(BACNET_ROOT)/awf.c \
|
||||||
../../whois.c \
|
$(BACNET_ROOT)/cov.c \
|
||||||
../../iam.c \
|
$(BACNET_ROOT)/dcc.c \
|
||||||
../../version.c
|
$(BACNET_ROOT)/iam.c \
|
||||||
|
$(BACNET_ROOT)/ihave.c \
|
||||||
|
$(BACNET_ROOT)/rd.c \
|
||||||
|
$(BACNET_ROOT)/rp.c \
|
||||||
|
$(BACNET_ROOT)/rpm.c \
|
||||||
|
$(BACNET_ROOT)/timesync.c \
|
||||||
|
$(BACNET_ROOT)/whohas.c \
|
||||||
|
$(BACNET_ROOT)/whois.c \
|
||||||
|
$(BACNET_ROOT)/wp.c \
|
||||||
|
$(BACNET_ROOT)/abort.c \
|
||||||
|
$(BACNET_ROOT)/reject.c \
|
||||||
|
$(BACNET_ROOT)/bacerror.c \
|
||||||
|
$(BACNET_ROOT)/filename.c \
|
||||||
|
$(BACNET_ROOT)/tsm.c \
|
||||||
|
$(BACNET_ROOT)/bacaddr.c \
|
||||||
|
$(BACNET_ROOT)/address.c \
|
||||||
|
$(BACNET_ROOT)/version.c
|
||||||
|
|
||||||
## Include Directories
|
## Include Directories
|
||||||
INCLUDES = -I. -I../.. -I../../demo/object -I../../demo/handler
|
INCLUDES = -I. -I../.. -I../../demo/object -I../../demo/handler
|
||||||
|
|||||||
@@ -49,6 +49,7 @@
|
|||||||
#include "address.h"
|
#include "address.h"
|
||||||
#include "bacaddr.h"
|
#include "bacaddr.h"
|
||||||
|
|
||||||
|
#if (MAX_TSM_TRANSACTIONS)
|
||||||
/* Transaction State Machine */
|
/* Transaction State Machine */
|
||||||
/* Really only needed for segmented messages */
|
/* Really only needed for segmented messages */
|
||||||
/* and a little for sending confirmed messages */
|
/* and a little for sending confirmed messages */
|
||||||
@@ -353,3 +354,4 @@ int main(void)
|
|||||||
}
|
}
|
||||||
#endif /* TEST_TSM */
|
#endif /* TEST_TSM */
|
||||||
#endif /* TEST */
|
#endif /* TEST */
|
||||||
|
#endif /* MAX_TSM_TRANSACTIONS */
|
||||||
|
|||||||
Reference in New Issue
Block a user