add uci initial support for av mv and nc

demo/object/msv.h

@@ -22,8 +22,8 @@
 * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 *
 *********************************************************************/
-#ifndef MULTISTATE_VALUE_H
-#define MULTISTATE_VALUE_H
+#ifndef MULTI_STATE_VALUE_H
+#define MULTI_STATE_VALUE_H
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -31,11 +31,49 @@
 #include "bacerror.h"
 #include "rp.h"
 #include "wp.h"
+#if defined(INTRINSIC_REPORTING)
+#include "nc.h"
+#include "alarm_ack.h"
+#include "getevent.h"
+#include "get_alarm_sum.h"
+#endif /* INTRINSIC_REPORTING */
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
+int max_multi_state_values;
+
+    typedef struct multistate_value_descr {
+        char Object_Name[64];
+        char Object_Description[64];
+        uint8_t Present_Value;
+        unsigned Event_State:3;
+        bool Out_Of_Service;
+        uint8_t Units;
+        char State_Text[254][64];
+        int number_of_states;
+        /* Here is our Priority Array.  They are supposed to be Real, but */
+        /* we don't have that kind of memory, so we will use a single byte */
+        /* and load a Real for returning the value when asked. */
+        uint8_t Priority_Array[BACNET_MAX_PRIORITY];
+        unsigned Relinquish_Default;
+#if defined(INTRINSIC_REPORTING)
+        uint32_t Time_Delay;
+        uint32_t Notification_Class;
+        uint8_t Alarm_Values[254];
+        unsigned Event_Enable:3;
+        unsigned Notify_Type:1;
+        ACKED_INFO Acked_Transitions[MAX_BACNET_EVENT_TRANSITION];
+        BACNET_DATE_TIME Event_Time_Stamps[MAX_BACNET_EVENT_TRANSITION];
+        /* time to generate event notification */
+        uint32_t Remaining_Time_Delay;
+        /* AckNotification informations */
+        ACK_NOTIFICATION Ack_notify_data;
+#endif /* INTRINSIC_REPORTING */
+    } MULTI_STATE_VALUE_DESCR;
+
+
     void Multistate_Value_Property_Lists(
         const int **pRequired,
         const int **pOptional,
@@ -43,12 +81,15 @@ extern "C" {
 
     bool Multistate_Value_Valid_Instance(
         uint32_t object_instance);
+
     unsigned Multistate_Value_Count(
         void);
+
     uint32_t Multistate_Value_Index_To_Instance(
         unsigned index);
+
     unsigned Multistate_Value_Instance_To_Index(
-        uint32_t instance);
+        uint32_t object_instance);
 
     int Multistate_Value_Read_Property(
         BACNET_READ_PROPERTY_DATA * rpdata);
@@ -63,18 +104,22 @@ extern "C" {
     bool Multistate_Value_Object_Name(
         uint32_t object_instance,
         BACNET_CHARACTER_STRING * object_name);
+
     bool Multistate_Value_Name_Set(
         uint32_t object_instance,
         char *new_name);
 
-    uint32_t Multistate_Value_Present_Value(
-        uint32_t object_instance);
     bool Multistate_Value_Present_Value_Set(
         uint32_t object_instance,
-        uint32_t value);
+        uint32_t value,
+        uint8_t priority);
+
+    uint32_t Multistate_Value_Present_Value(
+        uint32_t object_instance);
 
     bool Multistate_Value_Out_Of_Service(
         uint32_t object_instance);
+
     void Multistate_Value_Out_Of_Service_Set(
         uint32_t object_instance,
         bool value);
@@ -82,18 +127,38 @@ extern "C" {
     bool Multistate_Value_Description_Set(
         uint32_t object_instance,
         char *text_string);
+
     bool Multistate_Value_State_Text_Set(
         uint32_t object_instance,
         uint32_t state_index,
         char *new_name);
+
     bool Multistate_Value_Max_States_Set(
         uint32_t instance,
         uint32_t max_states_requested);
 
+    /* note: header of Intrinsic_Reporting function is required
+       even when INTRINSIC_REPORTING is not defined */
+    void Multistate_Value_Intrinsic_Reporting(
+        uint32_t object_instance);
+
+#if defined(INTRINSIC_REPORTING)
+    int Multistate_Value_Event_Information(
+        unsigned index,
+        BACNET_GET_EVENT_INFORMATION_DATA * getevent_data);
+
+    int Multistate_Value_Alarm_Ack(
+        BACNET_ALARM_ACK_DATA * alarmack_data,
+        BACNET_ERROR_CODE * error_code);
+
+    int Multistate_Value_Alarm_Summary(
+        unsigned index,
+        BACNET_GET_ALARM_SUMMARY_DATA * getalarm_data);
+#endif
+
     void Multistate_Value_Init(
         void);
 
-
 #ifdef TEST
 #include "ctest.h"
     void testMultistateValue(