From 1b9a00e238e6c12ade804ab1317ee5b684413b8b Mon Sep 17 00:00:00 2001 From: skarg Date: Mon, 13 Aug 2007 16:42:43 +0000 Subject: [PATCH] Added version files. --- bacnet-stack/demo/dcc/Makefile | 3 +- bacnet-stack/demo/dcc/makefile.b32 | 3 +- bacnet-stack/demo/epics/Makefile | 3 +- bacnet-stack/demo/epics/makefile.b32 | 3 +- bacnet-stack/demo/object/device.c | 19 ++--------- bacnet-stack/demo/object/device.h | 1 - bacnet-stack/demo/server/bacserv.cbp | 8 +++++ bacnet-stack/demo/server/main.c | 4 +++ bacnet-stack/doc/README.todo | 36 ++++++++++---------- bacnet-stack/ports/at91sam7s/device.c | 25 +++++++------- bacnet-stack/ports/at91sam7s/makefile | 11 +++--- bacnet-stack/ports/pic18f6720/device.c | 26 +++++++------- bacnet-stack/version.c | 36 ++++++++++++++++++++ bacnet-stack/version.h | 47 ++++++++++++++++++++++++++ 14 files changed, 156 insertions(+), 69 deletions(-) create mode 100644 bacnet-stack/version.c create mode 100644 bacnet-stack/version.h diff --git a/bacnet-stack/demo/dcc/Makefile b/bacnet-stack/demo/dcc/Makefile index bca0ea2f..e8472f08 100644 --- a/bacnet-stack/demo/dcc/Makefile +++ b/bacnet-stack/demo/dcc/Makefile @@ -69,7 +69,8 @@ SRCS = main.c \ $(BACNET_ROOT)/reject.c \ $(BACNET_ROOT)/bacerror.c \ $(BACNET_ROOT)/apdu.c \ - $(BACNET_ROOT)/npdu.c + $(BACNET_ROOT)/npdu.c \ + $(BACNET_ROOT)/version.c OBJS = ${SRCS:.c=.o} diff --git a/bacnet-stack/demo/dcc/makefile.b32 b/bacnet-stack/demo/dcc/makefile.b32 index 34066f6a..e54e7079 100644 --- a/bacnet-stack/demo/dcc/makefile.b32 +++ b/bacnet-stack/demo/dcc/makefile.b32 @@ -61,7 +61,8 @@ SRCS = main.c \ ..\..\reject.c \ ..\..\bacerror.c \ ..\..\apdu.c \ - ..\..\npdu.c + ..\..\npdu.c \ + ..\..\version.c OBJS = $(SRCS:.c=.obj) diff --git a/bacnet-stack/demo/epics/Makefile b/bacnet-stack/demo/epics/Makefile index 7502030e..4ba40671 100644 --- a/bacnet-stack/demo/epics/Makefile +++ b/bacnet-stack/demo/epics/Makefile @@ -69,7 +69,8 @@ SRCS = main.c \ $(BACNET_ROOT)/reject.c \ $(BACNET_ROOT)/bacerror.c \ $(BACNET_ROOT)/apdu.c \ - $(BACNET_ROOT)/npdu.c + $(BACNET_ROOT)/npdu.c \ + $(BACNET_ROOT)/version.c OBJS = ${SRCS:.c=.o} diff --git a/bacnet-stack/demo/epics/makefile.b32 b/bacnet-stack/demo/epics/makefile.b32 index 321440b1..99e464c8 100644 --- a/bacnet-stack/demo/epics/makefile.b32 +++ b/bacnet-stack/demo/epics/makefile.b32 @@ -62,7 +62,8 @@ SRCS = main.c \ ..\..\reject.c \ ..\..\bacerror.c \ ..\..\apdu.c \ - ..\..\npdu.c + ..\..\npdu.c \ + ..\..\version.c OBJS = $(SRCS:.c=.obj) diff --git a/bacnet-stack/demo/object/device.c b/bacnet-stack/demo/object/device.c index 3bed85b4..925ece07 100644 --- a/bacnet-stack/demo/object/device.c +++ b/bacnet-stack/demo/object/device.c @@ -42,6 +42,7 @@ #include "lsp.h" /* object list dependency */ #include "mso.h" /* object list dependency */ #include "wp.h" /* write property handling */ +#include "version.h" #include "device.h" /* me */ #if BACFILE #include "bacfile.h" /* object list dependency */ @@ -122,7 +123,6 @@ static char Vendor_Name[16] = "ASHRAE"; /* FIXME: your vendor id assigned by ASHRAE */ static uint16_t Vendor_Identifier = 0; static char Model_Name[16] = "GNU"; -static char Firmware_Revision[16] = "0.3.2"; static char Application_Software_Version[16] = "1.0"; static char Location[16] = "USA"; static char Description[16] = "server"; @@ -265,20 +265,7 @@ bool Device_Set_Model_Name(const char *name, size_t length) const char *Device_Firmware_Revision(void) { - return Firmware_Revision; -} - -bool Device_Set_Firmware_Revision(const char *name, size_t length) -{ - bool status = false; /*return value */ - - if (length < sizeof(Firmware_Revision)) { - memmove(Firmware_Revision, name, length); - Firmware_Revision[length] = 0; - status = true; - } - - return status; + return BACnet_Version; } const char *Device_Application_Software_Version(void) @@ -681,7 +668,7 @@ int Device_Encode_Property_APDU(uint8_t * apdu, apdu_len = encode_tagged_character_string(&apdu[0], &char_string); break; case PROP_FIRMWARE_REVISION: - characterstring_init_ansi(&char_string, Firmware_Revision); + characterstring_init_ansi(&char_string, BACnet_Version); apdu_len = encode_tagged_character_string(&apdu[0], &char_string); break; case PROP_APPLICATION_SOFTWARE_VERSION: diff --git a/bacnet-stack/demo/object/device.h b/bacnet-stack/demo/object/device.h index 957aa9a6..766801f6 100644 --- a/bacnet-stack/demo/object/device.h +++ b/bacnet-stack/demo/object/device.h @@ -69,7 +69,6 @@ extern "C" { bool Device_Set_Model_Name(const char *name, size_t length); const char *Device_Firmware_Revision(void); - bool Device_Set_Firmware_Revision(const char *name, size_t length); const char *Device_Application_Software_Version(void); bool Device_Set_Application_Software_Version(const char *name, diff --git a/bacnet-stack/demo/server/bacserv.cbp b/bacnet-stack/demo/server/bacserv.cbp index 5954ff08..f47d8c4c 100644 --- a/bacnet-stack/demo/server/bacserv.cbp +++ b/bacnet-stack/demo/server/bacserv.cbp @@ -88,6 +88,10 @@