From 4d19c82f5986d26626320187571aca5b564766d1 Mon Sep 17 00:00:00 2001 From: skarg Date: Sat, 5 Aug 2006 19:36:55 +0000 Subject: [PATCH] Created a demo Multi-state Output object, and added it to the demo applications. --- bacnet-stack/Makefile | 27 +- bacnet-stack/demo/dcc/Makefile | 1 + bacnet-stack/demo/dcc/makefile.b32 | 1 + bacnet-stack/demo/handler/h_rp.c | 22 ++ bacnet-stack/demo/handler/h_wp.c | 18 + bacnet-stack/demo/object/bo.c | 2 +- bacnet-stack/demo/object/bv.c | 2 +- bacnet-stack/demo/object/device.c | 36 ++ bacnet-stack/demo/object/mso.c | 419 +++++++++++++++++++++++ bacnet-stack/demo/object/mso.h | 60 ++++ bacnet-stack/demo/object/mso.mak | 35 ++ bacnet-stack/demo/readfile/Makefile | 1 + bacnet-stack/demo/readfile/makefile.b32 | 1 + bacnet-stack/demo/readprop/Makefile | 1 + bacnet-stack/demo/readprop/makefile.b32 | 1 + bacnet-stack/demo/reinit/Makefile | 1 + bacnet-stack/demo/reinit/makefile.b32 | 1 + bacnet-stack/demo/server/Makefile | 1 + bacnet-stack/demo/server/makefile.b32 | 1 + bacnet-stack/demo/timesync/Makefile | 1 + bacnet-stack/demo/timesync/makefile.b32 | 1 + bacnet-stack/demo/ucov/Makefile | 1 + bacnet-stack/demo/ucov/makefile.b32 | 1 + bacnet-stack/demo/whohas/Makefile | 1 + bacnet-stack/demo/whohas/makefile.b32 | 1 + bacnet-stack/demo/whois/Makefile | 1 + bacnet-stack/demo/whois/makefile.b32 | 1 + bacnet-stack/demo/writefile/Makefile | 1 + bacnet-stack/demo/writefile/makefile.b32 | 1 + bacnet-stack/demo/writeprop/Makefile | 1 + bacnet-stack/demo/writeprop/makefile.b32 | 1 + bacnet-stack/ports/win32/MAKEFILE.MAK | 1 + 32 files changed, 630 insertions(+), 14 deletions(-) create mode 100644 bacnet-stack/demo/object/mso.c create mode 100644 bacnet-stack/demo/object/mso.h create mode 100644 bacnet-stack/demo/object/mso.mak diff --git a/bacnet-stack/Makefile b/bacnet-stack/Makefile index 7afba096..e68f41fa 100644 --- a/bacnet-stack/Makefile +++ b/bacnet-stack/Makefile @@ -1,5 +1,5 @@ -all: readprop writeprop readfile writefile reinit server dcc whohas whois timesync - @echo "utilities are in demo/xx directories" +all: readprop writeprop readfile writefile reinit server dcc whohas whois ucov timesync + @echo "utilities are in the utils directory" clean: \ demo/readprop/Makefile \ @@ -23,31 +23,34 @@ clean: \ ( cd demo/whois ; make clean ) readprop: demo/readprop/Makefile - ( cd demo/readprop ; make clean ; make ) + ( cd demo/readprop ; make clean ; make ; cp bacrp ../../utils ) writeprop: demo/writeprop/Makefile - ( cd demo/writeprop ; make clean ; make ) + ( cd demo/writeprop ; make clean ; make ; cp bacwp ../../utils ) readfile: demo/readfile/Makefile - ( cd demo/readfile ; make clean ; make ) + ( cd demo/readfile ; make clean ; make ; cp bacarf ../../utils ) writefile: demo/writefile/Makefile - ( cd demo/writefile ; make clean ; make ) + ( cd demo/writefile ; make clean ; make ; cp bacawf ../../utils ) reinit: demo/reinit/Makefile - ( cd demo/reinit ; make clean ; make ) + ( cd demo/reinit ; make clean ; make ; cp bacrd ../../utils ) server: demo/server/Makefile - ( cd demo/server ; make clean ; make ) + ( cd demo/server ; make clean ; make ; cp bacserv ../../utils ) dcc: demo/dcc/Makefile - ( cd demo/dcc ; make clean ; make ) + ( cd demo/dcc ; make clean ; make ; cp bacdcc ../../utils ) whohas: demo/whohas/Makefile - ( cd demo/whohas ; make clean ; make ) + ( cd demo/whohas ; make clean ; make ; cp bacwh ../../utils ) timesync: demo/timesync/Makefile - ( cd demo/timesync ; make clean ; make ) + ( cd demo/timesync ; make clean ; make ; cp bacts ../../utils ) + +ucov: demo/ucov/Makefile + ( cd demo/ucov ; make clean ; make ; cp bacucov ../../utils ) whois: demo/whois/Makefile - ( cd demo/whois ; make clean ; make ) + ( cd demo/whois ; make clean ; make ; cp bacwi ../../utils ) diff --git a/bacnet-stack/demo/dcc/Makefile b/bacnet-stack/demo/dcc/Makefile index 12e98747..23212dde 100644 --- a/bacnet-stack/demo/dcc/Makefile +++ b/bacnet-stack/demo/dcc/Makefile @@ -40,6 +40,7 @@ SRCS = main.c \ $(BACNET_OBJECT)/bo.c \ $(BACNET_OBJECT)/bv.c \ $(BACNET_OBJECT)/lsp.c \ + $(BACNET_OBJECT)/mso.c \ $(BACNET_OBJECT)/bacfile.c \ $(BACNET_ROOT)/filename.c \ $(BACNET_ROOT)/rp.c \ diff --git a/bacnet-stack/demo/dcc/makefile.b32 b/bacnet-stack/demo/dcc/makefile.b32 index 6fdb1c1c..f344e905 100644 --- a/bacnet-stack/demo/dcc/makefile.b32 +++ b/bacnet-stack/demo/dcc/makefile.b32 @@ -51,6 +51,7 @@ SRCS = main.c \ ..\..\demo\object\bo.c \ ..\..\demo\object\bv.c \ ..\..\demo\object\lsp.c \ + ..\..\demo\object\mso.c \ ..\..\datalink.c \ ..\..\tsm.c \ ..\..\address.c \ diff --git a/bacnet-stack/demo/handler/h_rp.c b/bacnet-stack/demo/handler/h_rp.c index a45581bb..1d0640ff 100644 --- a/bacnet-stack/demo/handler/h_rp.c +++ b/bacnet-stack/demo/handler/h_rp.c @@ -44,6 +44,7 @@ #include "bo.h" #include "bv.h" #include "lsp.h" +#include "mso.h" #if BACFILE #include "bacfile.h" #endif @@ -254,6 +255,27 @@ void handler_read_property(uint8_t * service_request, } else error = true; break; + case OBJECT_MULTI_STATE_OUTPUT: + if (Multistate_Output_Valid_Instance(data.object_instance)) { + len = Multistate_Output_Encode_Property_APDU(&Temp_Buf[0], + data.object_instance, + data.object_property, + data.array_index, &error_class, &error_code); + if (len >= 0) { + /* encode the APDU portion of the packet */ + data.application_data = &Temp_Buf[0]; + data.application_data_len = len; + /* FIXME: probably need a length limitation sent with encode */ + pdu_len += + rp_ack_encode_apdu(&Handler_Transmit_Buffer + [pdu_len], service_data->invoke_id, &data); + fprintf(stderr, "Sending Read Property Ack for MSO!\n"); + send = true; + } else + error = true; + } else + error = true; + break; #if BACFILE case OBJECT_FILE: if (bacfile_valid_instance(data.object_instance)) { diff --git a/bacnet-stack/demo/handler/h_wp.c b/bacnet-stack/demo/handler/h_wp.c index 2bc79a60..d9ec1f31 100644 --- a/bacnet-stack/demo/handler/h_wp.c +++ b/bacnet-stack/demo/handler/h_wp.c @@ -44,6 +44,7 @@ #include "bo.h" #include "bv.h" #include "lsp.h" +#include "mso.h" #if BACFILE #include "bacfile.h" #endif @@ -200,6 +201,23 @@ void handler_write_property(uint8_t * service_request, fprintf(stderr, "Sending Write Access Error for LSP!\n"); } break; + case OBJECT_MULTI_STATE_OUTPUT: + if (Multistate_Output_Write_Property(&wp_data, &error_class, + &error_code)) { + pdu_len += + encode_simple_ack(&Handler_Transmit_Buffer[pdu_len], + service_data->invoke_id, + SERVICE_CONFIRMED_WRITE_PROPERTY); + fprintf(stderr, "Sending Write Property Simple Ack for MSO!\n"); + } else { + pdu_len += + bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len], + service_data->invoke_id, + SERVICE_CONFIRMED_WRITE_PROPERTY, error_class, + error_code); + fprintf(stderr, "Sending Write Access Error for MSO!\n"); + } + break; #if BACFILE case OBJECT_FILE: if (bacfile_write_property(&wp_data, &error_class, diff --git a/bacnet-stack/demo/object/bo.c b/bacnet-stack/demo/object/bo.c index 4d40e04b..2e89dce5 100644 --- a/bacnet-stack/demo/object/bo.c +++ b/bacnet-stack/demo/object/bo.c @@ -290,7 +290,7 @@ bool Binary_Output_Write_Property(BACNET_WRITE_PROPERTY_DATA * wp_data, if (priority && (priority <= BACNET_MAX_PRIORITY) && (priority != 6 /* reserved */ ) && (wp_data->value.type.Enumerated >= MIN_BINARY_PV) && - (wp_data->value.type.Real <= MAX_BINARY_PV)) { + (wp_data->value.type.Enumerated <= MAX_BINARY_PV)) { level = wp_data->value.type.Enumerated; object_index = Binary_Output_Instance_To_Index(wp_data-> diff --git a/bacnet-stack/demo/object/bv.c b/bacnet-stack/demo/object/bv.c index f3d8b42c..04da5950 100644 --- a/bacnet-stack/demo/object/bv.c +++ b/bacnet-stack/demo/object/bv.c @@ -290,7 +290,7 @@ bool Binary_Value_Write_Property(BACNET_WRITE_PROPERTY_DATA * wp_data, if (priority && (priority <= BACNET_MAX_PRIORITY) && (priority != 6 /* reserved */ ) && (wp_data->value.type.Enumerated >= MIN_BINARY_PV) && - (wp_data->value.type.Real <= MAX_BINARY_PV)) { + (wp_data->value.type.Enumerated <= MAX_BINARY_PV)) { level = wp_data->value.type.Enumerated; object_index = Binary_Value_Instance_To_Index(wp_data-> diff --git a/bacnet-stack/demo/object/device.c b/bacnet-stack/demo/object/device.c index b0f8c62b..d98b854e 100644 --- a/bacnet-stack/demo/object/device.c +++ b/bacnet-stack/demo/object/device.c @@ -38,6 +38,7 @@ #include "bo.h" /* object list dependency */ #include "bv.h" /* object list dependency */ #include "lsp.h" /* object list dependency */ +#include "mso.h" /* object list dependency */ #include "wp.h" /* write property handling */ #include "device.h" /* me */ #if BACFILE @@ -329,6 +330,7 @@ unsigned Device_Object_List_Count(void) count += Analog_Output_Count(); count += Analog_Value_Count(); count += Life_Safety_Point_Count(); + count += Multistate_Output_Count(); #if BACFILE count += bacfile_count(); #endif @@ -425,6 +427,19 @@ bool Device_Object_List_Identifier(unsigned array_index, status = true; } } + /* multi-state output objects */ + if (!status) { + /* normalize the index since + we know it is not the previous objects */ + object_index -= object_count; + object_count = Multistate_Output_Count(); + /* is it a valid index for this object? */ + if (object_index < object_count) { + *object_type = OBJECT_MULTI_STATE_OUTPUT; + *instance = Multistate_Output_Index_To_Instance(object_index); + status = true; + } + } /* file objects */ #if BACFILE if (!status) { @@ -497,6 +512,9 @@ char *Device_Valid_Object_Id(int object_type, uint32_t object_instance) case OBJECT_LIFE_SAFETY_POINT: name = Life_Safety_Point_Name(object_instance); break; + case OBJECT_MULTI_STATE_OUTPUT: + name = Multistate_Output_Name(object_instance); + break; #if BACFILE case OBJECT_FILE: name = bacfile_name(object_instance); @@ -638,6 +656,8 @@ int Device_Encode_Property_APDU(uint8_t * apdu, bitstring_set_bit(&bit_string, OBJECT_BINARY_OUTPUT, true); if (Life_Safety_Point_Count()) bitstring_set_bit(&bit_string, OBJECT_LIFE_SAFETY_POINT, true); + if (Multistate_Output_Count()) + bitstring_set_bit(&bit_string, OBJECT_MULTI_STATE_OUTPUT, true); #if BACFILE if (bacfile_count()) bitstring_set_bit(&bit_string, OBJECT_FILE, true); @@ -972,6 +992,22 @@ uint32_t Life_Safety_Point_Index_To_Instance(unsigned index) return index; } +char *Multistate_Output_Name(uint32_t object_instance) +{ + (void) object_instance; + return ""; +} + +unsigned Multistate_Output_Count(void) +{ + return 0; +} + +uint32_t Multistate_Output_Index_To_Instance(unsigned index) +{ + return index; +} + uint32_t bacfile_count(void) { return 0; diff --git a/bacnet-stack/demo/object/mso.c b/bacnet-stack/demo/object/mso.c new file mode 100644 index 00000000..202b3de5 --- /dev/null +++ b/bacnet-stack/demo/object/mso.c @@ -0,0 +1,419 @@ +/************************************************************************** +* +* Copyright (C) 2006 Steve Karg +* +* Permission is hereby granted, free of charge, to any person obtaining +* a copy of this software and associated documentation files (the +* "Software"), to deal in the Software without restriction, including +* without limitation the rights to use, copy, modify, merge, publish, +* distribute, sublicense, and/or sell copies of the Software, and to +* permit persons to whom the Software is furnished to do so, subject to +* the following conditions: +* +* The above copyright notice and this permission notice shall be included +* in all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +* +*********************************************************************/ + +/* Multi-state Output Objects - customize for your use */ + +#include +#include +#include +#include "bacdef.h" +#include "bacdcode.h" +#include "bacenum.h" +#include "config.h" /* the custom stuff */ +#include "wp.h" + +#define MAX_MULTISTATE_OUTPUTS 4 + +/* When all the priorities are level null, the present value returns */ +/* the Relinquish Default value */ +#define MULTISTATE_RELINQUISH_DEFAULT 0 + +/* NULL part of the array */ +#define MULTISTATE_NULL (255) +/* how many states? 0-253 is 254 states */ +#define MULTISTATE_NUMBER_OF_STATES (254) +/* Here is our Priority Array.*/ +static uint8_t + Multistate_Output_Level[MAX_MULTISTATE_OUTPUTS][BACNET_MAX_PRIORITY]; +/* Writable out-of-service allows others to play with our Present Value */ +/* without changing the physical output */ +static bool Multistate_Output_Out_Of_Service[MAX_MULTISTATE_OUTPUTS]; + +void Multistate_Output_Init(void) +{ + unsigned i, j; + static bool initialized = false; + + if (!initialized) { + initialized = true; + + /* initialize all the analog output priority arrays to NULL */ + for (i = 0; i < MAX_MULTISTATE_OUTPUTS; i++) { + for (j = 0; j < BACNET_MAX_PRIORITY; j++) { + Multistate_Output_Level[i][j] = MULTISTATE_NULL; + } + } + } + + return; +} + +/* we simply have 0-n object instances. Yours might be */ +/* more complex, and then you need validate that the */ +/* given instance exists */ +bool Multistate_Output_Valid_Instance(uint32_t object_instance) +{ + if (object_instance < MAX_MULTISTATE_OUTPUTS) + return true; + + return false; +} + +/* we simply have 0-n object instances. Yours might be */ +/* more complex, and then count how many you have */ +unsigned Multistate_Output_Count(void) +{ + return MAX_MULTISTATE_OUTPUTS; +} + +/* we simply have 0-n object instances. Yours might be */ +/* more complex, and then you need to return the instance */ +/* that correlates to the correct index */ +uint32_t Multistate_Output_Index_To_Instance(unsigned index) +{ + return index; +} + +/* we simply have 0-n object instances. Yours might be */ +/* more complex, and then you need to return the index */ +/* that correlates to the correct instance number */ +unsigned Multistate_Output_Instance_To_Index(uint32_t object_instance) +{ + unsigned index = MAX_MULTISTATE_OUTPUTS; + + if (object_instance < MAX_MULTISTATE_OUTPUTS) + index = object_instance; + + return index; +} + +static uint32_t Multistate_Output_Present_Value(uint32_t + object_instance) +{ + uint32_t value = MULTISTATE_RELINQUISH_DEFAULT; + unsigned index = 0; + unsigned i = 0; + + Multistate_Output_Init(); + index = Multistate_Output_Instance_To_Index(object_instance); + if (index < MAX_MULTISTATE_OUTPUTS) { + for (i = 0; i < BACNET_MAX_PRIORITY; i++) { + if (Multistate_Output_Level[index][i] != MULTISTATE_NULL) { + value = Multistate_Output_Level[index][i]; + break; + } + } + } + + return value; +} + +/* note: the object name must be unique within this device */ +char *Multistate_Output_Name(uint32_t object_instance) +{ + static char text_string[32] = ""; /* okay for single thread */ + + if (object_instance < MAX_MULTISTATE_OUTPUTS) { + sprintf(text_string, "MULTISTATE OUTPUT %u", object_instance); + return text_string; + } + + return NULL; +} + +/* return apdu len, or -1 on error */ +int Multistate_Output_Encode_Property_APDU(uint8_t * apdu, + uint32_t object_instance, + BACNET_PROPERTY_ID property, + int32_t array_index, + BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code) +{ + int len = 0; + int apdu_len = 0; /* return value */ + BACNET_BIT_STRING bit_string; + BACNET_CHARACTER_STRING char_string; + uint32_t present_value = 0; + unsigned object_index = 0; + unsigned i = 0; + bool state = false; + + Multistate_Output_Init(); + switch (property) { + case PROP_OBJECT_IDENTIFIER: + apdu_len = encode_tagged_object_id(&apdu[0], OBJECT_MULTI_STATE_OUTPUT, + object_instance); + break; + /* note: Name and Description don't have to be the same. + You could make Description writable and different */ + case PROP_OBJECT_NAME: + case PROP_DESCRIPTION: + characterstring_init_ansi(&char_string, + Multistate_Output_Name(object_instance)); + apdu_len = encode_tagged_character_string(&apdu[0], &char_string); + break; + case PROP_OBJECT_TYPE: + apdu_len = + encode_tagged_enumerated(&apdu[0], OBJECT_MULTI_STATE_OUTPUT); + break; + case PROP_PRESENT_VALUE: + present_value = Multistate_Output_Present_Value(object_instance); + apdu_len = encode_tagged_unsigned(&apdu[0], present_value); + break; + case PROP_STATUS_FLAGS: + /* note: see the details in the standard on how to use these */ + bitstring_init(&bit_string); + bitstring_set_bit(&bit_string, STATUS_FLAG_IN_ALARM, false); + bitstring_set_bit(&bit_string, STATUS_FLAG_FAULT, false); + bitstring_set_bit(&bit_string, STATUS_FLAG_OVERRIDDEN, false); + bitstring_set_bit(&bit_string, STATUS_FLAG_OUT_OF_SERVICE, false); + apdu_len = encode_tagged_bitstring(&apdu[0], &bit_string); + break; + case PROP_EVENT_STATE: + /* note: see the details in the standard on how to use this */ + apdu_len = encode_tagged_enumerated(&apdu[0], EVENT_STATE_NORMAL); + break; + case PROP_OUT_OF_SERVICE: + object_index = Multistate_Output_Instance_To_Index(object_instance); + state = Multistate_Output_Out_Of_Service[object_index]; + apdu_len = encode_tagged_boolean(&apdu[0], state); + break; + case PROP_PRIORITY_ARRAY: + /* Array element zero is the number of elements in the array */ + if (array_index == BACNET_ARRAY_LENGTH_INDEX) + apdu_len = + encode_tagged_unsigned(&apdu[0], BACNET_MAX_PRIORITY); + /* if no index was specified, then try to encode the entire list */ + /* into one packet. */ + else if (array_index == BACNET_ARRAY_ALL) { + object_index = + Multistate_Output_Instance_To_Index(object_instance); + for (i = 0; i < BACNET_MAX_PRIORITY; i++) { + /* FIXME: check if we have room before adding it to APDU */ + if (Multistate_Output_Level[object_index][i] == MULTISTATE_NULL) + len = encode_tagged_null(&apdu[apdu_len]); + else { + present_value = Multistate_Output_Level[object_index][i]; + len = + encode_tagged_unsigned(&apdu[apdu_len], + present_value); + } + /* add it if we have room */ + if ((apdu_len + len) < MAX_APDU) + apdu_len += len; + else { + *error_class = ERROR_CLASS_SERVICES; + *error_code = ERROR_CODE_NO_SPACE_FOR_OBJECT; + apdu_len = -1; + break; + } + } + } else { + object_index = + Multistate_Output_Instance_To_Index(object_instance); + if (array_index <= BACNET_MAX_PRIORITY) { + if (Multistate_Output_Level[object_index][array_index] == + MULTISTATE_NULL) + len = encode_tagged_null(&apdu[apdu_len]); + else { + present_value = + Multistate_Output_Level[object_index][array_index]; + len = + encode_tagged_unsigned(&apdu[apdu_len], + present_value); + } + } else { + *error_class = ERROR_CLASS_PROPERTY; + *error_code = ERROR_CODE_INVALID_ARRAY_INDEX; + apdu_len = -1; + } + } + + break; + case PROP_RELINQUISH_DEFAULT: + present_value = MULTISTATE_RELINQUISH_DEFAULT; + apdu_len = encode_tagged_enumerated(&apdu[0], present_value); + break; + case PROP_NUMBER_OF_STATES: + apdu_len = encode_tagged_unsigned(&apdu[apdu_len], + MULTISTATE_NUMBER_OF_STATES); + break; + + default: + *error_class = ERROR_CLASS_PROPERTY; + *error_code = ERROR_CODE_UNKNOWN_PROPERTY; + apdu_len = -1; + break; + } + + return apdu_len; +} + +/* returns true if successful */ +bool Multistate_Output_Write_Property(BACNET_WRITE_PROPERTY_DATA * wp_data, + BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code) +{ + bool status = false; /* return value */ + unsigned int object_index = 0; + unsigned int priority = 0; + uint32_t level = 0; + + Multistate_Output_Init(); + if (!Multistate_Output_Valid_Instance(wp_data->object_instance)) { + *error_class = ERROR_CLASS_OBJECT; + *error_code = ERROR_CODE_UNKNOWN_OBJECT; + return false; + } + /* decode the some of the request */ + switch (wp_data->object_property) { + case PROP_PRESENT_VALUE: + if (wp_data->value.tag == BACNET_APPLICATION_TAG_UNSIGNED_INT) { + priority = wp_data->priority; + /* Command priority 6 is reserved for use by Minimum On/Off + algorithm and may not be used for other purposes in any + object. */ + if (priority && (priority <= BACNET_MAX_PRIORITY) && + (priority != 6 /* reserved */ ) && + (wp_data->value.type.Unsigned_Int <= MULTISTATE_NUMBER_OF_STATES)) { + level = wp_data->value.type.Unsigned_Int; + object_index = + Multistate_Output_Instance_To_Index(wp_data-> + object_instance); + priority--; + Multistate_Output_Level[object_index][priority] = level; + /* Note: you could set the physical output here if we + are the highest priority. + However, if Out of Service is TRUE, then don't set the + physical output. This comment may apply to the + main loop (i.e. check out of service before changing output) */ + status = true; + } else if (priority == 6) { + /* Command priority 6 is reserved for use by Minimum On/Off + algorithm and may not be used for other purposes in any + object. */ + *error_class = ERROR_CLASS_PROPERTY; + *error_code = ERROR_CODE_WRITE_ACCESS_DENIED; + } else { + *error_class = ERROR_CLASS_PROPERTY; + *error_code = ERROR_CODE_VALUE_OUT_OF_RANGE; + } + } else if (wp_data->value.tag == BACNET_APPLICATION_TAG_NULL) { + level = MULTISTATE_NULL; + object_index = + Multistate_Output_Instance_To_Index(wp_data->object_instance); + priority = wp_data->priority; + if (priority && (priority <= BACNET_MAX_PRIORITY)) { + priority--; + Multistate_Output_Level[object_index][priority] = level; + /* Note: you could set the physical output here to the next + highest priority, or to the relinquish default if no + priorities are set. + However, if Out of Service is TRUE, then don't set the + physical output. This comment may apply to the + main loop (i.e. check out of service before changing output) */ + status = true; + } else { + *error_class = ERROR_CLASS_PROPERTY; + *error_code = ERROR_CODE_VALUE_OUT_OF_RANGE; + } + } else { + *error_class = ERROR_CLASS_PROPERTY; + *error_code = ERROR_CODE_INVALID_DATA_TYPE; + } + break; + case PROP_OUT_OF_SERVICE: + if (wp_data->value.tag == BACNET_APPLICATION_TAG_BOOLEAN) { + object_index = + Multistate_Output_Instance_To_Index(wp_data->object_instance); + Multistate_Output_Out_Of_Service[object_index] = + wp_data->value.type.Boolean; + status = true; + } else { + *error_class = ERROR_CLASS_PROPERTY; + *error_code = ERROR_CODE_INVALID_DATA_TYPE; + } + break; + default: + *error_class = ERROR_CLASS_PROPERTY; + *error_code = ERROR_CODE_WRITE_ACCESS_DENIED; + break; + } + + return status; +} + + +#ifdef TEST +#include +#include +#include "ctest.h" + +void testMultistateOutput(Test * pTest) +{ + uint8_t apdu[MAX_APDU] = { 0 }; + int len = 0; + uint32_t len_value = 0; + uint8_t tag_number = 0; + BACNET_OBJECT_TYPE decoded_type = OBJECT_MULTI_STATE_OUTPUT; + uint32_t decoded_instance = 0; + uint32_t instance = 123; + BACNET_ERROR_CLASS error_class; + BACNET_ERROR_CODE error_code; + + + len = Multistate_Output_Encode_Property_APDU(&apdu[0], + instance, + PROP_OBJECT_IDENTIFIER, + BACNET_ARRAY_ALL, &error_class, &error_code); + ct_test(pTest, len != 0); + len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value); + ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_OBJECT_ID); + len = decode_object_id(&apdu[len], + (int *) &decoded_type, &decoded_instance); + ct_test(pTest, decoded_type == OBJECT_MULTI_STATE_OUTPUT); + ct_test(pTest, decoded_instance == instance); + + return; +} + +#ifdef TEST_MULTISTATE_OUTPUT +int main(void) +{ + Test *pTest; + bool rc; + + pTest = ct_create("BACnet Multi-state Output", NULL); + /* individual tests */ + rc = ct_addTestFunction(pTest, testMultistateOutput); + assert(rc); + + ct_setStream(pTest, stdout); + ct_run(pTest); + (void) ct_report(pTest); + ct_destroy(pTest); + + return 0; +} +#endif /* TEST_BINARY_INPUT */ +#endif /* TEST */ diff --git a/bacnet-stack/demo/object/mso.h b/bacnet-stack/demo/object/mso.h new file mode 100644 index 00000000..0bde669b --- /dev/null +++ b/bacnet-stack/demo/object/mso.h @@ -0,0 +1,60 @@ +/************************************************************************** +* +* Copyright (C) 2005 Steve Karg +* +* Permission is hereby granted, free of charge, to any person obtaining +* a copy of this software and associated documentation files (the +* "Software"), to deal in the Software without restriction, including +* without limitation the rights to use, copy, modify, merge, publish, +* distribute, sublicense, and/or sell copies of the Software, and to +* permit persons to whom the Software is furnished to do so, subject to +* the following conditions: +* +* The above copyright notice and this permission notice shall be included +* in all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +* +*********************************************************************/ +#ifndef MSO_H +#define MSO_H + +#include +#include +#include "bacdef.h" +#include "bacerror.h" +#include "wp.h" + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + + bool Multistate_Output_Valid_Instance(uint32_t object_instance); + unsigned Multistate_Output_Count(void); + uint32_t Multistate_Output_Index_To_Instance(unsigned index); + char *Multistate_Output_Name(uint32_t object_instance); + + int Multistate_Output_Encode_Property_APDU(uint8_t * apdu, + uint32_t object_instance, + BACNET_PROPERTY_ID property, + int32_t array_index, + BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code); + + bool Multistate_Output_Write_Property(BACNET_WRITE_PROPERTY_DATA * wp_data, + BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code); + +#ifdef TEST +#include "ctest.h" + void testMultistateOutput(Test * pTest); +#endif + +#ifdef __cplusplus +} +#endif /* __cplusplus */ +#endif diff --git a/bacnet-stack/demo/object/mso.mak b/bacnet-stack/demo/object/mso.mak new file mode 100644 index 00000000..52b34401 --- /dev/null +++ b/bacnet-stack/demo/object/mso.mak @@ -0,0 +1,35 @@ +#Makefile to build test case +CC = gcc +BASEDIR = . +#CFLAGS = -Wall -I. +# -g for debugging with gdb +#CFLAGS = -Wall -I. -g +CFLAGS = -Wall -I. -Itest -DTEST -DTEST_MULTISTATE_OUTPUT -g + +# NOTE: this file is normally called by the unittest.sh from up directory +SRCS = bacdcode.c \ + bacstr.c \ + bigend.c \ + demo/object/mso.c \ + test/ctest.c + +OBJS = ${SRCS:.c=.o} + +TARGET = multistate_output + +all: ${TARGET} + +${TARGET}: ${OBJS} + ${CC} -o $@ ${OBJS} + +.c.o: + ${CC} -c ${CFLAGS} $*.c -o $@ + +depend: + rm -f .depend + ${CC} -MM ${CFLAGS} *.c >> .depend + +clean: + rm -rf core ${TARGET} $(OBJS) *.bak *.1 *.ini + +include: .depend diff --git a/bacnet-stack/demo/readfile/Makefile b/bacnet-stack/demo/readfile/Makefile index e7ce5089..b6e1610c 100644 --- a/bacnet-stack/demo/readfile/Makefile +++ b/bacnet-stack/demo/readfile/Makefile @@ -49,6 +49,7 @@ SRCS = readfile.c \ $(BACNET_OBJECT)/bo.c \ $(BACNET_OBJECT)/bv.c \ $(BACNET_OBJECT)/lsp.c \ + $(BACNET_OBJECT)/mso.c \ $(BACNET_OBJECT)/bacfile.c \ $(BACNET_ROOT)/arf.c \ $(BACNET_ROOT)/dcc.c \ diff --git a/bacnet-stack/demo/readfile/makefile.b32 b/bacnet-stack/demo/readfile/makefile.b32 index afb886a0..04a03346 100644 --- a/bacnet-stack/demo/readfile/makefile.b32 +++ b/bacnet-stack/demo/readfile/makefile.b32 @@ -47,6 +47,7 @@ SRCS = readfile.c \ ..\..\demo\object\bo.c \ ..\..\demo\object\bv.c \ ..\..\demo\object\lsp.c \ + ..\..\demo\object\mso.c \ ..\..\datalink.c \ ..\..\tsm.c \ ..\..\address.c \ diff --git a/bacnet-stack/demo/readprop/Makefile b/bacnet-stack/demo/readprop/Makefile index fdff15c8..107207e3 100644 --- a/bacnet-stack/demo/readprop/Makefile +++ b/bacnet-stack/demo/readprop/Makefile @@ -39,6 +39,7 @@ SRCS = readprop.c \ $(BACNET_OBJECT)/bo.c \ $(BACNET_OBJECT)/bv.c \ $(BACNET_OBJECT)/lsp.c \ + $(BACNET_OBJECT)/mso.c \ $(BACNET_OBJECT)/bacfile.c \ $(BACNET_ROOT)/filename.c \ $(BACNET_ROOT)/rp.c \ diff --git a/bacnet-stack/demo/readprop/makefile.b32 b/bacnet-stack/demo/readprop/makefile.b32 index 8ea3c40f..44f88cf0 100644 --- a/bacnet-stack/demo/readprop/makefile.b32 +++ b/bacnet-stack/demo/readprop/makefile.b32 @@ -51,6 +51,7 @@ SRCS = readprop.c \ ..\..\demo\object\bo.c \ ..\..\demo\object\bv.c \ ..\..\demo\object\lsp.c \ + ..\..\demo\object\mso.c \ ..\..\datalink.c \ ..\..\tsm.c \ ..\..\address.c \ diff --git a/bacnet-stack/demo/reinit/Makefile b/bacnet-stack/demo/reinit/Makefile index 5eb06334..adb7c41e 100644 --- a/bacnet-stack/demo/reinit/Makefile +++ b/bacnet-stack/demo/reinit/Makefile @@ -39,6 +39,7 @@ SRCS = main.c \ $(BACNET_OBJECT)/bo.c \ $(BACNET_OBJECT)/bv.c \ $(BACNET_OBJECT)/lsp.c \ + $(BACNET_OBJECT)/mso.c \ $(BACNET_OBJECT)/bacfile.c \ $(BACNET_ROOT)/filename.c \ $(BACNET_ROOT)/rp.c \ diff --git a/bacnet-stack/demo/reinit/makefile.b32 b/bacnet-stack/demo/reinit/makefile.b32 index b2ef0ce5..c32d9d48 100644 --- a/bacnet-stack/demo/reinit/makefile.b32 +++ b/bacnet-stack/demo/reinit/makefile.b32 @@ -51,6 +51,7 @@ SRCS = main.c \ ..\..\demo\object\bo.c \ ..\..\demo\object\bv.c \ ..\..\demo\object\lsp.c \ + ..\..\demo\object\mso.c \ ..\..\datalink.c \ ..\..\tsm.c \ ..\..\address.c \ diff --git a/bacnet-stack/demo/server/Makefile b/bacnet-stack/demo/server/Makefile index edec668c..67a2e10a 100644 --- a/bacnet-stack/demo/server/Makefile +++ b/bacnet-stack/demo/server/Makefile @@ -42,6 +42,7 @@ SRCS = server.c \ $(BACNET_OBJECT)/bo.c \ $(BACNET_OBJECT)/bv.c \ $(BACNET_OBJECT)/lsp.c \ + $(BACNET_OBJECT)/mso.c \ $(BACNET_OBJECT)/bacfile.c \ $(BACNET_ROOT)/datalink.c \ $(BACNET_ROOT)/filename.c \ diff --git a/bacnet-stack/demo/server/makefile.b32 b/bacnet-stack/demo/server/makefile.b32 index 50153c7a..beaca43e 100644 --- a/bacnet-stack/demo/server/makefile.b32 +++ b/bacnet-stack/demo/server/makefile.b32 @@ -59,6 +59,7 @@ SRCS = server.c \ ..\..\demo\object\bo.c \ ..\..\demo\object\bv.c \ ..\..\demo\object\lsp.c \ + ..\..\demo\object\mso.c \ ..\..\datalink.c \ ..\..\abort.c \ ..\..\reject.c \ diff --git a/bacnet-stack/demo/timesync/Makefile b/bacnet-stack/demo/timesync/Makefile index 11c84354..1ab630eb 100644 --- a/bacnet-stack/demo/timesync/Makefile +++ b/bacnet-stack/demo/timesync/Makefile @@ -39,6 +39,7 @@ SRCS = main.c \ $(BACNET_OBJECT)/bo.c \ $(BACNET_OBJECT)/bv.c \ $(BACNET_OBJECT)/lsp.c \ + $(BACNET_OBJECT)/mso.c \ $(BACNET_OBJECT)/bacfile.c \ $(BACNET_ROOT)/filename.c \ $(BACNET_ROOT)/rp.c \ diff --git a/bacnet-stack/demo/timesync/makefile.b32 b/bacnet-stack/demo/timesync/makefile.b32 index a5f127a0..0c5f7409 100644 --- a/bacnet-stack/demo/timesync/makefile.b32 +++ b/bacnet-stack/demo/timesync/makefile.b32 @@ -41,6 +41,7 @@ SRCS = main.c \ $(BACNET_OBJECT)\bo.c \ $(BACNET_OBJECT)\bv.c \ $(BACNET_OBJECT)\lsp.c \ + $(BACNET_OBJECT)\mso.c \ $(BACNET_ROOT)\address.c \ $(BACNET_ROOT)\filename.c \ $(BACNET_ROOT)\bacdcode.c \ diff --git a/bacnet-stack/demo/ucov/Makefile b/bacnet-stack/demo/ucov/Makefile index 4a449e89..cca9efc0 100644 --- a/bacnet-stack/demo/ucov/Makefile +++ b/bacnet-stack/demo/ucov/Makefile @@ -36,6 +36,7 @@ SRCS = main.c \ $(BACNET_OBJECT)/bo.c \ $(BACNET_OBJECT)/bv.c \ $(BACNET_OBJECT)/lsp.c \ + $(BACNET_OBJECT)/mso.c \ $(BACNET_OBJECT)/bacfile.c \ $(BACNET_ROOT)/filename.c \ $(BACNET_ROOT)/rp.c \ diff --git a/bacnet-stack/demo/ucov/makefile.b32 b/bacnet-stack/demo/ucov/makefile.b32 index 0d5cf24a..815614ad 100644 --- a/bacnet-stack/demo/ucov/makefile.b32 +++ b/bacnet-stack/demo/ucov/makefile.b32 @@ -49,6 +49,7 @@ SRCS = main.c \ ..\..\demo\object\bo.c \ ..\..\demo\object\bv.c \ ..\..\demo\object\lsp.c \ + ..\..\demo\object\mso.c \ ..\..\datalink.c \ ..\..\address.c \ ..\..\abort.c \ diff --git a/bacnet-stack/demo/whohas/Makefile b/bacnet-stack/demo/whohas/Makefile index 79e233f6..34b34b2f 100644 --- a/bacnet-stack/demo/whohas/Makefile +++ b/bacnet-stack/demo/whohas/Makefile @@ -39,6 +39,7 @@ SRCS = main.c \ $(BACNET_OBJECT)/bo.c \ $(BACNET_OBJECT)/bv.c \ $(BACNET_OBJECT)/lsp.c \ + $(BACNET_OBJECT)/mso.c \ $(BACNET_OBJECT)/bacfile.c \ $(BACNET_ROOT)/filename.c \ $(BACNET_ROOT)/rp.c \ diff --git a/bacnet-stack/demo/whohas/makefile.b32 b/bacnet-stack/demo/whohas/makefile.b32 index e6e82447..f437a038 100644 --- a/bacnet-stack/demo/whohas/makefile.b32 +++ b/bacnet-stack/demo/whohas/makefile.b32 @@ -53,6 +53,7 @@ SRCS = main.c \ ..\..\demo\object\bo.c \ ..\..\demo\object\bv.c \ ..\..\demo\object\lsp.c \ + ..\..\demo\object\mso.c \ ..\..\datalink.c \ ..\..\abort.c \ ..\..\reject.c \ diff --git a/bacnet-stack/demo/whois/Makefile b/bacnet-stack/demo/whois/Makefile index e1d64430..4ccdf54f 100644 --- a/bacnet-stack/demo/whois/Makefile +++ b/bacnet-stack/demo/whois/Makefile @@ -40,6 +40,7 @@ SRCS = main.c \ $(BACNET_OBJECT)/bo.c \ $(BACNET_OBJECT)/bv.c \ $(BACNET_OBJECT)/lsp.c \ + $(BACNET_OBJECT)/mso.c \ $(BACNET_OBJECT)/bacfile.c \ $(BACNET_ROOT)/filename.c \ $(BACNET_ROOT)/rp.c \ diff --git a/bacnet-stack/demo/whois/makefile.b32 b/bacnet-stack/demo/whois/makefile.b32 index 55bfa926..1a370ea0 100644 --- a/bacnet-stack/demo/whois/makefile.b32 +++ b/bacnet-stack/demo/whois/makefile.b32 @@ -40,6 +40,7 @@ SRCS = main.c \ $(BACNET_OBJECT)\bo.c \ $(BACNET_OBJECT)\bv.c \ $(BACNET_OBJECT)\lsp.c \ + $(BACNET_OBJECT)\mso.c \ $(BACNET_ROOT)\address.c \ $(BACNET_ROOT)\filename.c \ $(BACNET_ROOT)\bacdcode.c \ diff --git a/bacnet-stack/demo/writefile/Makefile b/bacnet-stack/demo/writefile/Makefile index 09e22e22..04fa37e5 100644 --- a/bacnet-stack/demo/writefile/Makefile +++ b/bacnet-stack/demo/writefile/Makefile @@ -49,6 +49,7 @@ SRCS = writefile.c \ $(BACNET_OBJECT)/bo.c \ $(BACNET_OBJECT)/bv.c \ $(BACNET_OBJECT)/lsp.c \ + $(BACNET_OBJECT)/mso.c \ $(BACNET_OBJECT)/bacfile.c \ $(BACNET_ROOT)/arf.c \ $(BACNET_ROOT)/awf.c \ diff --git a/bacnet-stack/demo/writefile/makefile.b32 b/bacnet-stack/demo/writefile/makefile.b32 index f9e6120a..bda9260f 100644 --- a/bacnet-stack/demo/writefile/makefile.b32 +++ b/bacnet-stack/demo/writefile/makefile.b32 @@ -47,6 +47,7 @@ SRCS = writefile.c \ ..\..\demo\object\bo.c \ ..\..\demo\object\bv.c \ ..\..\demo\object\lsp.c \ + ..\..\demo\object\mso.c \ ..\..\datalink.c \ ..\..\tsm.c \ ..\..\address.c \ diff --git a/bacnet-stack/demo/writeprop/Makefile b/bacnet-stack/demo/writeprop/Makefile index b95749fd..5cb8e901 100644 --- a/bacnet-stack/demo/writeprop/Makefile +++ b/bacnet-stack/demo/writeprop/Makefile @@ -38,6 +38,7 @@ SRCS = writeprop.c \ $(BACNET_OBJECT)/bo.c \ $(BACNET_OBJECT)/bv.c \ $(BACNET_OBJECT)/lsp.c \ + $(BACNET_OBJECT)/mso.c \ $(BACNET_OBJECT)/bacfile.c \ $(BACNET_ROOT)/filename.c \ $(BACNET_ROOT)/rp.c \ diff --git a/bacnet-stack/demo/writeprop/makefile.b32 b/bacnet-stack/demo/writeprop/makefile.b32 index 0192a5d5..bbc0f99d 100644 --- a/bacnet-stack/demo/writeprop/makefile.b32 +++ b/bacnet-stack/demo/writeprop/makefile.b32 @@ -50,6 +50,7 @@ SRCS = writeprop.c \ ..\..\demo\object\bo.c \ ..\..\demo\object\bv.c \ ..\..\demo\object\lsp.c \ + ..\..\demo\object\mso.c \ ..\..\datalink.c \ ..\..\tsm.c \ ..\..\address.c \ diff --git a/bacnet-stack/ports/win32/MAKEFILE.MAK b/bacnet-stack/ports/win32/MAKEFILE.MAK index 94f82341..cd10e291 100644 --- a/bacnet-stack/ports/win32/MAKEFILE.MAK +++ b/bacnet-stack/ports/win32/MAKEFILE.MAK @@ -50,6 +50,7 @@ SRCS = main.c bip-init.c \ ..\..\demo\object\bo.c \ ..\..\demo\object\bv.c \ ..\..\demo\object\lsp.c \ + ..\..\demo\object\mso.c \ ..\..\datalink.c \ ..\..\tsm.c \ ..\..\address.c \