Changed device object to conform to other objects RP/RPM/WP service API. Added MSI object.

bacnet-stack/include/device.h

@@ -103,6 +103,12 @@ extern "C" {
         const char *name,
         size_t length);
 
+    bool Device_Set_Object_Name(
+        const char *name,
+        size_t length);
+    const char *Device_Object_Name(
+        void);
+
     const char *Device_Description(
         void);
     bool Device_Set_Description(

bacnet-stack/include/msi.h

@@ -0,0 +1,90 @@
+/**************************************************************************
+*
+* Copyright (C) 2005 Steve Karg <skarg@users.sourceforge.net>
+*
+* 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 MSI_H
+#define MSI_H
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "bacdef.h"
+#include "bacerror.h"
+#include "wp.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+    void Multistate_Input_Property_Lists(
+        const int **pRequired,
+        const int **pOptional,
+        const int **pProprietary);
+    bool Multistate_Input_Valid_Instance(
+        uint32_t object_instance);
+    unsigned Multistate_Input_Count(
+        void);
+    uint32_t Multistate_Input_Index_To_Instance(
+        unsigned index);
+    char *Multistate_Input_Name(
+        uint32_t object_instance);
+
+    int Multistate_Input_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_Input_Write_Property(
+        BACNET_WRITE_PROPERTY_DATA * wp_data,
+        BACNET_ERROR_CLASS * error_class,
+        BACNET_ERROR_CODE * error_code);
+
+    bool Multistate_Input_Present_Value_Set(
+        uint32_t object_instance,
+        uint32_t value);
+
+    bool Multistate_Input_Description_Set(
+        uint32_t object_instance,
+        char *text_string);
+
+    bool Multistate_Input_State_Text_Set(
+        uint32_t object_instance,
+        uint32_t state_index,
+        char *new_name);
+
+    void Multistate_Input_Init(
+        void);
+
+
+#ifdef TEST
+#include "ctest.h"
+    void testMultistateOutput(
+        Test * pTest);
+#endif
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+#endif