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

Added BACnetTimeValue functions. Added demo Schedule object. Integrated new objects with demo server and unit tests. Thank you, Nikola Jelić!

Browse Source
This commit is contained in:
skarg
2015-11-24 22:22:17 +00:00
parent 23fb73fefc
commit 94dbe3d429
10 changed files with 381 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/object/osv.c
+48 -57
View File
@@ -23,7 +23,7 @@
*
*********************************************************************/
/* Octetstring Value Objects - customize for your use */
/* OctetString Value Objects - customize for your use */
#include <stdbool.h>
#include <stdint.h>
@@ -48,7 +48,7 @@
OCTETSTRING_VALUE_DESCR AV_Descr[MAX_OCTETSTRING_VALUES];
/* These three arrays are used by the ReadPropertyMultiple handler */
static const int Octetstring_Value_Properties_Required[] = {
static const int OctetString_Value_Properties_Required[] = {
PROP_OBJECT_IDENTIFIER,
PROP_OBJECT_NAME,
PROP_OBJECT_TYPE,
@@ -57,48 +57,45 @@ static const int Octetstring_Value_Properties_Required[] = {
-1
};
static const int Octetstring_Value_Properties_Optional[] = {
static const int OctetString_Value_Properties_Optional[] = {
PROP_EVENT_STATE,
PROP_OUT_OF_SERVICE,
PROP_DESCRIPTION,
-1
};
static const int Octetstring_Value_Properties_Proprietary[] = {
static const int OctetString_Value_Properties_Proprietary[] = {
-1
};
void Octetstring_Value_Property_Lists(
const int **pRequired,
void OctetString_Value_Property_Lists(const int **pRequired,
const int **pOptional,
const int **pProprietary)
{
if (pRequired)
*pRequired = Octetstring_Value_Properties_Required;
*pRequired = OctetString_Value_Properties_Required;
if (pOptional)
*pOptional = Octetstring_Value_Properties_Optional;
*pOptional = OctetString_Value_Properties_Optional;
if (pProprietary)
*pProprietary = Octetstring_Value_Properties_Proprietary;
*pProprietary = OctetString_Value_Properties_Proprietary;
return;
}
void Octetstring_Value_Init(
void)
void OctetString_Value_Init(void)
{
unsigned i;
unsigned i;
for (i = 0; i < MAX_OCTETSTRING_VALUES; i++) {
memset(&AV_Descr[i], 0x00, sizeof(OCTETSTRING_VALUE_DESCR));
octetstring_init (&AV_Descr[i].Present_Value, NULL, 0);
octetstring_init(&AV_Descr[i].Present_Value, NULL, 0);
}
}
/* we simply have 0-n object instances. Yours might be */
/* more complex, and then you need validate that the */
/* given instance exists */
bool Octetstring_Value_Valid_Instance(
uint32_t object_instance)
bool OctetString_Value_Valid_Instance(uint32_t object_instance)
{
if (object_instance < MAX_OCTETSTRING_VALUES)
return true;
@@ -108,8 +105,7 @@ bool Octetstring_Value_Valid_Instance(
/* we simply have 0-n object instances. Yours might be */
/* more complex, and then count how many you have */
unsigned Octetstring_Value_Count(
void)
unsigned OctetString_Value_Count(void)
{
return MAX_OCTETSTRING_VALUES;
}
@@ -117,8 +113,7 @@ unsigned Octetstring_Value_Count(
/* we simply have 0-n object instances. Yours might be */
/* more complex, and then you need to return the instance */
/* that correlates to the correct index */
uint32_t Octetstring_Value_Index_To_Instance(
unsigned index)
uint32_t OctetString_Value_Index_To_Instance(unsigned index)
{
return index;
}
@@ -126,8 +121,7 @@ uint32_t Octetstring_Value_Index_To_Instance(
/* we simply have 0-n object instances. Yours might be */
/* more complex, and then you need to return the index */
/* that correlates to the correct instance number */
unsigned Octetstring_Value_Instance_To_Index(
uint32_t object_instance)
unsigned OctetString_Value_Instance_To_Index(uint32_t object_instance)
{
unsigned index = MAX_OCTETSTRING_VALUES;
@@ -147,29 +141,27 @@ unsigned Octetstring_Value_Instance_To_Index(
*
* @return true if values are within range and present-value is set.
*/
bool Octetstring_Value_Present_Value_Set(
uint32_t object_instance,
bool OctetString_Value_Present_Value_Set(uint32_t object_instance,
BACNET_OCTET_STRING * value,
uint8_t priority)
{
unsigned index = 0;
bool status = false;
index = Octetstring_Value_Instance_To_Index(object_instance);
index = OctetString_Value_Instance_To_Index(object_instance);
if (index < MAX_OCTETSTRING_VALUES) {
octetstring_copy (&AV_Descr[index].Present_Value, value);
octetstring_copy(&AV_Descr[index].Present_Value, value);
status = true;
}
return status;
}
BACNET_OCTET_STRING * Octetstring_Value_Present_Value(
uint32_t object_instance)
BACNET_OCTET_STRING *OctetString_Value_Present_Value(uint32_t object_instance)
{
BACNET_OCTET_STRING * value = NULL;
BACNET_OCTET_STRING *value = NULL;
unsigned index = 0;
index = Octetstring_Value_Instance_To_Index(object_instance);
index = OctetString_Value_Instance_To_Index(object_instance);
if (index < MAX_OCTETSTRING_VALUES) {
value = &AV_Descr[index].Present_Value;
}
@@ -178,8 +170,7 @@ BACNET_OCTET_STRING * Octetstring_Value_Present_Value(
}
/* note: the object name must be unique within this device */
bool Octetstring_Value_Object_Name(
uint32_t object_instance,
bool OctetString_Value_Object_Name(uint32_t object_instance,
BACNET_CHARACTER_STRING * object_name)
{
static char text_string[32] = ""; /* okay for single thread */
@@ -195,13 +186,12 @@ bool Octetstring_Value_Object_Name(
}
/* return apdu len, or BACNET_STATUS_ERROR on error */
int Octetstring_Value_Read_Property(
BACNET_READ_PROPERTY_DATA * rpdata)
int OctetString_Value_Read_Property(BACNET_READ_PROPERTY_DATA * rpdata)
{
int apdu_len = 0; /* return value */
BACNET_BIT_STRING bit_string;
BACNET_CHARACTER_STRING char_string;
BACNET_OCTET_STRING * real_value = NULL;
BACNET_OCTET_STRING *real_value = NULL;
unsigned object_index = 0;
bool state = false;
uint8_t *apdu = NULL;
@@ -214,7 +204,8 @@ int Octetstring_Value_Read_Property(
apdu = rpdata->application_data;
object_index = Octetstring_Value_Instance_To_Index(rpdata->object_instance);
object_index =
OctetString_Value_Instance_To_Index(rpdata->object_instance);
if (object_index < MAX_OCTETSTRING_VALUES)
CurrentAV = &AV_Descr[object_index];
else
@@ -223,24 +214,27 @@ int Octetstring_Value_Read_Property(
switch (rpdata->object_property) {
case PROP_OBJECT_IDENTIFIER:
apdu_len =
encode_application_object_id(&apdu[0], OBJECT_OCTETSTRING_VALUE,
rpdata->object_instance);
encode_application_object_id(&apdu[0],
OBJECT_OCTETSTRING_VALUE, rpdata->object_instance);
break;
case PROP_OBJECT_NAME:
case PROP_DESCRIPTION:
Octetstring_Value_Object_Name(rpdata->object_instance, &char_string);
OctetString_Value_Object_Name(rpdata->object_instance,
&char_string);
apdu_len =
encode_application_character_string(&apdu[0], &char_string);
break;
case PROP_OBJECT_TYPE:
apdu_len =
encode_application_enumerated(&apdu[0], OBJECT_OCTETSTRING_VALUE);
encode_application_enumerated(&apdu[0],
OBJECT_OCTETSTRING_VALUE);
break;
case PROP_PRESENT_VALUE:
real_value = Octetstring_Value_Present_Value(rpdata->object_instance);
real_value =
OctetString_Value_Present_Value(rpdata->object_instance);
apdu_len = encode_application_octet_string(&apdu[0], real_value);
break;
@@ -283,8 +277,7 @@ int Octetstring_Value_Read_Property(
}
/* returns true if successful */
bool Octetstring_Value_Write_Property(
BACNET_WRITE_PROPERTY_DATA * wp_data)
bool OctetString_Value_Write_Property(BACNET_WRITE_PROPERTY_DATA * wp_data)
{
bool status = false; /* return value */
unsigned int object_index = 0;
@@ -311,7 +304,8 @@ bool Octetstring_Value_Write_Property(
wp_data->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
return false;
}
object_index = Octetstring_Value_Instance_To_Index(wp_data->object_instance);
object_index =
OctetString_Value_Instance_To_Index(wp_data->object_instance);
if (object_index < MAX_OCTETSTRING_VALUES)
CurrentAV = &AV_Descr[object_index];
else
@@ -323,8 +317,9 @@ bool Octetstring_Value_Write_Property(
/* Command priority 6 is reserved for use by Minimum On/Off
algorithm and may not be used for other purposes in any
object. */
if (Octetstring_Value_Present_Value_Set(wp_data->object_instance,
&value.type.Octet_String, wp_data->priority)) {
if (OctetString_Value_Present_Value_Set(wp_data->
object_instance, &value.type.Octet_String,
wp_data->priority)) {
status = true;
} else if (wp_data->priority == 6) {
/* Command priority 6 is reserved for use by Minimum On/Off
@@ -371,8 +366,7 @@ bool Octetstring_Value_Write_Property(
}
void Octetstring_Value_Intrinsic_Reporting(
uint32_t object_instance)
void OctetString_Value_Intrinsic_Reporting(uint32_t object_instance)
{
}
@@ -381,8 +375,7 @@ void Octetstring_Value_Intrinsic_Reporting(
#include <string.h>
#include "ctest.h"
bool WPValidateArgType(
BACNET_APPLICATION_DATA_VALUE * pValue,
bool WPValidateArgType(BACNET_APPLICATION_DATA_VALUE * pValue,
uint8_t ucExpectedTag,
BACNET_ERROR_CLASS * pErrorClass,
BACNET_ERROR_CODE * pErrorCode)
@@ -395,8 +388,7 @@ bool WPValidateArgType(
return false;
}
void testOctetstring_Value(
Test * pTest)
void testOctetString_Value(Test * pTest)
{
BACNET_READ_PROPERTY_DATA rpdata;
uint8_t apdu[MAX_APDU] = { 0 };
@@ -406,14 +398,14 @@ void testOctetstring_Value(
uint16_t decoded_type = 0;
uint32_t decoded_instance = 0;
Octetstring_Value_Init();
OctetString_Value_Init();
rpdata.application_data = &apdu[0];
rpdata.application_data_len = sizeof(apdu);
rpdata.object_type = OBJECT_OCTETSTRING_VALUE;
rpdata.object_instance = 1;
rpdata.object_property = PROP_OBJECT_IDENTIFIER;
rpdata.array_index = BACNET_ARRAY_ALL;
len = Octetstring_Value_Read_Property(&rpdata);
len = OctetString_Value_Read_Property(&rpdata);
ct_test(pTest, len != 0);
len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value);
ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_OBJECT_ID);
@@ -425,15 +417,14 @@ void testOctetstring_Value(
}
#ifdef TEST_OCTETSTRING_VALUE
int main(
void)
int main(void)
{
Test *pTest;
bool rc;
pTest = ct_create("BACnet Octetstring Value", NULL);
pTest = ct_create("BACnet OctetString Value", NULL);
/* individual tests */
rc = ct_addTestFunction(pTest, testOctetstring_Value);
rc = ct_addTestFunction(pTest, testOctetString_Value);
assert(rc);
ct_setStream(pTest, stdout);