Added WriteGroup service and Channel object interfaces (#829)

src/bacnet/basic/object/channel.h

@@ -15,89 +15,9 @@
 /* BACnet Stack API */
 #include "bacnet/rp.h"
 #include "bacnet/wp.h"
+#include "bacnet/write_group.h"
 #include "bacnet/basic/object/lo.h"
-
-/* BACNET_CHANNEL_VALUE decodes WriteProperty service requests
-   Choose the datatypes that your application supports */
-#if !(                                                                  \
-    defined(CHANNEL_NUMERIC) || defined(CHANNEL_NULL) ||                \
-    defined(CHANNEL_BOOLEAN) || defined(CHANNEL_UNSIGNED) ||            \
-    defined(CHANNEL_SIGNED) || defined(CHANNEL_REAL) ||                 \
-    defined(CHANNEL_DOUBLE) || defined(CHANNEL_OCTET_STRING) ||         \
-    defined(CHANNEL_CHARACTER_STRING) || defined(CHANNEL_BIT_STRING) || \
-    defined(CHANNEL_ENUMERATED) || defined(CHANNEL_DATE) ||             \
-    defined(CHANNEL_TIME) || defined(CHANNEL_OBJECT_ID) ||              \
-    defined(CHANNEL_LIGHTING_COMMAND) || defined(CHANNEL_XY_COLOR) ||   \
-    defined(CHANNEL_COLOR_COMMAND))
-#define CHANNEL_NUMERIC
-#endif
-
-#if defined(CHANNEL_NUMERIC)
-#define CHANNEL_NULL
-#define CHANNEL_BOOLEAN
-#define CHANNEL_UNSIGNED
-#define CHANNEL_SIGNED
-#define CHANNEL_REAL
-#define CHANNEL_DOUBLE
-#define CHANNEL_ENUMERATED
-#define CHANNEL_LIGHTING_COMMAND
-#define CHANNEL_COLOR_COMMAND
-#define CHANNEL_XY_COLOR
-#endif
-
-typedef struct BACnet_Channel_Value_t {
-    uint8_t tag;
-    union {
-        /* NULL - not needed as it is encoded in the tag alone */
-#if defined(CHANNEL_BOOLEAN)
-        bool Boolean;
-#endif
-#if defined(CHANNEL_UNSIGNED)
-        uint32_t Unsigned_Int;
-#endif
-#if defined(CHANNEL_SIGNED)
-        int32_t Signed_Int;
-#endif
-#if defined(CHANNEL_REAL)
-        float Real;
-#endif
-#if defined(CHANNEL_DOUBLE)
-        double Double;
-#endif
-#if defined(CHANNEL_OCTET_STRING)
-        BACNET_OCTET_STRING Octet_String;
-#endif
-#if defined(CHANNEL_CHARACTER_STRING)
-        BACNET_CHARACTER_STRING Character_String;
-#endif
-#if defined(CHANNEL_BIT_STRING)
-        BACNET_BIT_STRING Bit_String;
-#endif
-#if defined(CHANNEL_ENUMERATED)
-        uint32_t Enumerated;
-#endif
-#if defined(CHANNEL_DATE)
-        BACNET_DATE Date;
-#endif
-#if defined(CHANNEL_TIME)
-        BACNET_TIME Time;
-#endif
-#if defined(CHANNEL_OBJECT_ID)
-        BACNET_OBJECT_ID Object_Id;
-#endif
-#if defined(CHANNEL_LIGHTING_COMMAND)
-        BACNET_LIGHTING_COMMAND Lighting_Command;
-#endif
-#if defined(CHANNEL_COLOR_COMMAND)
-        BACNET_COLOR_COMMAND Color_Command;
-#endif
-#if defined(CHANNEL_XY_COLOR)
-        BACNET_XY_COLOR XY_Color;
-#endif
-    } type;
-    /* simple linked list if needed */
-    struct BACnet_Channel_Value_t *next;
-} BACNET_CHANNEL_VALUE;
+#include "bacnet/channel_value.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -128,13 +48,19 @@ BACNET_STACK_EXPORT
 int Channel_Read_Property(BACNET_READ_PROPERTY_DATA *rpdata);
 BACNET_STACK_EXPORT
 bool Channel_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data);
+BACNET_STACK_EXPORT
+void Channel_Write_Group(
+    BACNET_WRITE_GROUP_DATA *data,
+    uint32_t change_list_index,
+    BACNET_GROUP_CHANNEL_VALUE *change_list);
 
 BACNET_STACK_EXPORT
 BACNET_CHANNEL_VALUE *Channel_Present_Value(uint32_t object_instance);
 BACNET_STACK_EXPORT
 bool Channel_Present_Value_Set(
-    BACNET_WRITE_PROPERTY_DATA *wp_data,
-    const BACNET_APPLICATION_DATA_VALUE *value);
+    uint32_t object_instance,
+    uint8_t priority,
+    const BACNET_CHANNEL_VALUE *value);
 
 BACNET_STACK_EXPORT
 bool Channel_Out_Of_Service(uint32_t object_instance);
@@ -169,22 +95,10 @@ Channel_Control_Groups_Element(uint32_t object_instance, int32_t array_index);
 BACNET_STACK_EXPORT
 bool Channel_Control_Groups_Element_Set(
     uint32_t object_instance, int32_t array_index, uint16_t value);
-BACNET_STACK_EXPORT
-bool Channel_Value_Copy(
-    BACNET_CHANNEL_VALUE *cvalue, const BACNET_APPLICATION_DATA_VALUE *value);
-BACNET_STACK_EXPORT
-int Channel_Value_Encode(
-    uint8_t *apdu, int apdu_max, const BACNET_CHANNEL_VALUE *value);
-BACNET_STACK_EXPORT
-int Channel_Coerce_Data_Encode(
-    uint8_t *apdu,
-    size_t apdu_size,
-    const BACNET_APPLICATION_DATA_VALUE *value,
-    BACNET_APPLICATION_TAG tag);
+
 BACNET_STACK_EXPORT
 bool Channel_Write_Member_Value(
-    BACNET_WRITE_PROPERTY_DATA *wp_data,
-    const BACNET_APPLICATION_DATA_VALUE *value);
+    BACNET_WRITE_PROPERTY_DATA *wp_data, const BACNET_CHANNEL_VALUE *value);
 
 BACNET_STACK_EXPORT
 void Channel_Write_Property_Internal_Callback_Set(write_property_function cb);