Added makefile for building unit tests for OctetString Value object example.

Added Positive Integer Value and makefile for building unit tests.
Added OctetString Value and Positive Integer Value to unit test make file.
Thank you, Nikola Jelić!

bacnet-stack/demo/object/osv.mak

@@ -0,0 +1,43 @@
+#Makefile to build test case
+CC      = gcc
+SRC_DIR = ../../src
+TEST_DIR = ../../test
+INCLUDES = -I../../include -I$(TEST_DIR) -I.
+DEFINES = -DBIG_ENDIAN=0 -DTEST -DBACAPP_ALL -DBACNET_PROPERTY_LISTS -DTEST_OCTETSTRING_VALUE
+
+CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
+
+SRCS = osv.c \
+	$(SRC_DIR)/bacdcode.c \
+	$(SRC_DIR)/bacint.c \
+	$(SRC_DIR)/bacstr.c \
+	$(SRC_DIR)/bacreal.c \
+	$(SRC_DIR)/bacdevobjpropref.c \
+	$(SRC_DIR)/datetime.c \
+	$(SRC_DIR)/proplist.c \
+	$(SRC_DIR)/lighting.c \
+	$(SRC_DIR)/bacapp.c \
+	$(SRC_DIR)/bactext.c \
+	$(SRC_DIR)/indtext.c \
+	$(TEST_DIR)/ctest.c
+
+TARGET = octetstring_value
+
+all: ${TARGET}
+ 
+OBJS = ${SRCS:.c=.o}
+
+${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)
+
+include: .depend

bacnet-stack/demo/object/piv.c

@@ -0,0 +1,439 @@
+/**************************************************************************
+*
+* Copyright (C) 2015 Nikola Jelic <nikola.jelic@euroicc.com>
+*
+* 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.
+*
+*********************************************************************/
+
+/* Positiveinteger Value Objects - customize for your use */
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "bacdef.h"
+#include "bacdcode.h"
+#include "bacenum.h"
+#include "bacapp.h"
+#include "bactext.h"
+#include "config.h"     /* the custom stuff */
+#include "device.h"
+#include "handlers.h"
+#include "piv.h"
+
+
+#ifndef MAX_POSITIVEINTEGER_VALUES
+#define MAX_POSITIVEINTEGER_VALUES 4
+#endif
+
+POSITIVEINTEGER_VALUE_DESCR PIV_Descr[MAX_POSITIVEINTEGER_VALUES];
+
+/* These three arrays are used by the ReadPropertyMultiple handler */
+static const int Positiveinteger_Value_Properties_Required[] = {
+    PROP_OBJECT_IDENTIFIER,
+    PROP_OBJECT_NAME,
+    PROP_OBJECT_TYPE,
+    PROP_PRESENT_VALUE,
+    PROP_STATUS_FLAGS,
+    PROP_UNITS
+    -1
+};
+
+static const int Positiveinteger_Value_Properties_Optional[] = {
+    PROP_OUT_OF_SERVICE,
+    -1
+};
+
+static const int Positiveinteger_Value_Properties_Proprietary[] = {
+    -1
+};
+
+void Positiveinteger_Value_Property_Lists(
+    const int **pRequired,
+    const int **pOptional,
+    const int **pProprietary)
+{
+    if (pRequired)
+        *pRequired = Positiveinteger_Value_Properties_Required;
+    if (pOptional)
+        *pOptional = Positiveinteger_Value_Properties_Optional;
+    if (pProprietary)
+        *pProprietary = Positiveinteger_Value_Properties_Proprietary;
+
+    return;
+}
+
+void Positiveinteger_Value_Init(
+    void)
+{
+	unsigned i;
+
+    for (i = 0; i < MAX_POSITIVEINTEGER_VALUES; i++) {
+        memset(&PIV_Descr[i], 0x00, sizeof(POSITIVEINTEGER_VALUE_DESCR));
+    }
+}
+
+/* we simply have 0-n object instances.  Yours might be */
+/* more complex, and then you need validate that the */
+/* given instance exists */
+bool Positiveinteger_Value_Valid_Instance(
+    uint32_t object_instance)
+{
+    if (object_instance < MAX_POSITIVEINTEGER_VALUES)
+        return true;
+
+    return false;
+}
+
+/* we simply have 0-n object instances.  Yours might be */
+/* more complex, and then count how many you have */
+unsigned Positiveinteger_Value_Count(
+    void)
+{
+    return MAX_POSITIVEINTEGER_VALUES;
+}
+
+/* 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 Positiveinteger_Value_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 Positiveinteger_Value_Instance_To_Index(
+    uint32_t object_instance)
+{
+    unsigned index = MAX_POSITIVEINTEGER_VALUES;
+
+    if (object_instance < MAX_POSITIVEINTEGER_VALUES)
+        index = object_instance;
+
+    return index;
+}
+
+/**
+ * For a given object instance-number, sets the present-value at a given
+ * priority 1..16.
+ *
+ * @param  object_instance - object-instance number of the object
+ * @param  value - positiveinteger value
+ * @param  priority - priority 1..16
+ *
+ * @return  true if values are within range and present-value is set.
+ */
+bool Positiveinteger_Value_Present_Value_Set(
+    uint32_t object_instance,
+    uint32_t value,
+    uint8_t priority)
+{
+    unsigned index = 0;
+    bool status = false;
+
+    index = Positiveinteger_Value_Instance_To_Index(object_instance);
+    if (index < MAX_POSITIVEINTEGER_VALUES) {
+      PIV_Descr[index].Present_Value = value;
+      status = true;
+    }
+    return status;
+}
+
+uint32_t Positiveinteger_Value_Present_Value(
+    uint32_t object_instance)
+{
+    uint32_t value = 0;
+    unsigned index = 0;
+
+    index = Positiveinteger_Value_Instance_To_Index(object_instance);
+    if (index < MAX_POSITIVEINTEGER_VALUES) {
+        value = PIV_Descr[index].Present_Value;
+    }
+
+    return value;
+}
+
+/* note: the object name must be unique within this device */
+bool Positiveinteger_Value_Object_Name(
+    uint32_t object_instance,
+    BACNET_CHARACTER_STRING * object_name)
+{
+    static char text_string[32] = "";   /* okay for single thread */
+    bool status = false;
+
+    if (object_instance < MAX_POSITIVEINTEGER_VALUES) {
+        sprintf(text_string, "POSITIVEINTEGER VALUE %lu",
+            (unsigned long) object_instance);
+        status = characterstring_init_ansi(object_name, text_string);
+    }
+
+    return status;
+}
+
+/* return apdu len, or BACNET_STATUS_ERROR on error */
+int Positiveinteger_Value_Read_Property(
+    BACNET_READ_PROPERTY_DATA * rpdata)
+{
+    int apdu_len = 0;   /* return value */
+    BACNET_BIT_STRING bit_string;
+    BACNET_CHARACTER_STRING char_string;
+    unsigned object_index = 0;
+    bool state = false;
+    uint8_t *apdu = NULL;
+    POSITIVEINTEGER_VALUE_DESCR *CurrentAV;
+
+    if ((rpdata == NULL) || (rpdata->application_data == NULL) ||
+        (rpdata->application_data_len == 0)) {
+        return 0;
+    }
+
+    apdu = rpdata->application_data;
+
+    object_index = Positiveinteger_Value_Instance_To_Index(rpdata->object_instance);
+    if (object_index < MAX_POSITIVEINTEGER_VALUES)
+        CurrentAV = &PIV_Descr[object_index];
+    else
+        return BACNET_STATUS_ERROR;
+
+    switch (rpdata->object_property) {
+        case PROP_OBJECT_IDENTIFIER:
+            apdu_len =
+                encode_application_object_id(&apdu[0], OBJECT_POSITIVE_INTEGER_VALUE,
+                rpdata->object_instance);
+            break;
+
+        case PROP_OBJECT_NAME:
+            Positiveinteger_Value_Object_Name(rpdata->object_instance, &char_string);
+            apdu_len =
+                encode_application_character_string(&apdu[0], &char_string);
+            break;
+
+        case PROP_OBJECT_TYPE:
+            apdu_len =
+                encode_application_enumerated(&apdu[0], OBJECT_POSITIVE_INTEGER_VALUE);
+            break;
+
+        case PROP_PRESENT_VALUE:
+            apdu_len = encode_application_unsigned(&apdu[0], Positiveinteger_Value_Present_Value(rpdata->object_instance));
+            break;
+
+        case PROP_STATUS_FLAGS:
+            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,
+                CurrentAV->Out_Of_Service);
+
+            apdu_len = encode_application_bitstring(&apdu[0], &bit_string);
+            break;
+
+        case PROP_UNITS:
+	  apdu_len = encode_application_enumerated(&apdu[0], CurrentAV->Units);
+	    
+        case PROP_OUT_OF_SERVICE:
+            state = CurrentAV->Out_Of_Service;
+            apdu_len = encode_application_boolean(&apdu[0], state);
+            break;
+        default:
+            rpdata->error_class = ERROR_CLASS_PROPERTY;
+            rpdata->error_code = ERROR_CODE_UNKNOWN_PROPERTY;
+            apdu_len = BACNET_STATUS_ERROR;
+            break;
+    }
+    /*  only array properties can have array options */
+    if ((apdu_len >= 0) && (rpdata->object_property != PROP_PRIORITY_ARRAY) &&
+        (rpdata->object_property != PROP_EVENT_TIME_STAMPS) &&
+        (rpdata->array_index != BACNET_ARRAY_ALL)) {
+        rpdata->error_class = ERROR_CLASS_PROPERTY;
+        rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
+        apdu_len = BACNET_STATUS_ERROR;
+    }
+
+    return apdu_len;
+}
+
+/* returns true if successful */
+bool Positiveinteger_Value_Write_Property(
+    BACNET_WRITE_PROPERTY_DATA * wp_data)
+{
+    bool status = false;        /* return value */
+    unsigned int object_index = 0;
+    int len = 0;
+    BACNET_APPLICATION_DATA_VALUE value;
+    POSITIVEINTEGER_VALUE_DESCR *CurrentAV;
+
+    /* decode the some of the request */
+    len =
+        bacapp_decode_application_data(wp_data->application_data,
+        wp_data->application_data_len, &value);
+    /* FIXME: len < application_data_len: more data? */
+    if (len < 0) {
+        /* error while decoding - a value larger than we can handle */
+        wp_data->error_class = ERROR_CLASS_PROPERTY;
+        wp_data->error_code = ERROR_CODE_VALUE_OUT_OF_RANGE;
+        return false;
+    }
+    if ((wp_data->object_property != PROP_PRIORITY_ARRAY) &&
+        (wp_data->object_property != PROP_EVENT_TIME_STAMPS) &&
+        (wp_data->array_index != BACNET_ARRAY_ALL)) {
+        /*  only array properties can have array options */
+        wp_data->error_class = ERROR_CLASS_PROPERTY;
+        wp_data->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
+        return false;
+    }
+    object_index = Positiveinteger_Value_Instance_To_Index(wp_data->object_instance);
+    if (object_index < MAX_POSITIVEINTEGER_VALUES)
+        CurrentAV = &PIV_Descr[object_index];
+    else
+        return false;
+
+    switch (wp_data->object_property) {
+        case PROP_PRESENT_VALUE:
+            if (value.tag == BACNET_APPLICATION_TAG_UNSIGNED_INT) {
+                /* Command priority 6 is reserved for use by Minimum On/Off
+                   algorithm and may not be used for other purposes in any
+                   object. */
+                if (Positiveinteger_Value_Present_Value_Set(wp_data->object_instance,
+                        value.type.Unsigned_Int, wp_data->priority)) {
+                    status = true;
+                } else if (wp_data->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. */
+                    wp_data->error_class = ERROR_CLASS_PROPERTY;
+                    wp_data->error_code = ERROR_CODE_WRITE_ACCESS_DENIED;
+                } else {
+                    wp_data->error_class = ERROR_CLASS_PROPERTY;
+                    wp_data->error_code = ERROR_CODE_VALUE_OUT_OF_RANGE;
+                }
+            } else {
+                status = false;
+                wp_data->error_class = ERROR_CLASS_PROPERTY;
+                wp_data->error_code = ERROR_CODE_VALUE_OUT_OF_RANGE;
+            }
+            break;
+
+        case PROP_OUT_OF_SERVICE:
+            status =
+                WPValidateArgType(&value, BACNET_APPLICATION_TAG_BOOLEAN,
+                &wp_data->error_class, &wp_data->error_code);
+            if (status) {
+                CurrentAV->Out_Of_Service = value.type.Boolean;
+            }
+            break;
+
+        case PROP_OBJECT_IDENTIFIER:
+        case PROP_OBJECT_NAME:
+        case PROP_OBJECT_TYPE:
+        case PROP_STATUS_FLAGS:
+        case PROP_UNITS:
+            wp_data->error_class = ERROR_CLASS_PROPERTY;
+            wp_data->error_code = ERROR_CODE_WRITE_ACCESS_DENIED;
+            break;
+        default:
+            wp_data->error_class = ERROR_CLASS_PROPERTY;
+            wp_data->error_code = ERROR_CODE_UNKNOWN_PROPERTY;
+            break;
+    }
+
+    return status;
+}
+
+
+void Positiveinteger_Value_Intrinsic_Reporting(
+    uint32_t object_instance)
+{
+}
+
+#ifdef TEST
+#include <assert.h>
+#include <string.h>
+#include "ctest.h"
+
+bool WPValidateArgType(
+    BACNET_APPLICATION_DATA_VALUE * pValue,
+    uint8_t ucExpectedTag,
+    BACNET_ERROR_CLASS * pErrorClass,
+    BACNET_ERROR_CODE * pErrorCode)
+{
+    pValue = pValue;
+    ucExpectedTag = ucExpectedTag;
+    pErrorClass = pErrorClass;
+    pErrorCode = pErrorCode;
+
+    return false;
+}
+
+void testPositiveinteger_Value(
+    Test * pTest)
+{
+    BACNET_READ_PROPERTY_DATA rpdata;
+    uint8_t apdu[MAX_APDU] = { 0 };
+    int len = 0;
+    uint32_t len_value = 0;
+    uint8_t tag_number = 0;
+    uint16_t decoded_type = 0;
+    uint32_t decoded_instance = 0;
+
+    Positiveinteger_Value_Init();
+    rpdata.application_data = &apdu[0];
+    rpdata.application_data_len = sizeof(apdu);
+    rpdata.object_type = OBJECT_POSITIVE_INTEGER_VALUE;
+    rpdata.object_instance = 1;
+    rpdata.object_property = PROP_OBJECT_IDENTIFIER;
+    rpdata.array_index = BACNET_ARRAY_ALL;
+    len = Positiveinteger_Value_Read_Property(&rpdata);
+    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], &decoded_type, &decoded_instance);
+    ct_test(pTest, decoded_type == rpdata.object_type);
+    ct_test(pTest, decoded_instance == rpdata.object_instance);
+
+    return;
+}
+
+#ifdef TEST_POSITIVEINTEGER_VALUE
+int main(
+    void)
+{
+    Test *pTest;
+    bool rc;
+
+    pTest = ct_create("BACnet Positiveinteger Value", NULL);
+    /* individual tests */
+    rc = ct_addTestFunction(pTest, testPositiveinteger_Value);
+    assert(rc);
+
+    ct_setStream(pTest, stdout);
+    ct_run(pTest);
+    (void) ct_report(pTest);
+    ct_destroy(pTest);
+
+    return 0;
+}
+#endif /* TEST_POSITIVEINTEGER_VALUE */
+#endif /* TEST */

bacnet-stack/demo/object/piv.h

@@ -0,0 +1,113 @@
+/**************************************************************************
+*
+* Copyright (C) 2015 Nikola Jelic <nikola.jelic@euroicc.com>
+*
+* 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 PIV_H
+#define PIV_H
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "bacdef.h"
+#include "bacerror.h"
+#include "wp.h"
+#include "rp.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+    typedef struct positiveinteger_value_descr {
+      bool Out_Of_Service:1;
+      uint32_t Present_Value;
+      uint16_t Units;
+    } POSITIVEINTEGER_VALUE_DESCR;
+
+
+    void Positiveinteger_Value_Property_Lists(
+        const int **pRequired,
+        const int **pOptional,
+        const int **pProprietary);
+    bool Positiveinteger_Value_Valid_Instance(
+        uint32_t object_instance);
+    unsigned Positiveinteger_Value_Count(
+        void);
+    uint32_t Positiveinteger_Value_Index_To_Instance(
+        unsigned index);
+    unsigned Positiveinteger_Value_Instance_To_Index(
+        uint32_t object_instance);
+
+    bool Positiveinteger_Value_Object_Name(
+        uint32_t object_instance,
+        BACNET_CHARACTER_STRING * object_name);
+
+    int Positiveinteger_Value_Read_Property(
+        BACNET_READ_PROPERTY_DATA * rpdata);
+
+    bool Positiveinteger_Value_Write_Property(
+        BACNET_WRITE_PROPERTY_DATA * wp_data);
+
+    bool Positiveinteger_Value_Present_Value_Set(
+        uint32_t object_instance,
+        uint32_t value,
+        uint8_t priority);
+    uint32_t Positiveinteger_Value_Present_Value(
+        uint32_t object_instance);
+
+    bool Positiveinteger_Value_Change_Of_Value(
+        uint32_t instance);
+    void Positiveinteger_Value_Change_Of_Value_Clear(
+        uint32_t instance);
+    bool Positiveinteger_Value_Encode_Value_List(
+        uint32_t object_instance,
+        BACNET_PROPERTY_VALUE * value_list);
+
+    char *Positiveinteger_Value_Description(
+        uint32_t instance);
+    bool Positiveinteger_Value_Description_Set(
+        uint32_t instance,
+        char *new_name);
+
+    bool Positiveinteger_Value_Out_Of_Service(
+        uint32_t instance);
+    void Positiveinteger_Value_Out_Of_Service_Set(
+        uint32_t instance,
+        bool oos_flag);
+
+    /* note: header of Intrinsic_Reporting function is required
+       even when INTRINSIC_REPORTING is not defined */
+    void Positiveinteger_Value_Intrinsic_Reporting(
+        uint32_t object_instance);
+
+    void Positiveinteger_Value_Init(
+        void);
+
+#ifdef TEST
+#include "ctest.h"
+    void testPositiveinteger_Value(
+        Test * pTest);
+#endif
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+#endif

bacnet-stack/demo/object/piv.mak

@@ -0,0 +1,42 @@
+#Makefile to build test case
+CC      = gcc
+SRC_DIR = ../../src
+TEST_DIR = ../../test
+INCLUDES = -I../../include -I$(TEST_DIR) -I.
+DEFINES = -DBIG_ENDIAN=0 -DTEST -DBACAPP_ALL -DTEST_POSITIVEINTEGER_VALUE
+
+CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
+
+SRCS = piv.c \
+	$(SRC_DIR)/bacdcode.c \
+	$(SRC_DIR)/bacint.c \
+	$(SRC_DIR)/bacstr.c \
+	$(SRC_DIR)/bacreal.c \
+	$(SRC_DIR)/bacdevobjpropref.c \
+	$(SRC_DIR)/datetime.c \
+	$(SRC_DIR)/lighting.c \
+	$(SRC_DIR)/bacapp.c \
+	$(SRC_DIR)/bactext.c \
+	$(SRC_DIR)/indtext.c \
+	$(TEST_DIR)/ctest.c
+
+TARGET = positiveinteger_value
+
+all: ${TARGET}
+ 
+OBJS = ${SRCS:.c=.o}
+
+${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)
+
+include: .depend

bacnet-stack/test.mak

@@ -206,7 +206,7 @@ wp: logfile test/wp.mak
 	( ./test/wp >> ${LOGFILE} )
 	$(MAKE) -s -C test -f wp.mak clean
 
-objects: ai ao av bi bo bv csv lc lo lso lsp mso msv ms-input command
+objects: ai ao av bi bo bv csv lc lo lso lsp mso msv ms-input osv piv command
 
 ai: logfile demo/object/ai.mak
 	$(MAKE) -s -C demo/object -f ai.mak clean all
@@ -286,3 +286,13 @@ msv: logfile demo/object/msv.mak
 	$(MAKE) -s -C demo/object -f msv.mak clean all
 	( ./demo/object/multistate_value >> ${LOGFILE} )
 	$(MAKE) -s -C demo/object -f msv.mak clean
+
+osv: logfile demo/object/osv.mak
+	$(MAKE) -s -C demo/object -f osv.mak clean all
+	( ./demo/object/octetstring_value >> ${LOGFILE} )
+	$(MAKE) -s -C demo/object -f osv.mak clean
+
+piv: logfile demo/object/piv.mak
+	$(MAKE) -s -C demo/object -f piv.mak clean all
+	( ./demo/object/positiveinteger_value >> ${LOGFILE} )
+	$(MAKE) -s -C demo/object -f piv.mak clean