merge and cleaned up warning

bacnet-stack/demo/object/bv.h

@@ -36,10 +36,14 @@
 extern "C" {
 #endif /* __cplusplus */
 
+    void Binary_Value_Init(
+        void);
+
     void Binary_Value_Property_Lists(
         const int **pRequired,
         const int **pOptional,
         const int **pProprietary);
+
     bool Binary_Value_Valid_Instance(
         uint32_t object_instance);
     unsigned Binary_Value_Count(
@@ -48,13 +52,32 @@ extern "C" {
         unsigned index);
     unsigned Binary_Value_Instance_To_Index(
         uint32_t object_instance);
+    bool Binary_Value_Object_Instance_Add(
+        uint32_t instance);
 
     bool Binary_Value_Object_Name(
         uint32_t object_instance,
         BACNET_CHARACTER_STRING * object_name);
+    bool Binary_Value_Name_Set(
+        uint32_t object_instance,
+        char *new_name);
 
-    void Binary_Value_Init(
-        void);
+    char *Binary_Value_Description(
+        uint32_t instance);
+    bool Binary_Value_Description_Set(
+        uint32_t instance,
+        char *new_name);
+
+    char *Binary_Value_Inactive_Text(
+        uint32_t instance);
+    bool Binary_Value_Inactive_Text_Set(
+        uint32_t instance,
+        char *new_name);
+    char *Binary_Value_Active_Text(
+        uint32_t instance);
+    bool Binary_Value_Active_Text_Set(
+        uint32_t instance,
+        char *new_name);
 
     int Binary_Value_Read_Property(
         BACNET_READ_PROPERTY_DATA * rpdata);
@@ -115,3 +138,4 @@ extern "C" {
 }
 #endif /* __cplusplus */
 #endif
+