dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modify example output objects

Browse Source 
Add current-command-priority to output objects revision 17 or later.
Modify analog, binary, multistate outputs to be dynamic creatable.
This commit is contained in:
Steve Karg
2022-11-10 14:16:26 -06:00
parent db65a71433
commit 100df01cef
9 changed files with 3447 additions and 755 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bacnet/basic/object/ao.c
+1047 -209
View File
File diff suppressed because it is too large Load Diff
src/bacnet/basic/object/ao.h
+79 -37
View File
@@ -1,38 +1,58 @@
/**************************************************************************
*
* 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 AO_H
#define AO_H
/**
* @file
* @author Steve Karg
* @date 2005
* @brief Analog Output objects, customize for your use
*
* @section DESCRIPTION
*
* The Analog Output object is an object with a present-value that
* uses a single precision floating point data type, and includes
* a present-value derived from the priority array.
*
* @section LICENSE
*
* 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 BACNET_ANALOG_OUTPUT_H
#define BACNET_ANALOG_OUTPUT_H
#include <stdbool.h>
#include <stdint.h>
#include "bacnet/config.h"
#include "bacnet/bacnet_stack_exports.h"
#include "bacnet/bacdef.h"
#include "bacnet/bacenum.h"
#include "bacnet/bacerror.h"
#include "bacnet/rp.h"
#include "bacnet/wp.h"
/**
* @brief Callback for gateway write present value request
* @param object_instance - object-instance number of the object
* @param old_value - floating point analog value prior to write
* @param value - floating point analog value of the write
*/
typedef void (*analog_output_write_present_value_callback)(
uint32_t object_instance, float old_value, float value);
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
@@ -62,9 +82,6 @@ extern "C" {
float Analog_Output_Present_Value(
uint32_t object_instance);
BACNET_STACK_EXPORT
unsigned Analog_Output_Present_Value_Priority(
uint32_t object_instance);
BACNET_STACK_EXPORT
bool Analog_Output_Present_Value_Set(
uint32_t object_instance,
float value,
@@ -73,6 +90,12 @@ extern "C" {
bool Analog_Output_Present_Value_Relinquish(
uint32_t object_instance,
unsigned priority);
BACNET_STACK_EXPORT
unsigned Analog_Output_Present_Value_Priority(
uint32_t object_instance);
BACNET_STACK_EXPORT
void Analog_Output_Write_Present_Value_Callback_Set(
analog_output_write_present_value_callback cb);
BACNET_STACK_EXPORT
float Analog_Output_Relinquish_Default(
@@ -117,14 +140,6 @@ extern "C" {
uint32_t instance,
char *new_name);
BACNET_STACK_EXPORT
BACNET_RELIABILITY Analog_Output_Reliability(
uint32_t object_instance);
BACNET_STACK_EXPORT
bool Analog_Output_Reliability_Set(
uint32_t object_instance,
BACNET_RELIABILITY value);
BACNET_STACK_EXPORT
bool Analog_Output_Units_Set(
uint32_t instance,
@@ -142,6 +157,33 @@ extern "C" {
bool oos_flag);
BACNET_STACK_EXPORT
bool Analog_Output_Overridden(
uint32_t instance);
BACNET_STACK_EXPORT
void Analog_Output_Overridden_Set(
uint32_t instance,
bool oos_flag);
BACNET_STACK_EXPORT
BACNET_RELIABILITY Analog_Output_Reliability(
uint32_t object_instance);
BACNET_STACK_EXPORT
bool Analog_Output_Reliability_Set(
uint32_t object_instance, BACNET_RELIABILITY value);
BACNET_STACK_EXPORT
float Analog_Output_Min_Pres_Value(
uint32_t object_instance);
BACNET_STACK_EXPORT
bool Analog_Output_Min_Pres_Value_Set(
uint32_t object_instance, float value);
BACNET_STACK_EXPORT
float Analog_Output_Max_Pres_Value(
uint32_t object_instance);
BACNET_STACK_EXPORT
bool Analog_Output_Max_Pres_Value_Set(
uint32_t object_instance, float value);
int Analog_Output_Read_Property(
BACNET_READ_PROPERTY_DATA * rpdata);
BACNET_STACK_EXPORT
src/bacnet/basic/object/bo.c
+1041 -202
View File
File diff suppressed because it is too large Load Diff
src/bacnet/basic/object/bo.h
+106 -32
View File
@@ -1,38 +1,59 @@
/**************************************************************************
*
* 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 BO_H
#define BO_H
/**
* @file
* @author Steve Karg
* @date 2005
* @brief Binary Output objects, customize for your use
*
* @section DESCRIPTION
*
* The Binary Output object is a command object, and the present-value
* property uses a priority array and an enumerated 2-state data type.
*
* @section LICENSE
*
* 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 BACNET_BINARY_OUTPUT_H
#define BACNET_BINARY_OUTPUT_H
#include <stdbool.h>
#include <stdint.h>
#include "bacnet/config.h"
#include "bacnet/bacnet_stack_exports.h"
#include "bacnet/bacdef.h"
#include "bacnet/bacenum.h"
#include "bacnet/bacerror.h"
#include "bacnet/cov.h"
#include "bacnet/rp.h"
#include "bacnet/wp.h"
/**
* @brief Callback for gateway write present value request
* @param object_instance - object-instance number of the object
* @param old_value - binary preset-value prior to write
* @param value - binary preset-value of the write
*/
typedef void (*binary_output_write_present_value_callback)(
uint32_t object_instance, BACNET_BINARY_PV old_value,
BACNET_BINARY_PV value);
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
@@ -95,6 +116,25 @@ extern "C" {
uint32_t instance,
char *new_name);
BACNET_STACK_EXPORT
int Binary_Output_Read_Property(
BACNET_READ_PROPERTY_DATA * rpdata);
BACNET_STACK_EXPORT
bool Binary_Output_Write_Property(
BACNET_WRITE_PROPERTY_DATA * wp_data);
BACNET_STACK_EXPORT
bool Binary_Output_Encode_Value_List(
uint32_t object_instance,
BACNET_PROPERTY_VALUE * value_list);
BACNET_STACK_EXPORT
bool Binary_Output_Change_Of_Value(
uint32_t instance);
BACNET_STACK_EXPORT
void Binary_Output_Change_Of_Value_Clear(
uint32_t instance);
BACNET_STACK_EXPORT
BACNET_BINARY_PV Binary_Output_Present_Value(
uint32_t instance);
@@ -112,12 +152,8 @@ extern "C" {
uint32_t object_instance);
BACNET_STACK_EXPORT
BACNET_POLARITY Binary_Output_Polarity(
uint32_t instance);
BACNET_STACK_EXPORT
bool Binary_Output_Polarity_Set(
uint32_t object_instance,
BACNET_POLARITY polarity);
void Binary_Output_Write_Present_Value_Callback_Set(
binary_output_write_present_value_callback cb);
BACNET_STACK_EXPORT
bool Binary_Output_Out_Of_Service(
@@ -127,6 +163,44 @@ extern "C" {
uint32_t object_instance,
bool value);
BACNET_STACK_EXPORT
char *Binary_Output_Description(
uint32_t instance);
BACNET_STACK_EXPORT
bool Binary_Output_Description_Set(
uint32_t object_instance,
char *text_string);
BACNET_STACK_EXPORT
char *Binary_Output_Inactive_Text(
uint32_t instance);
BACNET_STACK_EXPORT
bool Binary_Output_Inactive_Text_Set(
uint32_t instance,
char *new_name);
BACNET_STACK_EXPORT
char *Binary_Output_Active_Text(
uint32_t instance);
BACNET_STACK_EXPORT
bool Binary_Output_Active_Text_Set(
uint32_t instance,
char *new_name);
BACNET_STACK_EXPORT
BACNET_POLARITY Binary_Output_Polarity(
uint32_t instance);
BACNET_STACK_EXPORT
bool Binary_Output_Polarity_Set(
uint32_t object_instance,
BACNET_POLARITY polarity);
BACNET_STACK_EXPORT
bool Binary_Output_Reliability_Set(
uint32_t object_instance, BACNET_RELIABILITY value);
BACNET_STACK_EXPORT
BACNET_RELIABILITY Binary_Output_Reliability(
uint32_t object_instance);
BACNET_STACK_EXPORT
BACNET_BINARY_PV Binary_Output_Relinquish_Default(
uint32_t object_instance);
src/bacnet/basic/object/device.c
+4
View File
@@ -1875,6 +1875,10 @@ void Device_Init(object_functions_t *object_table)
}
pObject++;
}
/* create some dynamically created objects as examples */
Analog_Output_Create(1);
Binary_Output_Create(1);
Multistate_Output_Create(1);
#if (BACNET_PROTOCOL_REVISION >= 24)
Color_Create(1);
Color_Temperature_Create(1);
src/bacnet/basic/object/lo.c
+18 -1
View File
@@ -82,7 +82,11 @@ static const int Lighting_Output_Properties_Required[] = {
PROP_BLINK_WARN_ENABLE, PROP_EGRESS_TIME, PROP_EGRESS_ACTIVE,
PROP_DEFAULT_FADE_TIME, PROP_DEFAULT_RAMP_RATE, PROP_DEFAULT_STEP_INCREMENT,
PROP_PRIORITY_ARRAY, PROP_RELINQUISH_DEFAULT,
PROP_LIGHTING_COMMAND_DEFAULT_PRIORITY, -1
PROP_LIGHTING_COMMAND_DEFAULT_PRIORITY,
#if (BACNET_PROTOCOL_REVISION >= 17)
PROP_CURRENT_COMMAND_PRIORITY,
#endif
-1
};
static const int Lighting_Output_Properties_Optional[] = { -1 };
@@ -1060,6 +1064,16 @@ int Lighting_Output_Read_Property(BACNET_READ_PROPERTY_DATA *rpdata)
Lighting_Output_Default_Priority(rpdata->object_instance);
apdu_len = encode_application_unsigned(&apdu[0], unsigned_value);
break;
#if (BACNET_PROTOCOL_REVISION >= 17)
case PROP_CURRENT_COMMAND_PRIORITY:
i = Lighting_Output_Present_Value_Priority(rpdata->object_instance);
if ((i >= BACNET_MIN_PRIORITY) && (i <= BACNET_MAX_PRIORITY)) {
apdu_len = encode_application_unsigned(&apdu[0], i);
} else {
apdu_len = encode_application_null(&apdu[0]);
}
break;
#endif
default:
rpdata->error_class = ERROR_CLASS_PROPERTY;
rpdata->error_code = ERROR_CODE_UNKNOWN_PROPERTY;
@@ -1187,6 +1201,9 @@ bool Lighting_Output_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data)
case PROP_DEFAULT_STEP_INCREMENT:
case PROP_PRIORITY_ARRAY:
case PROP_RELINQUISH_DEFAULT:
#if (BACNET_PROTOCOL_REVISION >= 17)
case PROP_CURRENT_COMMAND_PRIORITY:
#endif
wp_data->error_class = ERROR_CLASS_PROPERTY;
wp_data->error_code = ERROR_CODE_WRITE_ACCESS_DENIED;
break;
src/bacnet/basic/object/mso.c
+1026 -221
View File
File diff suppressed because it is too large Load Diff
src/bacnet/basic/object/mso.h
+111 -50
View File
@@ -1,38 +1,59 @@
/**************************************************************************
*
* 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 MSO_H
#define MSO_H
/**
* @file
* @author Steve Karg
* @date 2005
* @brief Multi-State Output objects, customize for your use
*
* @section DESCRIPTION
*
* The Multi-State object is an object with a present-value that
* uses an integer data type with a sequence of 1 to N values.
*
* @section LICENSE
*
* 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 BACNET_MULTISTATE_OUTPUT_H
#define BACNET_MULTISTATE_OUTPUT_H
#include <stdbool.h>
#include <stdint.h>
#include "bacnet/config.h"
#include "bacnet/bacnet_stack_exports.h"
#include "bacnet/bacdef.h"
#include "bacnet/bacenum.h"
#include "bacnet/bacerror.h"
#include "bacnet/cov.h"
#include "bacnet/rp.h"
#include "bacnet/wp.h"
/**
* @brief Callback for gateway write present value request
* @param object_instance - object-instance number of the object
* @param old_value - multistate preset-value prior to write
* @param value - multistate preset-value of the write
*/
typedef void (*multistate_output_write_present_value_callback)(
uint32_t object_instance, uint32_t old_value,
uint32_t value);
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
@@ -55,15 +76,6 @@ extern "C" {
unsigned Multistate_Output_Instance_To_Index(
uint32_t object_instance);
BACNET_STACK_EXPORT
bool Multistate_Output_Object_Name(
uint32_t object_instance,
BACNET_CHARACTER_STRING * object_name);
BACNET_STACK_EXPORT
void Multistate_Output_Init(
void);
BACNET_STACK_EXPORT
int Multistate_Output_Read_Property(
BACNET_READ_PROPERTY_DATA * rpdata);
@@ -72,6 +84,34 @@ extern "C" {
bool Multistate_Output_Write_Property(
BACNET_WRITE_PROPERTY_DATA * wp_data);
BACNET_STACK_EXPORT
bool Multistate_Output_Object_Name(
uint32_t object_instance,
BACNET_CHARACTER_STRING * object_name);
BACNET_STACK_EXPORT
bool Multistate_Output_Name_Set(
uint32_t object_instance,
char *new_name);
BACNET_STACK_EXPORT
uint32_t Multistate_Output_Present_Value(
uint32_t object_instance);
BACNET_STACK_EXPORT
bool Multistate_Output_Present_Value_Set(
uint32_t object_instance,
uint32_t value,
unsigned priority);
BACNET_STACK_EXPORT
bool Multistate_Output_Present_Value_Relinquish(
uint32_t instance,
unsigned priority);
BACNET_STACK_EXPORT
unsigned Multistate_Output_Present_Value_Priority(
uint32_t object_instance);
BACNET_STACK_EXPORT
void Multistate_Output_Write_Present_Value_Callback_Set(
multistate_output_write_present_value_callback cb);
BACNET_STACK_EXPORT
bool Multistate_Output_Change_Of_Value(
uint32_t instance);
@@ -83,25 +123,12 @@ extern "C" {
uint32_t object_instance,
BACNET_PROPERTY_VALUE * value_list);
BACNET_STACK_EXPORT
uint32_t Multistate_Output_Present_Value(
uint32_t instance);
BACNET_STACK_EXPORT
bool Multistate_Output_Present_Value_Set(
uint32_t instance,
unsigned value,
unsigned priority);
BACNET_STACK_EXPORT
bool Multistate_Output_Present_Value_Relinquish(
uint32_t instance,
unsigned priority);
BACNET_STACK_EXPORT
bool Multistate_Output_Out_Of_Service(
uint32_t instance);
uint32_t object_instance);
BACNET_STACK_EXPORT
void Multistate_Output_Out_Of_Service_Set(
uint32_t instance,
uint32_t object_instance,
bool value);
BACNET_STACK_EXPORT
@@ -125,6 +152,40 @@ extern "C" {
char *Multistate_Output_State_Text(
uint32_t object_instance,
uint32_t state_index);
BACNET_STACK_EXPORT
bool Multistate_Output_State_Text_List_Set(
uint32_t object_instance,
const char *state_text_list);
BACNET_STACK_EXPORT
BACNET_RELIABILITY Multistate_Output_Reliability(
uint32_t object_instance);
BACNET_STACK_EXPORT
bool Multistate_Output_Reliability_Set(
uint32_t object_instance,
BACNET_RELIABILITY value);
BACNET_STACK_EXPORT
uint32_t Multistate_Output_Relinquish_Default(
uint32_t object_instance);
BACNET_STACK_EXPORT
bool Multistate_Output_Relinquish_Default_Set(
uint32_t object_instance,
uint32_t value);
BACNET_STACK_EXPORT
bool Multistate_Output_Create(
uint32_t object_instance);
BACNET_STACK_EXPORT
bool Multistate_Output_Delete(
uint32_t object_instance);
BACNET_STACK_EXPORT
void Multistate_Output_Cleanup(
void);
BACNET_STACK_EXPORT
void Multistate_Output_Init(
void);
#ifdef __cplusplus
}