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

Indented.

Browse Source
This commit is contained in:
skarg
2007-11-29 15:56:53 +00:00
parent c585241c03
commit 411d6c1b24
236 changed files with 17864 additions and 15724 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/dcc/main.c
+26 -21
View File
@@ -63,9 +63,11 @@ static char *Communication_Password = NULL;
static bool Error_Detected = false; static bool Error_Detected = false;
static void MyErrorHandler(BACNET_ADDRESS * src, static void MyErrorHandler(
BACNET_ADDRESS * src,
uint8_t invoke_id, uint8_t invoke_id,
BACNET_ERROR_CLASS error_class, BACNET_ERROR_CODE error_code) BACNET_ERROR_CLASS error_class,
BACNET_ERROR_CODE error_code)
{ {
/* FIXME: verify src and invoke id */ /* FIXME: verify src and invoke id */
(void) src; (void) src;
@@ -76,30 +78,34 @@ static void MyErrorHandler(BACNET_ADDRESS * src,
Error_Detected = true; Error_Detected = true;
} }
void MyAbortHandler(BACNET_ADDRESS * src, void MyAbortHandler(
uint8_t invoke_id, uint8_t abort_reason, bool server) BACNET_ADDRESS * src,
uint8_t invoke_id,
uint8_t abort_reason,
bool server)
{ {
/* FIXME: verify src and invoke id */ /* FIXME: verify src and invoke id */
(void) src; (void) src;
(void) invoke_id; (void) invoke_id;
(void) server; (void) server;
printf("BACnet Abort: %s\r\n", printf("BACnet Abort: %s\r\n", bactext_abort_reason_name(abort_reason));
bactext_abort_reason_name(abort_reason));
Error_Detected = true; Error_Detected = true;
} }
void MyRejectHandler(BACNET_ADDRESS * src, void MyRejectHandler(
uint8_t invoke_id, uint8_t reject_reason) BACNET_ADDRESS * src,
uint8_t invoke_id,
uint8_t reject_reason)
{ {
/* FIXME: verify src and invoke id */ /* FIXME: verify src and invoke id */
(void) src; (void) src;
(void) invoke_id; (void) invoke_id;
printf("BACnet Reject: %s\r\n", printf("BACnet Reject: %s\r\n", bactext_reject_reason_name(reject_reason));
bactext_reject_reason_name(reject_reason));
Error_Detected = true; Error_Detected = true;
} }
void MyDeviceCommunicationControlSimpleAckHandler(BACNET_ADDRESS * src, void MyDeviceCommunicationControlSimpleAckHandler(
BACNET_ADDRESS * src,
uint8_t invoke_id) uint8_t invoke_id)
{ {
(void) src; (void) src;
@@ -107,15 +113,14 @@ void MyDeviceCommunicationControlSimpleAckHandler(BACNET_ADDRESS * src,
printf("DeviceCommunicationControl Acknowledged!\r\n"); printf("DeviceCommunicationControl Acknowledged!\r\n");
} }
static void Init_Service_Handlers(void) static void Init_Service_Handlers(
void)
{ {
/* we need to handle who-is /* we need to handle who-is
to support dynamic device binding to us */ to support dynamic device binding to us */
apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_WHO_IS, apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_WHO_IS, handler_who_is);
handler_who_is);
/* handle i-am to support binding to other devices */ /* handle i-am to support binding to other devices */
apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_I_AM, apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_I_AM, handler_i_am_bind);
handler_i_am_bind);
/* set the handler for all the services we don't implement /* set the handler for all the services we don't implement
It is required to send the proper reject message... */ It is required to send the proper reject message... */
apdu_set_unrecognized_service_handler_handler apdu_set_unrecognized_service_handler_handler
@@ -138,7 +143,9 @@ static void Init_Service_Handlers(void)
apdu_set_reject_handler(MyRejectHandler); apdu_set_reject_handler(MyRejectHandler);
} }
int main(int argc, char *argv[]) int main(
int argc,
char *argv[])
{ {
BACNET_ADDRESS src = { 0 }; /* address where message came from */ BACNET_ADDRESS src = { 0 }; /* address where message came from */
uint16_t pdu_len = 0; uint16_t pdu_len = 0;
@@ -192,8 +199,7 @@ int main(int argc, char *argv[])
timeout_seconds = (Device_APDU_Timeout() / 1000) * timeout_seconds = (Device_APDU_Timeout() / 1000) *
Device_Number_Of_APDU_Retries(); Device_Number_Of_APDU_Retries();
/* try to bind with the device */ /* try to bind with the device */
Send_WhoIs(Target_Device_Object_Instance, Send_WhoIs(Target_Device_Object_Instance, Target_Device_Object_Instance);
Target_Device_Object_Instance);
/* loop forever */ /* loop forever */
for (;;) { for (;;) {
/* increment timer - exit if timed out */ /* increment timer - exit if timed out */
@@ -208,8 +214,7 @@ int main(int argc, char *argv[])
} }
/* at least one second has passed */ /* at least one second has passed */
if (current_seconds != last_seconds) if (current_seconds != last_seconds)
tsm_timer_milliseconds(((current_seconds - tsm_timer_milliseconds(((current_seconds - last_seconds) * 1000));
last_seconds) * 1000));
if (Error_Detected) if (Error_Detected)
break; break;
/* wait until the device is bound, or timeout and quit */ /* wait until the device is bound, or timeout and quit */
bacnet-stack/demo/epics/main.c
+48 -47
View File
@@ -69,56 +69,62 @@ static BACNET_RP_SERVICE_DATA Read_Property_Data;
/* FIXME: keep the object list in here */ /* FIXME: keep the object list in here */
/* static OS_Keylist Object_List; */ /* static OS_Keylist Object_List; */
static void MyErrorHandler(BACNET_ADDRESS * src, static void MyErrorHandler(
BACNET_ADDRESS * src,
uint8_t invoke_id, uint8_t invoke_id,
BACNET_ERROR_CLASS error_class, BACNET_ERROR_CODE error_code) BACNET_ERROR_CLASS error_class,
BACNET_ERROR_CODE error_code)
{ {
/* FIXME: verify src and invoke id */ /* FIXME: verify src and invoke id */
(void) src; (void) src;
(void) invoke_id; (void) invoke_id;
#if 1 #if 1
printf("BACnet Error: %s: %s\r\n", printf("BACnet Error: %s: %s\r\n",
bactext_error_class_name(error_class), bactext_error_class_name(error_class),
bactext_error_code_name(error_code)); bactext_error_code_name(error_code));
#else #else
(void) error_class; (void) error_class;
(void) error_code; (void) error_code;
#endif #endif
Error_Detected = true; Error_Detected = true;
} }
void MyAbortHandler(BACNET_ADDRESS * src, void MyAbortHandler(
uint8_t invoke_id, uint8_t abort_reason, bool server) BACNET_ADDRESS * src,
uint8_t invoke_id,
uint8_t abort_reason,
bool server)
{ {
/* FIXME: verify src and invoke id */ /* FIXME: verify src and invoke id */
(void) src; (void) src;
(void) invoke_id; (void) invoke_id;
(void) server; (void) server;
#if 1 #if 1
printf("BACnet Abort: %s\r\n", printf("BACnet Abort: %s\r\n", bactext_abort_reason_name(abort_reason));
bactext_abort_reason_name(abort_reason)); #else
#else
(void) abort_reason; (void) abort_reason;
#endif #endif
Error_Detected = true; Error_Detected = true;
} }
void MyRejectHandler(BACNET_ADDRESS * src, void MyRejectHandler(
uint8_t invoke_id, uint8_t reject_reason) BACNET_ADDRESS * src,
uint8_t invoke_id,
uint8_t reject_reason)
{ {
/* FIXME: verify src and invoke id */ /* FIXME: verify src and invoke id */
(void) src; (void) src;
(void) invoke_id; (void) invoke_id;
#if 1 #if 1
printf("BACnet Reject: %s\r\n", printf("BACnet Reject: %s\r\n", bactext_reject_reason_name(reject_reason));
bactext_reject_reason_name(reject_reason)); #else
#else
(void) reject_reason; (void) reject_reason;
#endif #endif
Error_Detected = true; Error_Detected = true;
} }
void PrintReadPropertyData(BACNET_READ_PROPERTY_DATA * data) void PrintReadPropertyData(
BACNET_READ_PROPERTY_DATA * data)
{ {
BACNET_APPLICATION_DATA_VALUE value; /* for decode value data */ BACNET_APPLICATION_DATA_VALUE value; /* for decode value data */
int len = 0; int len = 0;
@@ -170,16 +176,17 @@ void PrintReadPropertyData(BACNET_READ_PROPERTY_DATA * data)
} }
} }
void MyReadPropertyAckHandler(uint8_t * service_request, void MyReadPropertyAckHandler(
uint8_t * service_request,
uint16_t service_len, uint16_t service_len,
BACNET_ADDRESS * src, BACNET_CONFIRMED_SERVICE_ACK_DATA * service_data) BACNET_ADDRESS * src,
BACNET_CONFIRMED_SERVICE_ACK_DATA * service_data)
{ {
int len = 0; int len = 0;
BACNET_READ_PROPERTY_DATA data; BACNET_READ_PROPERTY_DATA data;
(void) src; (void) src;
len = rp_ack_decode_service_request(service_request, len = rp_ack_decode_service_request(service_request, service_len, &data);
service_len, &data);
if (len > 0) { if (len > 0) {
memmove(&Read_Property_Data.service_data, service_data, sizeof(data)); memmove(&Read_Property_Data.service_data, service_data, sizeof(data));
memmove(&Read_Property_Data.data, &data, sizeof(data)); memmove(&Read_Property_Data.data, &data, sizeof(data));
@@ -187,15 +194,14 @@ void MyReadPropertyAckHandler(uint8_t * service_request,
} }
} }
static void Init_Service_Handlers(void) static void Init_Service_Handlers(
void)
{ {
/* we need to handle who-is /* we need to handle who-is
to support dynamic device binding to us */ to support dynamic device binding to us */
apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_WHO_IS, apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_WHO_IS, handler_who_is);
handler_who_is);
/* handle i-am to support binding to other devices */ /* handle i-am to support binding to other devices */
apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_I_AM, apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_I_AM, handler_i_am_bind);
handler_i_am_bind);
/* set the handler for all the services we don't implement /* set the handler for all the services we don't implement
It is required to send the proper reject message... */ It is required to send the proper reject message... */
apdu_set_unrecognized_service_handler_handler apdu_set_unrecognized_service_handler_handler
@@ -207,13 +213,13 @@ static void Init_Service_Handlers(void)
apdu_set_confirmed_ack_handler(SERVICE_CONFIRMED_READ_PROPERTY, apdu_set_confirmed_ack_handler(SERVICE_CONFIRMED_READ_PROPERTY,
MyReadPropertyAckHandler); MyReadPropertyAckHandler);
/* handle any errors coming back */ /* handle any errors coming back */
apdu_set_error_handler(SERVICE_CONFIRMED_READ_PROPERTY, apdu_set_error_handler(SERVICE_CONFIRMED_READ_PROPERTY, MyErrorHandler);
MyErrorHandler);
apdu_set_abort_handler(MyAbortHandler); apdu_set_abort_handler(MyAbortHandler);
apdu_set_reject_handler(MyRejectHandler); apdu_set_reject_handler(MyRejectHandler);
} }
static uint8_t Read_Properties(uint32_t device_instance) static uint8_t Read_Properties(
uint32_t device_instance)
{ {
uint8_t invoke_id = 0; uint8_t invoke_id = 0;
static unsigned index = 0; static unsigned index = 0;
@@ -226,12 +232,10 @@ static uint8_t Read_Properties(uint32_t device_instance)
} }
if (pRequired[index] != -1) { if (pRequired[index] != -1) {
printf(" %s: ",bactext_property_name(pRequired[index])); printf(" %s: ", bactext_property_name(pRequired[index]));
invoke_id = Send_Read_Property_Request(device_instance, invoke_id = Send_Read_Property_Request(device_instance,
OBJECT_DEVICE, OBJECT_DEVICE,
device_instance, device_instance, pRequired[index], BACNET_ARRAY_ALL);
pRequired[index],
BACNET_ARRAY_ALL);
if (invoke_id) { if (invoke_id) {
index++; index++;
} }
@@ -240,7 +244,9 @@ static uint8_t Read_Properties(uint32_t device_instance)
return invoke_id; return invoke_id;
} }
int main(int argc, char *argv[]) int main(
int argc,
char *argv[])
{ {
BACNET_ADDRESS src = { 0 }; /* address where message came from */ BACNET_ADDRESS src = { 0 }; /* address where message came from */
uint16_t pdu_len = 0; uint16_t pdu_len = 0;
@@ -257,9 +263,7 @@ int main(int argc, char *argv[])
/* print help if not enough arguments */ /* print help if not enough arguments */
if (argc < 2) { if (argc < 2) {
printf printf("%s device-instance\r\n", filename_remove_path(argv[0]));
("%s device-instance\r\n",
filename_remove_path(argv[0]));
return 0; return 0;
} }
@@ -267,7 +271,7 @@ int main(int argc, char *argv[])
Target_Device_Object_Instance = strtol(argv[1], NULL, 0); Target_Device_Object_Instance = strtol(argv[1], NULL, 0);
if (Target_Device_Object_Instance > BACNET_MAX_INSTANCE) { if (Target_Device_Object_Instance > BACNET_MAX_INSTANCE) {
fprintf(stderr, "device-instance=%u - it must be less than %u\r\n", fprintf(stderr, "device-instance=%u - it must be less than %u\r\n",
Target_Device_Object_Instance, BACNET_MAX_INSTANCE+1); Target_Device_Object_Instance, BACNET_MAX_INSTANCE + 1);
return 1; return 1;
} }
/* setup my info */ /* setup my info */
@@ -281,8 +285,7 @@ int main(int argc, char *argv[])
timeout_seconds = (Device_APDU_Timeout() / 1000) * timeout_seconds = (Device_APDU_Timeout() / 1000) *
Device_Number_Of_APDU_Retries(); Device_Number_Of_APDU_Retries();
/* try to bind with the device */ /* try to bind with the device */
Send_WhoIs(Target_Device_Object_Instance, Send_WhoIs(Target_Device_Object_Instance, Target_Device_Object_Instance);
Target_Device_Object_Instance);
printf("List of Objects in test device:\r\n"); printf("List of Objects in test device:\r\n");
printf("{\r\n"); printf("{\r\n");
/* loop forever */ /* loop forever */
@@ -299,8 +302,7 @@ int main(int argc, char *argv[])
} }
/* at least one second has passed */ /* at least one second has passed */
if (current_seconds != last_seconds) { if (current_seconds != last_seconds) {
tsm_timer_milliseconds(((current_seconds - tsm_timer_milliseconds(((current_seconds - last_seconds) * 1000));
last_seconds) * 1000));
} }
/* wait until the device is bound, or timeout and quit */ /* wait until the device is bound, or timeout and quit */
found = address_bind_request(Target_Device_Object_Instance, found = address_bind_request(Target_Device_Object_Instance,
@@ -321,8 +323,7 @@ int main(int argc, char *argv[])
} }
} else if (tsm_invoke_id_free(invoke_id)) { } else if (tsm_invoke_id_free(invoke_id)) {
invoke_id = 0; invoke_id = 0;
} } else if (tsm_invoke_id_failed(invoke_id)) {
else if (tsm_invoke_id_failed(invoke_id)) {
fprintf(stderr, "\rError: TSM Timeout!\r\n"); fprintf(stderr, "\rError: TSM Timeout!\r\n");
tsm_free_invoke_id(invoke_id); tsm_free_invoke_id(invoke_id);
invoke_id = 0; invoke_id = 0;
bacnet-stack/demo/handler/h_arf.c
+6 -4
View File
@@ -40,7 +40,7 @@
#include "ai.h" #include "ai.h"
#include "ao.h" #include "ao.h"
#if defined(BACFILE) #if defined(BACFILE)
#include "bacfile.h" #include "bacfile.h"
#endif #endif
/* /*
@@ -95,9 +95,11 @@ shall be TRUE, otherwise FALSE.
*/ */
#if defined(BACFILE) #if defined(BACFILE)
void handler_atomic_read_file(uint8_t * service_request, void handler_atomic_read_file(
uint8_t * service_request,
uint16_t service_len, uint16_t service_len,
BACNET_ADDRESS * src, BACNET_CONFIRMED_SERVICE_DATA * service_data) BACNET_ADDRESS * src,
BACNET_CONFIRMED_SERVICE_DATA * service_data)
{ {
BACNET_ATOMIC_READ_FILE_DATA data; BACNET_ATOMIC_READ_FILE_DATA data;
int len = 0; int len = 0;
@@ -186,7 +188,7 @@ void handler_atomic_read_file(uint8_t * service_request,
service_data->invoke_id, service_data->invoke_id,
SERVICE_CONFIRMED_ATOMIC_READ_FILE, error_class, error_code); SERVICE_CONFIRMED_ATOMIC_READ_FILE, error_class, error_code);
} }
ARF_ABORT: ARF_ABORT:
pdu_len += len; pdu_len += len;
bytes_sent = datalink_send_pdu(src, &npdu_data, bytes_sent = datalink_send_pdu(src, &npdu_data,
&Handler_Transmit_Buffer[0], pdu_len); &Handler_Transmit_Buffer[0], pdu_len);
bacnet-stack/demo/handler/h_arf_a.c
+5 -4
View File
@@ -47,9 +47,11 @@
/* that someone can read from us. It is common to */ /* that someone can read from us. It is common to */
/* use the description as the file name. */ /* use the description as the file name. */
#if defined(BACFILE) #if defined(BACFILE)
void handler_atomic_read_file_ack(uint8_t * service_request, void handler_atomic_read_file_ack(
uint8_t * service_request,
uint16_t service_len, uint16_t service_len,
BACNET_ADDRESS * src, BACNET_CONFIRMED_SERVICE_ACK_DATA * service_data) BACNET_ADDRESS * src,
BACNET_CONFIRMED_SERVICE_ACK_DATA * service_data)
{ {
int len = 0; int len = 0;
BACNET_ATOMIC_READ_FILE_DATA data; BACNET_ATOMIC_READ_FILE_DATA data;
@@ -60,8 +62,7 @@ void handler_atomic_read_file_ack(uint8_t * service_request,
(void) src; (void) src;
/* get the file instance from the tsm data before freeing it */ /* get the file instance from the tsm data before freeing it */
instance = bacfile_instance_from_tsm(service_data->invoke_id); instance = bacfile_instance_from_tsm(service_data->invoke_id);
len = arf_ack_decode_service_request(service_request, len = arf_ack_decode_service_request(service_request, service_len, &data);
service_len, &data);
#if PRINT_ENABLED #if PRINT_ENABLED
fprintf(stderr, "Received Read-File Ack!\n"); fprintf(stderr, "Received Read-File Ack!\n");
#endif #endif
bacnet-stack/demo/handler/h_awf.c
+6 -4
View File
@@ -40,7 +40,7 @@
/* demo objects */ /* demo objects */
#include "device.h" #include "device.h"
#if defined(BACFILE) #if defined(BACFILE)
#include "bacfile.h" #include "bacfile.h"
#endif #endif
/* /*
@@ -73,9 +73,11 @@ standard.
*/ */
#if defined(BACFILE) #if defined(BACFILE)
void handler_atomic_write_file(uint8_t * service_request, void handler_atomic_write_file(
uint8_t * service_request,
uint16_t service_len, uint16_t service_len,
BACNET_ADDRESS * src, BACNET_CONFIRMED_SERVICE_DATA * service_data) BACNET_ADDRESS * src,
BACNET_CONFIRMED_SERVICE_DATA * service_data)
{ {
BACNET_ATOMIC_WRITE_FILE_DATA data; BACNET_ATOMIC_WRITE_FILE_DATA data;
int len = 0; int len = 0;
@@ -151,7 +153,7 @@ void handler_atomic_write_file(uint8_t * service_request,
service_data->invoke_id, service_data->invoke_id,
SERVICE_CONFIRMED_ATOMIC_READ_FILE, error_class, error_code); SERVICE_CONFIRMED_ATOMIC_READ_FILE, error_class, error_code);
} }
AWF_ABORT: AWF_ABORT:
pdu_len += len; pdu_len += len;
bytes_sent = datalink_send_pdu(src, &npdu_data, bytes_sent = datalink_send_pdu(src, &npdu_data,
&Handler_Transmit_Buffer[0], pdu_len); &Handler_Transmit_Buffer[0], pdu_len);
bacnet-stack/demo/handler/h_dcc.c
+5 -3
View File
@@ -40,9 +40,11 @@
static char *My_Password = "filister"; static char *My_Password = "filister";
void handler_device_communication_control(uint8_t * service_request, void handler_device_communication_control(
uint8_t * service_request,
uint16_t service_len, uint16_t service_len,
BACNET_ADDRESS * src, BACNET_CONFIRMED_SERVICE_DATA * service_data) BACNET_ADDRESS * src,
BACNET_CONFIRMED_SERVICE_DATA * service_data)
{ {
uint16_t timeDuration = 0; uint16_t timeDuration = 0;
BACNET_COMMUNICATION_ENABLE_DISABLE state = COMMUNICATION_ENABLE; BACNET_COMMUNICATION_ENABLE_DISABLE state = COMMUNICATION_ENABLE;
@@ -121,7 +123,7 @@ void handler_device_communication_control(uint8_t * service_request,
#endif #endif
} }
} }
DCC_ABORT: DCC_ABORT:
pdu_len += len; pdu_len += len;
bytes_sent = datalink_send_pdu(src, &npdu_data, bytes_sent = datalink_send_pdu(src, &npdu_data,
&Handler_Transmit_Buffer[0], pdu_len); &Handler_Transmit_Buffer[0], pdu_len);
bacnet-stack/demo/handler/h_iam.c
+8 -4
View File
@@ -32,8 +32,10 @@
#include "iam.h" #include "iam.h"
#include "address.h" #include "address.h"
void handler_i_am_add(uint8_t * service_request, void handler_i_am_add(
uint16_t service_len, BACNET_ADDRESS * src) uint8_t * service_request,
uint16_t service_len,
BACNET_ADDRESS * src)
{ {
int len = 0; int len = 0;
uint32_t device_id = 0; uint32_t device_id = 0;
@@ -61,8 +63,10 @@ void handler_i_am_add(uint8_t * service_request,
return; return;
} }
void handler_i_am_bind(uint8_t * service_request, void handler_i_am_bind(
uint16_t service_len, BACNET_ADDRESS * src) uint8_t * service_request,
uint16_t service_len,
BACNET_ADDRESS * src)
{ {
int len = 0; int len = 0;
uint32_t device_id = 0; uint32_t device_id = 0;
bacnet-stack/demo/handler/h_ihave.c
+5 -4
View File
@@ -32,16 +32,17 @@
#include "bactext.h" #include "bactext.h"
#include "ihave.h" #include "ihave.h"
void handler_i_have(uint8_t * service_request, void handler_i_have(
uint16_t service_len, BACNET_ADDRESS * src) uint8_t * service_request,
uint16_t service_len,
BACNET_ADDRESS * src)
{ {
int len = 0; int len = 0;
BACNET_I_HAVE_DATA data; BACNET_I_HAVE_DATA data;
(void) service_len; (void) service_len;
(void) src; (void) src;
len = ihave_decode_service_request(service_request, len = ihave_decode_service_request(service_request, service_len, &data);
service_len, &data);
if (len != -1) { if (len != -1) {
#if PRINT_ENABLED #if PRINT_ENABLED
fprintf(stderr, "I-Have: %s %d from %s %u!\r\n", fprintf(stderr, "I-Have: %s %d from %s %u!\r\n",
bacnet-stack/demo/handler/h_rd.c
+5 -3
View File
@@ -41,9 +41,11 @@
static char *Password = "Jesus"; static char *Password = "Jesus";
static BACNET_CHARACTER_STRING My_Password; static BACNET_CHARACTER_STRING My_Password;
void handler_reinitialize_device(uint8_t * service_request, void handler_reinitialize_device(
uint8_t * service_request,
uint16_t service_len, uint16_t service_len,
BACNET_ADDRESS * src, BACNET_CONFIRMED_SERVICE_DATA * service_data) BACNET_ADDRESS * src,
BACNET_CONFIRMED_SERVICE_DATA * service_data)
{ {
BACNET_REINITIALIZED_STATE state; BACNET_REINITIALIZED_STATE state;
BACNET_CHARACTER_STRING their_password; BACNET_CHARACTER_STRING their_password;
@@ -124,7 +126,7 @@ void handler_reinitialize_device(uint8_t * service_request,
#endif #endif
} }
} }
RD_ABORT: RD_ABORT:
pdu_len += len; pdu_len += len;
bytes_sent = datalink_send_pdu(src, &npdu_data, bytes_sent = datalink_send_pdu(src, &npdu_data,
&Handler_Transmit_Buffer[0], pdu_len); &Handler_Transmit_Buffer[0], pdu_len);
bacnet-stack/demo/handler/h_rp.c
+32 -67
View File
@@ -47,7 +47,7 @@
#include "lsp.h" #include "lsp.h"
#include "mso.h" #include "mso.h"
#if defined(BACFILE) #if defined(BACFILE)
#include "bacfile.h" #include "bacfile.h"
#endif #endif
static uint8_t Temp_Buf[MAX_APDU] = { 0 }; static uint8_t Temp_Buf[MAX_APDU] = { 0 };
@@ -69,115 +69,82 @@ int Encode_Property_APDU(
*error_class = ERROR_CLASS_OBJECT; *error_class = ERROR_CLASS_OBJECT;
*error_code = ERROR_CODE_UNKNOWN_OBJECT; *error_code = ERROR_CODE_UNKNOWN_OBJECT;
/* handle each object type */ /* handle each object type */
switch(object_type) { switch (object_type) {
case OBJECT_DEVICE: case OBJECT_DEVICE:
if (Device_Valid_Object_Instance_Number(object_instance)) { if (Device_Valid_Object_Instance_Number(object_instance)) {
apdu_len = Device_Encode_Property_APDU( apdu_len = Device_Encode_Property_APDU(&apdu[0],
&apdu[0], property, array_index, error_class, error_code);
property,
array_index,
error_class, error_code);
} }
break; break;
case OBJECT_ANALOG_INPUT: case OBJECT_ANALOG_INPUT:
if (Analog_Input_Valid_Instance(object_instance)) { if (Analog_Input_Valid_Instance(object_instance)) {
apdu_len = Analog_Input_Encode_Property_APDU( apdu_len = Analog_Input_Encode_Property_APDU(&apdu[0],
&apdu[0],
object_instance, object_instance,
property, property, array_index, error_class, error_code);
array_index,
error_class, error_code);
} }
break; break;
case OBJECT_ANALOG_OUTPUT: case OBJECT_ANALOG_OUTPUT:
if (Analog_Output_Valid_Instance(object_instance)) { if (Analog_Output_Valid_Instance(object_instance)) {
apdu_len = Analog_Output_Encode_Property_APDU( apdu_len = Analog_Output_Encode_Property_APDU(&apdu[0],
&apdu[0],
object_instance, object_instance,
property, property, array_index, error_class, error_code);
array_index,
error_class, error_code);
} }
break; break;
case OBJECT_ANALOG_VALUE: case OBJECT_ANALOG_VALUE:
if (Analog_Value_Valid_Instance(object_instance)) { if (Analog_Value_Valid_Instance(object_instance)) {
apdu_len = Analog_Value_Encode_Property_APDU( apdu_len = Analog_Value_Encode_Property_APDU(&apdu[0],
&apdu[0],
object_instance, object_instance,
property, property, array_index, error_class, error_code);
array_index,
error_class, error_code);
} }
break; break;
case OBJECT_BINARY_INPUT: case OBJECT_BINARY_INPUT:
if (Binary_Input_Valid_Instance(object_instance)) { if (Binary_Input_Valid_Instance(object_instance)) {
apdu_len = Binary_Input_Encode_Property_APDU( apdu_len = Binary_Input_Encode_Property_APDU(&apdu[0],
&apdu[0],
object_instance, object_instance,
property, property, array_index, error_class, error_code);
array_index,
error_class, error_code);
} }
break; break;
case OBJECT_BINARY_OUTPUT: case OBJECT_BINARY_OUTPUT:
if (Binary_Output_Valid_Instance(object_instance)) { if (Binary_Output_Valid_Instance(object_instance)) {
apdu_len = Binary_Output_Encode_Property_APDU( apdu_len = Binary_Output_Encode_Property_APDU(&apdu[0],
&apdu[0],
object_instance, object_instance,
property, property, array_index, error_class, error_code);
array_index,
error_class, error_code);
} }
break; break;
case OBJECT_BINARY_VALUE: case OBJECT_BINARY_VALUE:
if (Binary_Value_Valid_Instance(object_instance)) { if (Binary_Value_Valid_Instance(object_instance)) {
apdu_len = Binary_Value_Encode_Property_APDU( apdu_len = Binary_Value_Encode_Property_APDU(&apdu[0],
&apdu[0],
object_instance, object_instance,
property, property, array_index, error_class, error_code);
array_index,
error_class, error_code);
} }
break; break;
case OBJECT_LIFE_SAFETY_POINT: case OBJECT_LIFE_SAFETY_POINT:
if (Life_Safety_Point_Valid_Instance(object_instance)) { if (Life_Safety_Point_Valid_Instance(object_instance)) {
apdu_len = Life_Safety_Point_Encode_Property_APDU( apdu_len = Life_Safety_Point_Encode_Property_APDU(&apdu[0],
&apdu[0],
object_instance, object_instance,
property, property, array_index, error_class, error_code);
array_index,
error_class, error_code);
} }
break; break;
case OBJECT_LOAD_CONTROL: case OBJECT_LOAD_CONTROL:
if (Load_Control_Valid_Instance(object_instance)) { if (Load_Control_Valid_Instance(object_instance)) {
apdu_len = Load_Control_Encode_Property_APDU( apdu_len = Load_Control_Encode_Property_APDU(&apdu[0],
&apdu[0],
object_instance, object_instance,
property, property, array_index, error_class, error_code);
array_index,
error_class, error_code);
} }
break; break;
case OBJECT_MULTI_STATE_OUTPUT: case OBJECT_MULTI_STATE_OUTPUT:
if (Multistate_Output_Valid_Instance(object_instance)) { if (Multistate_Output_Valid_Instance(object_instance)) {
apdu_len = Multistate_Output_Encode_Property_APDU( apdu_len = Multistate_Output_Encode_Property_APDU(&apdu[0],
&apdu[0],
object_instance, object_instance,
property, property, array_index, error_class, error_code);
array_index,
error_class, error_code);
} }
break; break;
#if defined(BACFILE) #if defined(BACFILE)
case OBJECT_FILE: case OBJECT_FILE:
if (bacfile_valid_instance(object_instance)) { if (bacfile_valid_instance(object_instance)) {
apdu_len = bacfile_encode_property_apdu( apdu_len = bacfile_encode_property_apdu(&apdu[0],
&apdu[0],
object_instance, object_instance,
property, property, array_index, error_class, error_code);
array_index,
error_class, error_code);
} }
break; break;
#endif #endif
@@ -190,9 +157,11 @@ int Encode_Property_APDU(
return apdu_len; return apdu_len;
} }
void handler_read_property(uint8_t * service_request, void handler_read_property(
uint8_t * service_request,
uint16_t service_len, uint16_t service_len,
BACNET_ADDRESS * src, BACNET_CONFIRMED_SERVICE_DATA * service_data) BACNET_ADDRESS * src,
BACNET_CONFIRMED_SERVICE_DATA * service_data)
{ {
BACNET_READ_PROPERTY_DATA data; BACNET_READ_PROPERTY_DATA data;
int len = 0; int len = 0;
@@ -237,13 +206,10 @@ void handler_read_property(uint8_t * service_request,
/* assume that there is an error */ /* assume that there is an error */
error = true; error = true;
len = Encode_Property_APDU( len = Encode_Property_APDU(&Temp_Buf[0],
&Temp_Buf[0],
data.object_type, data.object_type,
data.object_instance, data.object_instance,
data.object_property, data.object_property, data.array_index, &error_class, &error_code);
data.array_index,
&error_class, &error_code);
if (len >= 0) { if (len >= 0) {
/* encode the APDU portion of the packet */ /* encode the APDU portion of the packet */
data.application_data = &Temp_Buf[0]; data.application_data = &Temp_Buf[0];
@@ -253,8 +219,7 @@ void handler_read_property(uint8_t * service_request,
rp_ack_encode_apdu(&Handler_Transmit_Buffer[pdu_len], rp_ack_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id, &data); service_data->invoke_id, &data);
#if PRINT_ENABLED #if PRINT_ENABLED
fprintf(stderr, fprintf(stderr, "RP: Sending Ack!\n");
"RP: Sending Ack!\n");
#endif #endif
error = false; error = false;
} }
@@ -276,7 +241,7 @@ void handler_read_property(uint8_t * service_request,
#endif #endif
} }
} }
RP_ABORT: RP_ABORT:
pdu_len += len; pdu_len += len;
bytes_sent = datalink_send_pdu(src, &npdu_data, bytes_sent = datalink_send_pdu(src, &npdu_data,
&Handler_Transmit_Buffer[0], pdu_len); &Handler_Transmit_Buffer[0], pdu_len);
bacnet-stack/demo/handler/h_rp_a.c
+7 -5
View File
@@ -42,7 +42,8 @@
#include "txbuf.h" #include "txbuf.h"
/* for debugging... */ /* for debugging... */
static void PrintReadPropertyData(BACNET_READ_PROPERTY_DATA * data) static void PrintReadPropertyData(
BACNET_READ_PROPERTY_DATA * data)
{ {
BACNET_APPLICATION_DATA_VALUE value; /* for decode value data */ BACNET_APPLICATION_DATA_VALUE value; /* for decode value data */
int len = 0; int len = 0;
@@ -95,17 +96,18 @@ static void PrintReadPropertyData(BACNET_READ_PROPERTY_DATA * data)
} }
} }
void handler_read_property_ack(uint8_t * service_request, void handler_read_property_ack(
uint8_t * service_request,
uint16_t service_len, uint16_t service_len,
BACNET_ADDRESS * src, BACNET_CONFIRMED_SERVICE_ACK_DATA * service_data) BACNET_ADDRESS * src,
BACNET_CONFIRMED_SERVICE_ACK_DATA * service_data)
{ {
int len = 0; int len = 0;
BACNET_READ_PROPERTY_DATA data; BACNET_READ_PROPERTY_DATA data;
(void) src; (void) src;
(void) service_data; /* we could use these... */ (void) service_data; /* we could use these... */
len = rp_ack_decode_service_request(service_request, len = rp_ack_decode_service_request(service_request, service_len, &data);
service_len, &data);
#if 0 #if 0
fprintf(stderr, "Received Read-Property Ack!\n"); fprintf(stderr, "Received Read-Property Ack!\n");
#endif #endif
bacnet-stack/demo/handler/h_rpm.c
+93 -140
View File
@@ -49,25 +49,24 @@
#include "lsp.h" #include "lsp.h"
#include "mso.h" #include "mso.h"
#if defined(BACFILE) #if defined(BACFILE)
#include "bacfile.h" #include "bacfile.h"
#endif #endif
static uint8_t Temp_Buf[MAX_APDU] = { 0 }; static uint8_t Temp_Buf[MAX_APDU] = { 0 };
struct property_list_t struct property_list_t {
{
const int *pList; const int *pList;
unsigned count; unsigned count;
}; };
struct special_property_list_t struct special_property_list_t {
{
struct property_list_t Required; struct property_list_t Required;
struct property_list_t Optional; struct property_list_t Optional;
struct property_list_t Proprietary; struct property_list_t Proprietary;
}; };
static unsigned property_list_count(const int *pList) static unsigned property_list_count(
const int *pList)
{ {
unsigned property_count = 0; unsigned property_count = 0;
@@ -91,50 +90,42 @@ static void RPM_Property_List(
pPropertyList->Proprietary.pList = NULL; pPropertyList->Proprietary.pList = NULL;
switch (object_type) { switch (object_type) {
case OBJECT_ANALOG_INPUT: case OBJECT_ANALOG_INPUT:
Analog_Input_Property_Lists( Analog_Input_Property_Lists(&pPropertyList->Required.pList,
&pPropertyList->Required.pList,
&pPropertyList->Optional.pList, &pPropertyList->Optional.pList,
&pPropertyList->Proprietary.pList); &pPropertyList->Proprietary.pList);
break; break;
case OBJECT_ANALOG_OUTPUT: case OBJECT_ANALOG_OUTPUT:
Analog_Output_Property_Lists( Analog_Output_Property_Lists(&pPropertyList->Required.pList,
&pPropertyList->Required.pList,
&pPropertyList->Optional.pList, &pPropertyList->Optional.pList,
&pPropertyList->Proprietary.pList); &pPropertyList->Proprietary.pList);
break; break;
case OBJECT_ANALOG_VALUE: case OBJECT_ANALOG_VALUE:
Analog_Value_Property_Lists( Analog_Value_Property_Lists(&pPropertyList->Required.pList,
&pPropertyList->Required.pList,
&pPropertyList->Optional.pList, &pPropertyList->Optional.pList,
&pPropertyList->Proprietary.pList); &pPropertyList->Proprietary.pList);
break; break;
case OBJECT_BINARY_INPUT: case OBJECT_BINARY_INPUT:
Binary_Input_Property_Lists( Binary_Input_Property_Lists(&pPropertyList->Required.pList,
&pPropertyList->Required.pList,
&pPropertyList->Optional.pList, &pPropertyList->Optional.pList,
&pPropertyList->Proprietary.pList); &pPropertyList->Proprietary.pList);
break; break;
case OBJECT_BINARY_OUTPUT: case OBJECT_BINARY_OUTPUT:
Binary_Output_Property_Lists( Binary_Output_Property_Lists(&pPropertyList->Required.pList,
&pPropertyList->Required.pList,
&pPropertyList->Optional.pList, &pPropertyList->Optional.pList,
&pPropertyList->Proprietary.pList); &pPropertyList->Proprietary.pList);
break; break;
case OBJECT_BINARY_VALUE: case OBJECT_BINARY_VALUE:
Binary_Value_Property_Lists( Binary_Value_Property_Lists(&pPropertyList->Required.pList,
&pPropertyList->Required.pList,
&pPropertyList->Optional.pList, &pPropertyList->Optional.pList,
&pPropertyList->Proprietary.pList); &pPropertyList->Proprietary.pList);
break; break;
case OBJECT_LIFE_SAFETY_POINT: case OBJECT_LIFE_SAFETY_POINT:
Life_Safety_Point_Property_Lists( Life_Safety_Point_Property_Lists(&pPropertyList->Required.pList,
&pPropertyList->Required.pList,
&pPropertyList->Optional.pList, &pPropertyList->Optional.pList,
&pPropertyList->Proprietary.pList); &pPropertyList->Proprietary.pList);
break; break;
case OBJECT_LOAD_CONTROL: case OBJECT_LOAD_CONTROL:
Load_Control_Property_Lists( Load_Control_Property_Lists(&pPropertyList->Required.pList,
&pPropertyList->Required.pList,
&pPropertyList->Optional.pList, &pPropertyList->Optional.pList,
&pPropertyList->Proprietary.pList); &pPropertyList->Proprietary.pList);
break; break;
@@ -142,15 +133,13 @@ static void RPM_Property_List(
break; break;
#if defined(BACFILE) #if defined(BACFILE)
case OBJECT_FILE: case OBJECT_FILE:
BACfile_Property_Lists( BACfile_Property_Lists(&pPropertyList->Required.pList,
&pPropertyList->Required.pList,
&pPropertyList->Optional.pList, &pPropertyList->Optional.pList,
&pPropertyList->Proprietary.pList); &pPropertyList->Proprietary.pList);
break; break;
#endif #endif
case OBJECT_DEVICE: case OBJECT_DEVICE:
Device_Property_Lists( Device_Property_Lists(&pPropertyList->Required.pList,
&pPropertyList->Required.pList,
&pPropertyList->Optional.pList, &pPropertyList->Optional.pList,
&pPropertyList->Proprietary.pList); &pPropertyList->Proprietary.pList);
break; break;
@@ -210,8 +199,7 @@ static unsigned RPM_Object_Property_Count(
if (special_property == PROP_ALL) { if (special_property == PROP_ALL) {
count = pPropertyList->Required.count + count = pPropertyList->Required.count +
pPropertyList->Optional.count + pPropertyList->Optional.count + pPropertyList->Proprietary.count;
pPropertyList->Proprietary.count;
} else if (special_property == PROP_REQUIRED) { } else if (special_property == PROP_REQUIRED) {
count = pPropertyList->Required.count; count = pPropertyList->Required.count;
} else if (special_property == PROP_OPTIONAL) { } else if (special_property == PROP_OPTIONAL) {
@@ -222,14 +210,19 @@ static unsigned RPM_Object_Property_Count(
} }
/* copy len bytes from src to offset of dest if there is enough space. */ /* copy len bytes from src to offset of dest if there is enough space. */
int apdu_copy(uint8_t *dest, uint8_t *src, int offset, int len, int max) int apdu_copy(
uint8_t * dest,
uint8_t * src,
int offset,
int len,
int max)
{ {
int i; int i;
int copy_len = 0; int copy_len = 0;
if (len <= (max-offset)) { if (len <= (max - offset)) {
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
dest[offset+i] = src[i]; dest[offset + i] = src[i];
copy_len++; copy_len++;
} }
} }
@@ -239,7 +232,8 @@ int apdu_copy(uint8_t *dest, uint8_t *src, int offset, int len, int max)
/* Encode the RPM property returning the length of the encoding, /* Encode the RPM property returning the length of the encoding,
or 0 if there is no room to fit the encoding. */ or 0 if there is no room to fit the encoding. */
int RPM_Encode_Property(uint8_t *apdu, int RPM_Encode_Property(
uint8_t * apdu,
uint16_t offset, uint16_t offset,
uint16_t max_apdu, uint16_t max_apdu,
BACNET_OBJECT_TYPE object_type, BACNET_OBJECT_TYPE object_type,
@@ -252,35 +246,30 @@ int RPM_Encode_Property(uint8_t *apdu,
BACNET_ERROR_CLASS error_class = ERROR_CLASS_OBJECT; BACNET_ERROR_CLASS error_class = ERROR_CLASS_OBJECT;
BACNET_ERROR_CODE error_code = ERROR_CODE_UNKNOWN_OBJECT; BACNET_ERROR_CODE error_code = ERROR_CODE_UNKNOWN_OBJECT;
len = rpm_ack_encode_apdu_object_property( len = rpm_ack_encode_apdu_object_property(&Temp_Buf[0],
&Temp_Buf[0], object_property, array_index);
object_property,
array_index);
len = apdu_copy(&apdu[0], &Temp_Buf[0], offset, len, max_apdu); len = apdu_copy(&apdu[0], &Temp_Buf[0], offset, len, max_apdu);
if (!len) if (!len)
return 0; return 0;
apdu_len += len; apdu_len += len;
len = Encode_Property_APDU( len = Encode_Property_APDU(&Temp_Buf[0],
&Temp_Buf[0],
object_type, object_type,
object_instance, object_instance,
object_property, object_property, array_index, &error_class, &error_code);
array_index,
&error_class, &error_code);
if (len < 0) { if (len < 0) {
/* error was returned - encode that for the response */ /* error was returned - encode that for the response */
len = rpm_ack_encode_apdu_object_property_error( len = rpm_ack_encode_apdu_object_property_error(&Temp_Buf[0],
&Temp_Buf[0],
error_class, error_code); error_class, error_code);
len = apdu_copy(&apdu[0], &Temp_Buf[0], offset+apdu_len, len, max_apdu); len =
apdu_copy(&apdu[0], &Temp_Buf[0], offset + apdu_len, len,
max_apdu);
if (!len) if (!len)
return 0; return 0;
} else if ((offset+apdu_len+1+len+1) < max_apdu) { } else if ((offset + apdu_len + 1 + len + 1) < max_apdu) {
/* enough room to fit the property value and tags */ /* enough room to fit the property value and tags */
len = rpm_ack_encode_apdu_object_property_value( len =
&apdu[offset+apdu_len], rpm_ack_encode_apdu_object_property_value(&apdu[offset + apdu_len],
&Temp_Buf[0], &Temp_Buf[0], len);
len);
} else { } else {
/* not enough room - abort! */ /* not enough room - abort! */
return 0; return 0;
@@ -311,16 +300,14 @@ void handler_read_property_multiple(
int32_t array_index = 0; int32_t array_index = 0;
/* jps_debug - see if we are utilizing all the buffer */ /* jps_debug - see if we are utilizing all the buffer */
/* memset(&Handler_Transmit_Buffer[0], 0xff, sizeof(Handler_Transmit_Buffer));*/ /* memset(&Handler_Transmit_Buffer[0], 0xff, sizeof(Handler_Transmit_Buffer)); */
/* encode the NPDU portion of the packet */ /* encode the NPDU portion of the packet */
datalink_get_my_address(&my_address); datalink_get_my_address(&my_address);
npdu_encode_npdu_data(&npdu_data, false, MESSAGE_PRIORITY_NORMAL); npdu_encode_npdu_data(&npdu_data, false, MESSAGE_PRIORITY_NORMAL);
npdu_len = npdu_encode_pdu( npdu_len = npdu_encode_pdu(&Handler_Transmit_Buffer[0],
&Handler_Transmit_Buffer[0],
src, &my_address, &npdu_data); src, &my_address, &npdu_data);
if (service_data->segmented_message) { if (service_data->segmented_message) {
apdu_len = abort_encode_apdu( apdu_len = abort_encode_apdu(&Handler_Transmit_Buffer[npdu_len],
&Handler_Transmit_Buffer[npdu_len],
service_data->invoke_id, service_data->invoke_id,
ABORT_REASON_SEGMENTATION_NOT_SUPPORTED, true); ABORT_REASON_SEGMENTATION_NOT_SUPPORTED, true);
#if PRINT_ENABLED #if PRINT_ENABLED
@@ -330,102 +317,82 @@ void handler_read_property_multiple(
} }
/* decode apdu request & encode apdu reply /* decode apdu request & encode apdu reply
encode complex ack, invoke id, service choice */ encode complex ack, invoke id, service choice */
apdu_len = rpm_ack_encode_apdu_init( apdu_len = rpm_ack_encode_apdu_init(&Handler_Transmit_Buffer[npdu_len],
&Handler_Transmit_Buffer[npdu_len],
service_data->invoke_id); service_data->invoke_id);
do do {
{ len = rpm_decode_object_id(&service_request[decode_len],
len = rpm_decode_object_id( service_len - decode_len, &object_type, &object_instance);
&service_request[decode_len],
service_len - decode_len,
&object_type, &object_instance);
/* end of object? */ /* end of object? */
if (len > 0) { if (len > 0) {
decode_len += len; decode_len += len;
} else { } else {
len = rpm_decode_object_end( len = rpm_decode_object_end(&service_request[decode_len],
&service_request[decode_len],
service_len - decode_len); service_len - decode_len);
if (len == 1) { if (len == 1) {
decode_len++; decode_len++;
len = rpm_ack_encode_apdu_object_end(&Temp_Buf[0]); len = rpm_ack_encode_apdu_object_end(&Temp_Buf[0]);
copy_len = apdu_copy( copy_len =
&Handler_Transmit_Buffer[npdu_len], &Temp_Buf[0], apdu_copy(&Handler_Transmit_Buffer[npdu_len], &Temp_Buf[0],
apdu_len, len, apdu_len, len, sizeof(Handler_Transmit_Buffer));
sizeof(Handler_Transmit_Buffer));
if (!copy_len) { if (!copy_len) {
apdu_len = abort_encode_apdu( apdu_len =
&Handler_Transmit_Buffer[npdu_len], abort_encode_apdu(&Handler_Transmit_Buffer[npdu_len],
service_data->invoke_id, service_data->invoke_id,
ABORT_REASON_SEGMENTATION_NOT_SUPPORTED, ABORT_REASON_SEGMENTATION_NOT_SUPPORTED, true);
true);
goto RPM_ABORT; goto RPM_ABORT;
} else { } else {
apdu_len += copy_len; apdu_len += copy_len;
} }
} else { } else {
apdu_len = abort_encode_apdu( apdu_len =
&Handler_Transmit_Buffer[npdu_len], abort_encode_apdu(&Handler_Transmit_Buffer[npdu_len],
service_data->invoke_id, service_data->invoke_id, ABORT_REASON_OTHER, true);
ABORT_REASON_OTHER, true);
goto RPM_ABORT; goto RPM_ABORT;
} }
break; break;
} }
len = rpm_ack_encode_apdu_object_begin( len = rpm_ack_encode_apdu_object_begin(&Temp_Buf[0],
&Temp_Buf[0],
object_type, object_instance); object_type, object_instance);
copy_len = apdu_copy( copy_len = apdu_copy(&Handler_Transmit_Buffer[npdu_len], &Temp_Buf[0],
&Handler_Transmit_Buffer[npdu_len], &Temp_Buf[0], apdu_len, len, sizeof(Handler_Transmit_Buffer));
apdu_len, len,
sizeof(Handler_Transmit_Buffer));
if (!copy_len) { if (!copy_len) {
apdu_len = abort_encode_apdu( apdu_len = abort_encode_apdu(&Handler_Transmit_Buffer[npdu_len],
&Handler_Transmit_Buffer[npdu_len],
service_data->invoke_id, service_data->invoke_id,
ABORT_REASON_SEGMENTATION_NOT_SUPPORTED, ABORT_REASON_SEGMENTATION_NOT_SUPPORTED, true);
true);
goto RPM_ABORT; goto RPM_ABORT;
} else { } else {
apdu_len += copy_len; apdu_len += copy_len;
} }
/* do each property of this object of the RPM request */ /* do each property of this object of the RPM request */
do do {
{ len = rpm_decode_object_property(&service_request[decode_len],
len = rpm_decode_object_property( service_len - decode_len, &object_property, &array_index);
&service_request[decode_len],
service_len - decode_len,
&object_property,
&array_index);
/* end of property list? */ /* end of property list? */
if (len > 0) { if (len > 0) {
decode_len += len; decode_len += len;
} else { } else {
len = rpm_decode_object_end( len = rpm_decode_object_end(&service_request[decode_len],
&service_request[decode_len],
service_len - decode_len); service_len - decode_len);
if (len == 1) { if (len == 1) {
decode_len++; decode_len++;
len = rpm_ack_encode_apdu_object_end(&Temp_Buf[0]); len = rpm_ack_encode_apdu_object_end(&Temp_Buf[0]);
copy_len = apdu_copy( copy_len =
&Handler_Transmit_Buffer[npdu_len], &Temp_Buf[0], apdu_copy(&Handler_Transmit_Buffer[npdu_len],
apdu_len, len, &Temp_Buf[0], apdu_len, len,
sizeof(Handler_Transmit_Buffer)); sizeof(Handler_Transmit_Buffer));
if (!copy_len) { if (!copy_len) {
apdu_len = abort_encode_apdu( apdu_len =
&Handler_Transmit_Buffer[npdu_len], abort_encode_apdu(&Handler_Transmit_Buffer
service_data->invoke_id, [npdu_len], service_data->invoke_id,
ABORT_REASON_SEGMENTATION_NOT_SUPPORTED, ABORT_REASON_SEGMENTATION_NOT_SUPPORTED, true);
true);
goto RPM_ABORT; goto RPM_ABORT;
} else { } else {
apdu_len += copy_len; apdu_len += copy_len;
} }
} else { } else {
apdu_len = abort_encode_apdu( apdu_len =
&Handler_Transmit_Buffer[npdu_len], abort_encode_apdu(&Handler_Transmit_Buffer[npdu_len],
service_data->invoke_id, service_data->invoke_id, ABORT_REASON_OTHER, true);
ABORT_REASON_OTHER, true);
goto RPM_ABORT; goto RPM_ABORT;
} }
/* stop decoding properties */ /* stop decoding properties */
@@ -434,8 +401,7 @@ void handler_read_property_multiple(
/* handle the special properties */ /* handle the special properties */
if ((object_property == PROP_ALL) || if ((object_property == PROP_ALL) ||
(object_property == PROP_REQUIRED) || (object_property == PROP_REQUIRED) ||
(object_property == PROP_OPTIONAL)) (object_property == PROP_OPTIONAL)) {
{
struct special_property_list_t property_list; struct special_property_list_t property_list;
unsigned property_count = 0; unsigned property_count = 0;
unsigned index = 0; unsigned index = 0;
@@ -443,63 +409,50 @@ void handler_read_property_multiple(
special_object_property = object_property; special_object_property = object_property;
RPM_Property_List(object_type, &property_list); RPM_Property_List(object_type, &property_list);
property_count = RPM_Object_Property_Count( property_count = RPM_Object_Property_Count(&property_list,
&property_list,
special_object_property); special_object_property);
for (index = 0; index < property_count; index++) for (index = 0; index < property_count; index++) {
{ object_property = RPM_Object_Property(&property_list,
object_property = RPM_Object_Property( special_object_property, index);
&property_list, len = RPM_Encode_Property(&Handler_Transmit_Buffer[0],
special_object_property,
index);
len = RPM_Encode_Property(
&Handler_Transmit_Buffer[0],
npdu_len + apdu_len, npdu_len + apdu_len,
sizeof(Handler_Transmit_Buffer), sizeof(Handler_Transmit_Buffer),
object_type, object_type,
object_instance, object_instance, object_property, array_index);
object_property,
array_index);
if (len > 0) { if (len > 0) {
apdu_len += len; apdu_len += len;
} else { } else {
apdu_len = abort_encode_apdu( apdu_len =
&Handler_Transmit_Buffer[npdu_len], abort_encode_apdu(&Handler_Transmit_Buffer
service_data->invoke_id, [npdu_len], service_data->invoke_id,
ABORT_REASON_SEGMENTATION_NOT_SUPPORTED, true); ABORT_REASON_SEGMENTATION_NOT_SUPPORTED, true);
goto RPM_ABORT; goto RPM_ABORT;
} }
} }
} else { } else {
/* handle an individual property */ /* handle an individual property */
len = RPM_Encode_Property( len = RPM_Encode_Property(&Handler_Transmit_Buffer[0],
&Handler_Transmit_Buffer[0],
npdu_len + apdu_len, npdu_len + apdu_len,
sizeof(Handler_Transmit_Buffer), sizeof(Handler_Transmit_Buffer),
object_type, object_type,
object_instance, object_instance, object_property, array_index);
object_property,
array_index);
if (len > 0) { if (len > 0) {
apdu_len += len; apdu_len += len;
} else { } else {
apdu_len = abort_encode_apdu( apdu_len =
&Handler_Transmit_Buffer[npdu_len], abort_encode_apdu(&Handler_Transmit_Buffer[npdu_len],
service_data->invoke_id, service_data->invoke_id,
ABORT_REASON_SEGMENTATION_NOT_SUPPORTED, true); ABORT_REASON_SEGMENTATION_NOT_SUPPORTED, true);
goto RPM_ABORT; goto RPM_ABORT;
} }
} }
} while(1); } while (1);
if (decode_len >= service_len) { if (decode_len >= service_len) {
break; break;
} }
} while(1); } while (1);
RPM_ABORT: RPM_ABORT:
pdu_len = apdu_len + npdu_len; pdu_len = apdu_len + npdu_len;
bytes_sent = datalink_send_pdu( bytes_sent = datalink_send_pdu(src,
src, &npdu_data, &Handler_Transmit_Buffer[0], pdu_len);
&npdu_data,
&Handler_Transmit_Buffer[0],
pdu_len);
} }
bacnet-stack/demo/handler/h_ts.c
+11 -6
View File
@@ -32,7 +32,9 @@
#include "timesync.h" #include "timesync.h"
#if PRINT_ENABLED #if PRINT_ENABLED
static void show_bacnet_date_time(BACNET_DATE * bdate, BACNET_TIME * btime) static void show_bacnet_date_time(
BACNET_DATE * bdate,
BACNET_TIME * btime)
{ {
/* show the date received */ /* show the date received */
fprintf(stderr, "%u", (unsigned) bdate->year); fprintf(stderr, "%u", (unsigned) bdate->year);
@@ -47,8 +49,10 @@ static void show_bacnet_date_time(BACNET_DATE * bdate, BACNET_TIME * btime)
} }
#endif #endif
void handler_timesync(uint8_t * service_request, void handler_timesync(
uint16_t service_len, BACNET_ADDRESS * src) uint8_t * service_request,
uint16_t service_len,
BACNET_ADDRESS * src)
{ {
int len = 0; int len = 0;
BACNET_DATE bdate; BACNET_DATE bdate;
@@ -67,8 +71,10 @@ void handler_timesync(uint8_t * service_request,
return; return;
} }
void handler_timesync_utc(uint8_t * service_request, void handler_timesync_utc(
uint16_t service_len, BACNET_ADDRESS * src) uint8_t * service_request,
uint16_t service_len,
BACNET_ADDRESS * src)
{ {
int len = 0; int len = 0;
BACNET_DATE bdate; BACNET_DATE bdate;
@@ -86,4 +92,3 @@ void handler_timesync_utc(uint8_t * service_request,
return; return;
} }
bacnet-stack/demo/handler/h_whohas.c
+7 -8
View File
@@ -35,8 +35,10 @@
#include "device.h" #include "device.h"
#include "client.h" #include "client.h"
void handler_who_has(uint8_t * service_request, void handler_who_has(
uint16_t service_len, BACNET_ADDRESS * src) uint8_t * service_request,
uint16_t service_len,
BACNET_ADDRESS * src)
{ {
int len = 0; int len = 0;
BACNET_WHO_HAS_DATA data; BACNET_WHO_HAS_DATA data;
@@ -47,15 +49,12 @@ void handler_who_has(uint8_t * service_request,
bool found = false; bool found = false;
(void) src; (void) src;
len = whohas_decode_service_request(service_request, len = whohas_decode_service_request(service_request, service_len, &data);
service_len, &data);
if (len > 0) { if (len > 0) {
if ((data.low_limit == -1) || (data.high_limit == -1)) if ((data.low_limit == -1) || (data.high_limit == -1))
directed_to_me = true; directed_to_me = true;
else if ((Device_Object_Instance_Number() >= else if ((Device_Object_Instance_Number() >= (uint32_t) data.low_limit)
(uint32_t) data.low_limit) && (Device_Object_Instance_Number() <= (uint32_t) data.high_limit))
&& (Device_Object_Instance_Number() <=
(uint32_t) data.high_limit))
directed_to_me = true; directed_to_me = true;
if (directed_to_me) { if (directed_to_me) {
/* do we have such an object? If so, send an I-Have. /* do we have such an object? If so, send an I-Have.
bacnet-stack/demo/handler/h_whois.c
+4 -2
View File
@@ -37,8 +37,10 @@
#include "client.h" #include "client.h"
#include "txbuf.h" #include "txbuf.h"
void handler_who_is(uint8_t * service_request, void handler_who_is(
uint16_t service_len, BACNET_ADDRESS * src) uint8_t * service_request,
uint16_t service_len,
BACNET_ADDRESS * src)
{ {
int len = 0; int len = 0;
int32_t low_limit = 0; int32_t low_limit = 0;
bacnet-stack/demo/handler/h_wp.c
+35 -62
View File
@@ -47,12 +47,14 @@
#include "lsp.h" #include "lsp.h"
#include "mso.h" #include "mso.h"
#if defined(BACFILE) #if defined(BACFILE)
#include "bacfile.h" #include "bacfile.h"
#endif #endif
void handler_write_property(uint8_t * service_request, void handler_write_property(
uint8_t * service_request,
uint16_t service_len, uint16_t service_len,
BACNET_ADDRESS * src, BACNET_CONFIRMED_SERVICE_DATA * service_data) BACNET_ADDRESS * src,
BACNET_CONFIRMED_SERVICE_DATA * service_data)
{ {
BACNET_WRITE_PROPERTY_DATA wp_data; BACNET_WRITE_PROPERTY_DATA wp_data;
int len = 0; int len = 0;
@@ -80,8 +82,7 @@ void handler_write_property(uint8_t * service_request,
#endif #endif
goto WP_ABORT; goto WP_ABORT;
} /* decode the service request only */ } /* decode the service request only */
len = wp_decode_service_request(service_request, len = wp_decode_service_request(service_request, service_len, &wp_data);
service_len, &wp_data);
#if PRINT_ENABLED #if PRINT_ENABLED
if (len > 0) if (len > 0)
fprintf(stderr, "WP: type=%u instance=%u property=%u index=%d\n", fprintf(stderr, "WP: type=%u instance=%u property=%u index=%d\n",
@@ -105,21 +106,17 @@ void handler_write_property(uint8_t * service_request,
if (Device_Write_Property(&wp_data, &error_class, &error_code)) { if (Device_Write_Property(&wp_data, &error_class, &error_code)) {
len = len =
encode_simple_ack(&Handler_Transmit_Buffer[pdu_len], encode_simple_ack(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id, service_data->invoke_id, SERVICE_CONFIRMED_WRITE_PROPERTY);
SERVICE_CONFIRMED_WRITE_PROPERTY);
#if PRINT_ENABLED #if PRINT_ENABLED
fprintf(stderr, fprintf(stderr, "WP: Sending Simple Ack for Device!\n");
"WP: Sending Simple Ack for Device!\n");
#endif #endif
} else { } else {
len = len =
bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len], bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id, service_data->invoke_id,
SERVICE_CONFIRMED_WRITE_PROPERTY, error_class, SERVICE_CONFIRMED_WRITE_PROPERTY, error_class, error_code);
error_code);
#if PRINT_ENABLED #if PRINT_ENABLED
fprintf(stderr, fprintf(stderr, "WP: Sending Error for Device!\n");
"WP: Sending Error for Device!\n");
#endif #endif
} }
break; break;
@@ -140,18 +137,15 @@ void handler_write_property(uint8_t * service_request,
&error_code)) { &error_code)) {
len = len =
encode_simple_ack(&Handler_Transmit_Buffer[pdu_len], encode_simple_ack(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id, service_data->invoke_id, SERVICE_CONFIRMED_WRITE_PROPERTY);
SERVICE_CONFIRMED_WRITE_PROPERTY);
#if PRINT_ENABLED #if PRINT_ENABLED
fprintf(stderr, fprintf(stderr, "WP: Sending Simple Ack for BO!\n");
"WP: Sending Simple Ack for BO!\n");
#endif #endif
} else { } else {
len = len =
bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len], bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id, service_data->invoke_id,
SERVICE_CONFIRMED_WRITE_PROPERTY, error_class, SERVICE_CONFIRMED_WRITE_PROPERTY, error_class, error_code);
error_code);
#if PRINT_ENABLED #if PRINT_ENABLED
fprintf(stderr, "WP: Sending Write Access Error for BO!\n"); fprintf(stderr, "WP: Sending Write Access Error for BO!\n");
#endif #endif
@@ -162,18 +156,15 @@ void handler_write_property(uint8_t * service_request,
&error_code)) { &error_code)) {
len = len =
encode_simple_ack(&Handler_Transmit_Buffer[pdu_len], encode_simple_ack(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id, service_data->invoke_id, SERVICE_CONFIRMED_WRITE_PROPERTY);
SERVICE_CONFIRMED_WRITE_PROPERTY);
#if PRINT_ENABLED #if PRINT_ENABLED
fprintf(stderr, fprintf(stderr, "WP: Sending Simple Ack for BV!\n");
"WP: Sending Simple Ack for BV!\n");
#endif #endif
} else { } else {
len = len =
bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len], bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id, service_data->invoke_id,
SERVICE_CONFIRMED_WRITE_PROPERTY, error_class, SERVICE_CONFIRMED_WRITE_PROPERTY, error_class, error_code);
error_code);
#if PRINT_ENABLED #if PRINT_ENABLED
fprintf(stderr, "WP: Sending Write Access Error for BV!\n"); fprintf(stderr, "WP: Sending Write Access Error for BV!\n");
#endif #endif
@@ -184,18 +175,15 @@ void handler_write_property(uint8_t * service_request,
&error_code)) { &error_code)) {
len = len =
encode_simple_ack(&Handler_Transmit_Buffer[pdu_len], encode_simple_ack(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id, service_data->invoke_id, SERVICE_CONFIRMED_WRITE_PROPERTY);
SERVICE_CONFIRMED_WRITE_PROPERTY);
#if PRINT_ENABLED #if PRINT_ENABLED
fprintf(stderr, fprintf(stderr, "WP: Sending Simple Ack for AO!\n");
"WP: Sending Simple Ack for AO!\n");
#endif #endif
} else { } else {
len = len =
bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len], bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id, service_data->invoke_id,
SERVICE_CONFIRMED_WRITE_PROPERTY, error_class, SERVICE_CONFIRMED_WRITE_PROPERTY, error_class, error_code);
error_code);
#if PRINT_ENABLED #if PRINT_ENABLED
fprintf(stderr, "WP: Sending Write Access Error for AO!\n"); fprintf(stderr, "WP: Sending Write Access Error for AO!\n");
#endif #endif
@@ -206,18 +194,15 @@ void handler_write_property(uint8_t * service_request,
&error_code)) { &error_code)) {
len = len =
encode_simple_ack(&Handler_Transmit_Buffer[pdu_len], encode_simple_ack(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id, service_data->invoke_id, SERVICE_CONFIRMED_WRITE_PROPERTY);
SERVICE_CONFIRMED_WRITE_PROPERTY);
#if PRINT_ENABLED #if PRINT_ENABLED
fprintf(stderr, fprintf(stderr, "WP: Sending Simple Ack for AV!\n");
"WP: Sending Simple Ack for AV!\n");
#endif #endif
} else { } else {
len = len =
bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len], bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id, service_data->invoke_id,
SERVICE_CONFIRMED_WRITE_PROPERTY, error_class, SERVICE_CONFIRMED_WRITE_PROPERTY, error_class, error_code);
error_code);
#if PRINT_ENABLED #if PRINT_ENABLED
fprintf(stderr, "WP: Sending Write Access Error for AV!\n"); fprintf(stderr, "WP: Sending Write Access Error for AV!\n");
#endif #endif
@@ -228,18 +213,15 @@ void handler_write_property(uint8_t * service_request,
&error_code)) { &error_code)) {
len = len =
encode_simple_ack(&Handler_Transmit_Buffer[pdu_len], encode_simple_ack(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id, service_data->invoke_id, SERVICE_CONFIRMED_WRITE_PROPERTY);
SERVICE_CONFIRMED_WRITE_PROPERTY);
#if PRINT_ENABLED #if PRINT_ENABLED
fprintf(stderr, fprintf(stderr, "WP: Sending Simple Ack for LSP!\n");
"WP: Sending Simple Ack for LSP!\n");
#endif #endif
} else { } else {
len = len =
bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len], bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id, service_data->invoke_id,
SERVICE_CONFIRMED_WRITE_PROPERTY, error_class, SERVICE_CONFIRMED_WRITE_PROPERTY, error_class, error_code);
error_code);
#if PRINT_ENABLED #if PRINT_ENABLED
fprintf(stderr, "WP: Sending Write Access Error for LSP!\n"); fprintf(stderr, "WP: Sending Write Access Error for LSP!\n");
#endif #endif
@@ -250,18 +232,15 @@ void handler_write_property(uint8_t * service_request,
&error_code)) { &error_code)) {
len = len =
encode_simple_ack(&Handler_Transmit_Buffer[pdu_len], encode_simple_ack(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id, service_data->invoke_id, SERVICE_CONFIRMED_WRITE_PROPERTY);
SERVICE_CONFIRMED_WRITE_PROPERTY);
#if PRINT_ENABLED #if PRINT_ENABLED
fprintf(stderr, fprintf(stderr, "WP: Sending Simple Ack for Load Control!\n");
"WP: Sending Simple Ack for Load Control!\n");
#endif #endif
} else { } else {
len = len =
bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len], bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id, service_data->invoke_id,
SERVICE_CONFIRMED_WRITE_PROPERTY, error_class, SERVICE_CONFIRMED_WRITE_PROPERTY, error_class, error_code);
error_code);
#if PRINT_ENABLED #if PRINT_ENABLED
fprintf(stderr, fprintf(stderr,
"WP: Sending Write Access Error for Load Control!\n"); "WP: Sending Write Access Error for Load Control!\n");
@@ -273,8 +252,7 @@ void handler_write_property(uint8_t * service_request,
&error_code)) { &error_code)) {
len = len =
encode_simple_ack(&Handler_Transmit_Buffer[pdu_len], encode_simple_ack(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id, service_data->invoke_id, SERVICE_CONFIRMED_WRITE_PROPERTY);
SERVICE_CONFIRMED_WRITE_PROPERTY);
#if PRINT_ENABLED #if PRINT_ENABLED
fprintf(stderr, fprintf(stderr,
"WP: Sending Write Property Simple Ack for MSO!\n"); "WP: Sending Write Property Simple Ack for MSO!\n");
@@ -283,8 +261,7 @@ void handler_write_property(uint8_t * service_request,
len = len =
bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len], bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id, service_data->invoke_id,
SERVICE_CONFIRMED_WRITE_PROPERTY, error_class, SERVICE_CONFIRMED_WRITE_PROPERTY, error_class, error_code);
error_code);
#if PRINT_ENABLED #if PRINT_ENABLED
fprintf(stderr, "WP: Sending Write Access Error for MSO!\n"); fprintf(stderr, "WP: Sending Write Access Error for MSO!\n");
#endif #endif
@@ -292,22 +269,18 @@ void handler_write_property(uint8_t * service_request,
break; break;
#if defined(BACFILE) #if defined(BACFILE)
case OBJECT_FILE: case OBJECT_FILE:
if (bacfile_write_property(&wp_data, &error_class, if (bacfile_write_property(&wp_data, &error_class, &error_code)) {
&error_code)) {
len = len =
encode_simple_ack(&Handler_Transmit_Buffer[pdu_len], encode_simple_ack(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id, service_data->invoke_id, SERVICE_CONFIRMED_WRITE_PROPERTY);
SERVICE_CONFIRMED_WRITE_PROPERTY);
#if PRINT_ENABLED #if PRINT_ENABLED
fprintf(stderr, fprintf(stderr, "WP: Sending Simple Ack for File!\n");
"WP: Sending Simple Ack for File!\n");
#endif #endif
} else { } else {
len = len =
bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len], bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id, service_data->invoke_id,
SERVICE_CONFIRMED_WRITE_PROPERTY, error_class, SERVICE_CONFIRMED_WRITE_PROPERTY, error_class, error_code);
error_code);
#if PRINT_ENABLED #if PRINT_ENABLED
fprintf(stderr, "WP: Sending Write Access Error for File!\n"); fprintf(stderr, "WP: Sending Write Access Error for File!\n");
#endif #endif
@@ -324,7 +297,7 @@ void handler_write_property(uint8_t * service_request,
#endif #endif
break; break;
} }
WP_ABORT: WP_ABORT:
pdu_len += len; pdu_len += len;
bytes_sent = datalink_send_pdu(src, &npdu_data, bytes_sent = datalink_send_pdu(src, &npdu_data,
&Handler_Transmit_Buffer[0], pdu_len); &Handler_Transmit_Buffer[0], pdu_len);
bacnet-stack/demo/handler/noserv.c
+4 -2
View File
@@ -34,9 +34,11 @@
#include "npdu.h" #include "npdu.h"
#include "reject.h" #include "reject.h"
void handler_unrecognized_service(uint8_t * service_request, void handler_unrecognized_service(
uint8_t * service_request,
uint16_t service_len, uint16_t service_len,
BACNET_ADDRESS * src, BACNET_CONFIRMED_SERVICE_DATA * service_data) BACNET_ADDRESS * src,
BACNET_CONFIRMED_SERVICE_DATA * service_data)
{ {
int len = 0; int len = 0;
int pdu_len = 0; int pdu_len = 0;
bacnet-stack/demo/handler/s_arfs.c
+4 -2
View File
@@ -42,9 +42,11 @@
#include "handlers.h" #include "handlers.h"
#include "txbuf.h" #include "txbuf.h"
uint8_t Send_Atomic_Read_File_Stream(uint32_t device_id, uint8_t Send_Atomic_Read_File_Stream(
uint32_t device_id,
uint32_t file_instance, uint32_t file_instance,
int fileStartPosition, unsigned requestedOctetCount) int fileStartPosition,
unsigned requestedOctetCount)
{ {
BACNET_ADDRESS dest; BACNET_ADDRESS dest;
BACNET_ADDRESS my_address; BACNET_ADDRESS my_address;
bacnet-stack/demo/handler/s_awfs.c
+6 -6
View File
@@ -42,9 +42,11 @@
#include "handlers.h" #include "handlers.h"
#include "txbuf.h" #include "txbuf.h"
uint8_t Send_Atomic_Write_File_Stream(uint32_t device_id, uint8_t Send_Atomic_Write_File_Stream(
uint32_t device_id,
uint32_t file_instance, uint32_t file_instance,
int fileStartPosition, BACNET_OCTET_STRING * fileData) int fileStartPosition,
BACNET_OCTET_STRING * fileData)
{ {
BACNET_ADDRESS dest; BACNET_ADDRESS dest;
BACNET_ADDRESS my_address; BACNET_ADDRESS my_address;
@@ -76,8 +78,7 @@ uint8_t Send_Atomic_Write_File_Stream(uint32_t device_id,
if (status) { if (status) {
/* encode the NPDU portion of the packet */ /* encode the NPDU portion of the packet */
datalink_get_my_address(&my_address); datalink_get_my_address(&my_address);
npdu_encode_npdu_data(&npdu_data, true, npdu_encode_npdu_data(&npdu_data, true, MESSAGE_PRIORITY_NORMAL);
MESSAGE_PRIORITY_NORMAL);
pdu_len = pdu_len =
npdu_encode_pdu(&Handler_Transmit_Buffer[0], &dest, npdu_encode_pdu(&Handler_Transmit_Buffer[0], &dest,
&my_address, &npdu_data); &my_address, &npdu_data);
@@ -116,8 +117,7 @@ uint8_t Send_Atomic_Write_File_Stream(uint32_t device_id,
invoke_id = 0; invoke_id = 0;
#if PRINT_ENABLED #if PRINT_ENABLED
fprintf(stderr, "Failed to Send AtomicWriteFile Request " fprintf(stderr, "Failed to Send AtomicWriteFile Request "
"(payload [%d] exceeds octet string capacity)!\n", "(payload [%d] exceeds octet string capacity)!\n", pdu_len);
pdu_len);
#endif #endif
} }
} }
bacnet-stack/demo/handler/s_dcc.c
+5 -2
View File
@@ -42,8 +42,11 @@
#include "handlers.h" #include "handlers.h"
#include "txbuf.h" #include "txbuf.h"
uint8_t Send_Device_Communication_Control_Request(uint32_t device_id, uint16_t timeDuration, /* 0=optional */ uint8_t Send_Device_Communication_Control_Request(
BACNET_COMMUNICATION_ENABLE_DISABLE state, char *password) uint32_t device_id,
uint16_t timeDuration, /* 0=optional */
BACNET_COMMUNICATION_ENABLE_DISABLE state,
char *password)
{ /* NULL=optional */ { /* NULL=optional */
BACNET_ADDRESS dest; BACNET_ADDRESS dest;
BACNET_ADDRESS my_address; BACNET_ADDRESS my_address;
bacnet-stack/demo/handler/s_ihave.c
+4 -2
View File
@@ -44,9 +44,11 @@
#include "txbuf.h" #include "txbuf.h"
/* find a specific device, or use -1 for limit if you want unlimited */ /* find a specific device, or use -1 for limit if you want unlimited */
void Send_I_Have(uint32_t device_id, void Send_I_Have(
uint32_t device_id,
BACNET_OBJECT_TYPE object_type, BACNET_OBJECT_TYPE object_type,
uint32_t object_instance, char *object_name) uint32_t object_instance,
char *object_name)
{ {
int len = 0; int len = 0;
int pdu_len = 0; int pdu_len = 0;
bacnet-stack/demo/handler/s_rd.c
+4 -2
View File
@@ -42,8 +42,10 @@
#include "handlers.h" #include "handlers.h"
#include "txbuf.h" #include "txbuf.h"
uint8_t Send_Reinitialize_Device_Request(uint32_t device_id, uint8_t Send_Reinitialize_Device_Request(
BACNET_REINITIALIZED_STATE state, char *password) uint32_t device_id,
BACNET_REINITIALIZED_STATE state,
char *password)
{ {
BACNET_ADDRESS dest; BACNET_ADDRESS dest;
BACNET_ADDRESS my_address; BACNET_ADDRESS my_address;
bacnet-stack/demo/handler/s_rp.c
+5 -4
View File
@@ -44,10 +44,12 @@
#include "txbuf.h" #include "txbuf.h"
/* returns invoke id of 0 if device is not bound or no tsm available */ /* returns invoke id of 0 if device is not bound or no tsm available */
uint8_t Send_Read_Property_Request(uint32_t device_id, /* destination device */ uint8_t Send_Read_Property_Request(
uint32_t device_id, /* destination device */
BACNET_OBJECT_TYPE object_type, BACNET_OBJECT_TYPE object_type,
uint32_t object_instance, uint32_t object_instance,
BACNET_PROPERTY_ID object_property, int32_t array_index) BACNET_PROPERTY_ID object_property,
int32_t array_index)
{ {
BACNET_ADDRESS dest; BACNET_ADDRESS dest;
BACNET_ADDRESS my_address; BACNET_ADDRESS my_address;
@@ -89,8 +91,7 @@ uint8_t Send_Read_Property_Request(uint32_t device_id, /* destination device */
max_apdu in the address binding table. */ max_apdu in the address binding table. */
if ((unsigned) pdu_len < max_apdu) { if ((unsigned) pdu_len < max_apdu) {
tsm_set_confirmed_unsegmented_transaction(invoke_id, &dest, tsm_set_confirmed_unsegmented_transaction(invoke_id, &dest,
&npdu_data, &Handler_Transmit_Buffer[0], &npdu_data, &Handler_Transmit_Buffer[0], (uint16_t) pdu_len);
(uint16_t) pdu_len);
bytes_sent = bytes_sent =
datalink_send_pdu(&dest, &npdu_data, datalink_send_pdu(&dest, &npdu_data,
&Handler_Transmit_Buffer[0], pdu_len); &Handler_Transmit_Buffer[0], pdu_len);
bacnet-stack/demo/handler/s_ts.c
+6 -2
View File
@@ -42,7 +42,9 @@
#include "handlers.h" #include "handlers.h"
#include "txbuf.h" #include "txbuf.h"
void Send_TimeSync(BACNET_DATE * bdate, BACNET_TIME * btime) void Send_TimeSync(
BACNET_DATE * bdate,
BACNET_TIME * btime)
{ {
int len = 0; int len = 0;
int pdu_len = 0; int pdu_len = 0;
@@ -74,7 +76,9 @@ void Send_TimeSync(BACNET_DATE * bdate, BACNET_TIME * btime)
#endif #endif
} }
void Send_TimeSyncUTC(BACNET_DATE * bdate, BACNET_TIME * btime) void Send_TimeSyncUTC(
BACNET_DATE * bdate,
BACNET_TIME * btime)
{ {
int pdu_len = 0; int pdu_len = 0;
BACNET_ADDRESS dest; BACNET_ADDRESS dest;
bacnet-stack/demo/handler/s_whohas.c
+8 -4
View File
@@ -43,8 +43,10 @@
#include "txbuf.h" #include "txbuf.h"
/* find a specific device, or use -1 for limit if you want unlimited */ /* find a specific device, or use -1 for limit if you want unlimited */
void Send_WhoHas_Name(int32_t low_limit, void Send_WhoHas_Name(
int32_t high_limit, char *object_name) int32_t low_limit,
int32_t high_limit,
char *object_name)
{ {
int len = 0; int len = 0;
int pdu_len = 0; int pdu_len = 0;
@@ -80,9 +82,11 @@ void Send_WhoHas_Name(int32_t low_limit,
} }
/* find a specific device, or use -1 for limit if you want unlimited */ /* find a specific device, or use -1 for limit if you want unlimited */
void Send_WhoHas_Object(int32_t low_limit, void Send_WhoHas_Object(
int32_t low_limit,
int32_t high_limit, int32_t high_limit,
BACNET_OBJECT_TYPE object_type, uint32_t object_instance) BACNET_OBJECT_TYPE object_type,
uint32_t object_instance)
{ {
int len = 0; int len = 0;
int pdu_len = 0; int pdu_len = 0;
bacnet-stack/demo/handler/s_whois.c
+3 -1
View File
@@ -44,7 +44,9 @@
#include "txbuf.h" #include "txbuf.h"
/* find a specific device, or use -1 for limit if you want unlimited */ /* find a specific device, or use -1 for limit if you want unlimited */
void Send_WhoIs(int32_t low_limit, int32_t high_limit) void Send_WhoIs(
int32_t low_limit,
int32_t high_limit)
{ {
int len = 0; int len = 0;
int pdu_len = 0; int pdu_len = 0;
bacnet-stack/demo/handler/s_wp.c
+14 -10
View File
@@ -44,12 +44,15 @@
#include "txbuf.h" #include "txbuf.h"
/* returns the invoke ID for confirmed request, or zero on failure */ /* returns the invoke ID for confirmed request, or zero on failure */
uint8_t Send_Write_Property_Request_Data(uint32_t device_id, uint8_t Send_Write_Property_Request_Data(
uint32_t device_id,
BACNET_OBJECT_TYPE object_type, BACNET_OBJECT_TYPE object_type,
uint32_t object_instance, uint32_t object_instance,
BACNET_PROPERTY_ID object_property, BACNET_PROPERTY_ID object_property,
uint8_t * application_data, uint8_t * application_data,
int application_data_len, uint8_t priority, int32_t array_index) int application_data_len,
uint8_t priority,
int32_t array_index)
{ {
BACNET_ADDRESS dest; BACNET_ADDRESS dest;
BACNET_ADDRESS my_address; BACNET_ADDRESS my_address;
@@ -95,8 +98,7 @@ uint8_t Send_Write_Property_Request_Data(uint32_t device_id,
max_apdu in the address binding table. */ max_apdu in the address binding table. */
if ((unsigned) pdu_len < max_apdu) { if ((unsigned) pdu_len < max_apdu) {
tsm_set_confirmed_unsegmented_transaction(invoke_id, &dest, tsm_set_confirmed_unsegmented_transaction(invoke_id, &dest,
&npdu_data, &Handler_Transmit_Buffer[0], &npdu_data, &Handler_Transmit_Buffer[0], (uint16_t) pdu_len);
(uint16_t) pdu_len);
bytes_sent = bytes_sent =
datalink_send_pdu(&dest, &npdu_data, datalink_send_pdu(&dest, &npdu_data,
&Handler_Transmit_Buffer[0], pdu_len); &Handler_Transmit_Buffer[0], pdu_len);
@@ -119,12 +121,14 @@ uint8_t Send_Write_Property_Request_Data(uint32_t device_id,
return invoke_id; return invoke_id;
} }
uint8_t Send_Write_Property_Request(uint32_t device_id, uint8_t Send_Write_Property_Request(
uint32_t device_id,
BACNET_OBJECT_TYPE object_type, BACNET_OBJECT_TYPE object_type,
uint32_t object_instance, uint32_t object_instance,
BACNET_PROPERTY_ID object_property, BACNET_PROPERTY_ID object_property,
BACNET_APPLICATION_DATA_VALUE * object_value, BACNET_APPLICATION_DATA_VALUE * object_value,
uint8_t priority, int32_t array_index) uint8_t priority,
int32_t array_index)
{ {
uint8_t application_data[MAX_APDU] = { 0 }; uint8_t application_data[MAX_APDU] = { 0 };
int apdu_len = 0, len = 0; int apdu_len = 0, len = 0;
@@ -133,11 +137,11 @@ uint8_t Send_Write_Property_Request(uint32_t device_id,
#if PRINT_ENABLED_DEBUG #if PRINT_ENABLED_DEBUG
fprintf(stderr, "WriteProperty service: " fprintf(stderr, "WriteProperty service: "
"%s tag=%d\n", "%s tag=%d\n",
(object_value->context_specific?"context":"application"), (object_value->context_specific ? "context" : "application"),
(int)(object_value->context_specific?object_value->context_tag:object_value->tag) ); (int) (object_value->context_specific ? object_value->
context_tag : object_value->tag));
#endif #endif
len = bacapp_encode_data(&application_data[apdu_len], len = bacapp_encode_data(&application_data[apdu_len], object_value);
object_value);
if ((len + apdu_len) < MAX_APDU) { if ((len + apdu_len) < MAX_APDU) {
apdu_len += len; apdu_len += len;
} else { } else {
bacnet-stack/demo/object/ai.c
+28 -20
View File
@@ -36,8 +36,7 @@
#define MAX_ANALOG_INPUTS 7 #define MAX_ANALOG_INPUTS 7
/* These three arrays are used by the ReadPropertyMultiple handler */ /* These three arrays are used by the ReadPropertyMultiple handler */
static const int Analog_Input_Properties_Required[] = static const int Analog_Input_Properties_Required[] = {
{
PROP_OBJECT_IDENTIFIER, PROP_OBJECT_IDENTIFIER,
PROP_OBJECT_NAME, PROP_OBJECT_NAME,
PROP_OBJECT_TYPE, PROP_OBJECT_TYPE,
@@ -49,14 +48,12 @@ static const int Analog_Input_Properties_Required[] =
-1 -1
}; };
static const int Analog_Input_Properties_Optional[] = static const int Analog_Input_Properties_Optional[] = {
{
PROP_DESCRIPTION, PROP_DESCRIPTION,
-1 -1
}; };
static const int Analog_Input_Properties_Proprietary[] = static const int Analog_Input_Properties_Proprietary[] = {
{
9997, 9997,
9998, 9998,
9999, 9999,
@@ -81,7 +78,8 @@ void Analog_Input_Property_Lists(
/* we simply have 0-n object instances. Yours might be */ /* we simply have 0-n object instances. Yours might be */
/* more complex, and then you need validate that the */ /* more complex, and then you need validate that the */
/* given instance exists */ /* given instance exists */
bool Analog_Input_Valid_Instance(uint32_t object_instance) bool Analog_Input_Valid_Instance(
uint32_t object_instance)
{ {
if (object_instance < MAX_ANALOG_INPUTS) if (object_instance < MAX_ANALOG_INPUTS)
return true; return true;
@@ -91,7 +89,8 @@ bool Analog_Input_Valid_Instance(uint32_t object_instance)
/* we simply have 0-n object instances. Yours might be */ /* we simply have 0-n object instances. Yours might be */
/* more complex, and then count how many you have */ /* more complex, and then count how many you have */
unsigned Analog_Input_Count(void) unsigned Analog_Input_Count(
void)
{ {
return MAX_ANALOG_INPUTS; return MAX_ANALOG_INPUTS;
} }
@@ -99,12 +98,14 @@ unsigned Analog_Input_Count(void)
/* we simply have 0-n object instances. Yours might be */ /* we simply have 0-n object instances. Yours might be */
/* more complex, and then you need to return the instance */ /* more complex, and then you need to return the instance */
/* that correlates to the correct index */ /* that correlates to the correct index */
uint32_t Analog_Input_Index_To_Instance(unsigned index) uint32_t Analog_Input_Index_To_Instance(
unsigned index)
{ {
return index; return index;
} }
char *Analog_Input_Name(uint32_t object_instance) char *Analog_Input_Name(
uint32_t object_instance)
{ {
static char text_string[32] = ""; /* okay for single thread */ static char text_string[32] = ""; /* okay for single thread */
@@ -118,11 +119,13 @@ char *Analog_Input_Name(uint32_t object_instance)
/* return apdu length, or -1 on error */ /* return apdu length, or -1 on error */
/* assumption - object has already exists */ /* assumption - object has already exists */
int Analog_Input_Encode_Property_APDU(uint8_t * apdu, int Analog_Input_Encode_Property_APDU(
uint8_t * apdu,
uint32_t object_instance, uint32_t object_instance,
BACNET_PROPERTY_ID property, BACNET_PROPERTY_ID property,
int32_t array_index, int32_t array_index,
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code) BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code)
{ {
int apdu_len = 0; /* return value */ int apdu_len = 0; /* return value */
BACNET_BIT_STRING bit_string; BACNET_BIT_STRING bit_string;
@@ -132,17 +135,20 @@ int Analog_Input_Encode_Property_APDU(uint8_t * apdu,
(void) array_index; (void) array_index;
switch (property) { switch (property) {
case PROP_OBJECT_IDENTIFIER: case PROP_OBJECT_IDENTIFIER:
apdu_len = encode_application_object_id(&apdu[0], OBJECT_ANALOG_INPUT, apdu_len =
encode_application_object_id(&apdu[0], OBJECT_ANALOG_INPUT,
object_instance); object_instance);
break; break;
case PROP_OBJECT_NAME: case PROP_OBJECT_NAME:
case PROP_DESCRIPTION: case PROP_DESCRIPTION:
characterstring_init_ansi(&char_string, characterstring_init_ansi(&char_string,
Analog_Input_Name(object_instance)); Analog_Input_Name(object_instance));
apdu_len = encode_application_character_string(&apdu[0], &char_string); apdu_len =
encode_application_character_string(&apdu[0], &char_string);
break; break;
case PROP_OBJECT_TYPE: case PROP_OBJECT_TYPE:
apdu_len = encode_application_enumerated(&apdu[0], OBJECT_ANALOG_INPUT); apdu_len =
encode_application_enumerated(&apdu[0], OBJECT_ANALOG_INPUT);
break; break;
case PROP_PRESENT_VALUE: case PROP_PRESENT_VALUE:
apdu_len = encode_application_real(&apdu[0], value); apdu_len = encode_application_real(&apdu[0], value);
@@ -156,7 +162,8 @@ int Analog_Input_Encode_Property_APDU(uint8_t * apdu,
apdu_len = encode_application_bitstring(&apdu[0], &bit_string); apdu_len = encode_application_bitstring(&apdu[0], &bit_string);
break; break;
case PROP_EVENT_STATE: case PROP_EVENT_STATE:
apdu_len = encode_application_enumerated(&apdu[0], EVENT_STATE_NORMAL); apdu_len =
encode_application_enumerated(&apdu[0], EVENT_STATE_NORMAL);
break; break;
case PROP_OUT_OF_SERVICE: case PROP_OUT_OF_SERVICE:
apdu_len = encode_application_boolean(&apdu[0], false); apdu_len = encode_application_boolean(&apdu[0], false);
@@ -189,7 +196,8 @@ int Analog_Input_Encode_Property_APDU(uint8_t * apdu,
#include <string.h> #include <string.h>
#include "ctest.h" #include "ctest.h"
void testAnalogInput(Test * pTest) void testAnalogInput(
Test * pTest)
{ {
uint8_t apdu[MAX_APDU] = { 0 }; uint8_t apdu[MAX_APDU] = { 0 };
int len = 0; int len = 0;
@@ -205,8 +213,7 @@ void testAnalogInput(Test * pTest)
/* FIXME: we should do a lot more testing here... */ /* FIXME: we should do a lot more testing here... */
len = Analog_Input_Encode_Property_APDU(&apdu[0], len = Analog_Input_Encode_Property_APDU(&apdu[0],
instance, instance,
PROP_OBJECT_IDENTIFIER, PROP_OBJECT_IDENTIFIER, BACNET_ARRAY_ALL, &error_class, &error_code);
BACNET_ARRAY_ALL, &error_class, &error_code);
ct_test(pTest, len >= 0); ct_test(pTest, len >= 0);
len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value); len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value);
ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_OBJECT_ID); ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_OBJECT_ID);
@@ -219,7 +226,8 @@ void testAnalogInput(Test * pTest)
} }
#ifdef TEST_ANALOG_INPUT #ifdef TEST_ANALOG_INPUT
int main(void) int main(
void)
{ {
Test *pTest; Test *pTest;
bool rc; bool rc;
bacnet-stack/demo/object/ao.c
+52 -34
View File
@@ -47,8 +47,7 @@
/* Here is our Priority Array. They are supposed to be Real, but */ /* 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 */ /* 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. */ /* and load a Real for returning the value when asked. */
static uint8_t static uint8_t Analog_Output_Level[MAX_ANALOG_OUTPUTS][BACNET_MAX_PRIORITY];
Analog_Output_Level[MAX_ANALOG_OUTPUTS][BACNET_MAX_PRIORITY];
/* Writable out-of-service allows others to play with our Present Value */ /* Writable out-of-service allows others to play with our Present Value */
/* without changing the physical output */ /* without changing the physical output */
static bool Analog_Output_Out_Of_Service[MAX_ANALOG_OUTPUTS]; static bool Analog_Output_Out_Of_Service[MAX_ANALOG_OUTPUTS];
@@ -57,8 +56,7 @@ static bool Analog_Output_Out_Of_Service[MAX_ANALOG_OUTPUTS];
static bool Analog_Output_Initialized = false; static bool Analog_Output_Initialized = false;
/* These three arrays are used by the ReadPropertyMultiple handler */ /* These three arrays are used by the ReadPropertyMultiple handler */
static const int Analog_Output_Properties_Required[] = static const int Analog_Output_Properties_Required[] = {
{
PROP_OBJECT_IDENTIFIER, PROP_OBJECT_IDENTIFIER,
PROP_OBJECT_NAME, PROP_OBJECT_NAME,
PROP_OBJECT_TYPE, PROP_OBJECT_TYPE,
@@ -72,14 +70,12 @@ static const int Analog_Output_Properties_Required[] =
-1 -1
}; };
static const int Analog_Output_Properties_Optional[] = static const int Analog_Output_Properties_Optional[] = {
{
PROP_DESCRIPTION, PROP_DESCRIPTION,
-1 -1
}; };
static const int Analog_Output_Properties_Proprietary[] = static const int Analog_Output_Properties_Proprietary[] = {
{
-1 -1
}; };
@@ -98,7 +94,8 @@ void Analog_Output_Property_Lists(
return; return;
} }
void Analog_Output_Init(void) void Analog_Output_Init(
void)
{ {
unsigned i, j; unsigned i, j;
@@ -119,7 +116,8 @@ void Analog_Output_Init(void)
/* we simply have 0-n object instances. Yours might be */ /* we simply have 0-n object instances. Yours might be */
/* more complex, and then you need validate that the */ /* more complex, and then you need validate that the */
/* given instance exists */ /* given instance exists */
bool Analog_Output_Valid_Instance(uint32_t object_instance) bool Analog_Output_Valid_Instance(
uint32_t object_instance)
{ {
Analog_Output_Init(); Analog_Output_Init();
if (object_instance < MAX_ANALOG_OUTPUTS) if (object_instance < MAX_ANALOG_OUTPUTS)
@@ -130,7 +128,8 @@ bool Analog_Output_Valid_Instance(uint32_t object_instance)
/* we simply have 0-n object instances. Yours might be */ /* we simply have 0-n object instances. Yours might be */
/* more complex, and then count how many you have */ /* more complex, and then count how many you have */
unsigned Analog_Output_Count(void) unsigned Analog_Output_Count(
void)
{ {
Analog_Output_Init(); Analog_Output_Init();
return MAX_ANALOG_OUTPUTS; return MAX_ANALOG_OUTPUTS;
@@ -139,7 +138,8 @@ unsigned Analog_Output_Count(void)
/* we simply have 0-n object instances. Yours might be */ /* we simply have 0-n object instances. Yours might be */
/* more complex, and then you need to return the instance */ /* more complex, and then you need to return the instance */
/* that correlates to the correct index */ /* that correlates to the correct index */
uint32_t Analog_Output_Index_To_Instance(unsigned index) uint32_t Analog_Output_Index_To_Instance(
unsigned index)
{ {
Analog_Output_Init(); Analog_Output_Init();
return index; return index;
@@ -148,7 +148,8 @@ uint32_t Analog_Output_Index_To_Instance(unsigned index)
/* we simply have 0-n object instances. Yours might be */ /* we simply have 0-n object instances. Yours might be */
/* more complex, and then you need to return the index */ /* more complex, and then you need to return the index */
/* that correlates to the correct instance number */ /* that correlates to the correct instance number */
unsigned Analog_Output_Instance_To_Index(uint32_t object_instance) unsigned Analog_Output_Instance_To_Index(
uint32_t object_instance)
{ {
unsigned index = MAX_ANALOG_OUTPUTS; unsigned index = MAX_ANALOG_OUTPUTS;
@@ -159,7 +160,8 @@ unsigned Analog_Output_Instance_To_Index(uint32_t object_instance)
return index; return index;
} }
float Analog_Output_Present_Value(uint32_t object_instance) float Analog_Output_Present_Value(
uint32_t object_instance)
{ {
float value = AO_RELINQUISH_DEFAULT; float value = AO_RELINQUISH_DEFAULT;
unsigned index = 0; unsigned index = 0;
@@ -179,7 +181,8 @@ float Analog_Output_Present_Value(uint32_t object_instance)
return value; return value;
} }
unsigned Analog_Output_Present_Value_Priority(uint32_t object_instance) unsigned Analog_Output_Present_Value_Priority(
uint32_t object_instance)
{ {
unsigned index = 0; /* instance to index conversion */ unsigned index = 0; /* instance to index conversion */
unsigned i = 0; /* loop counter */ unsigned i = 0; /* loop counter */
@@ -199,8 +202,10 @@ unsigned Analog_Output_Present_Value_Priority(uint32_t object_instance)
return priority; return priority;
} }
bool Analog_Output_Present_Value_Set(uint32_t object_instance, bool Analog_Output_Present_Value_Set(
float value, unsigned priority) uint32_t object_instance,
float value,
unsigned priority)
{ {
unsigned index = 0; unsigned index = 0;
bool status = false; bool status = false;
@@ -210,7 +215,7 @@ bool Analog_Output_Present_Value_Set(uint32_t object_instance,
if (priority && (priority <= BACNET_MAX_PRIORITY) && if (priority && (priority <= BACNET_MAX_PRIORITY) &&
(priority != 6 /* reserved */ ) && (priority != 6 /* reserved */ ) &&
(value >= 0.0) && (value <= 100.0)) { (value >= 0.0) && (value <= 100.0)) {
Analog_Output_Level[index][priority-1] = (uint8_t) value; Analog_Output_Level[index][priority - 1] = (uint8_t) value;
/* Note: you could set the physical output here to the next /* Note: you could set the physical output here to the next
highest priority, or to the relinquish default if no highest priority, or to the relinquish default if no
priorities are set. priorities are set.
@@ -224,7 +229,8 @@ bool Analog_Output_Present_Value_Set(uint32_t object_instance,
return status; return status;
} }
bool Analog_Output_Present_Value_Relinquish(uint32_t object_instance, bool Analog_Output_Present_Value_Relinquish(
uint32_t object_instance,
unsigned priority) unsigned priority)
{ {
unsigned index = 0; unsigned index = 0;
@@ -234,7 +240,7 @@ bool Analog_Output_Present_Value_Relinquish(uint32_t object_instance,
if (index < MAX_ANALOG_OUTPUTS) { if (index < MAX_ANALOG_OUTPUTS) {
if (priority && (priority <= BACNET_MAX_PRIORITY) && if (priority && (priority <= BACNET_MAX_PRIORITY) &&
(priority != 6 /* reserved */ )) { (priority != 6 /* reserved */ )) {
Analog_Output_Level[index][priority-1] = AO_LEVEL_NULL; Analog_Output_Level[index][priority - 1] = AO_LEVEL_NULL;
/* Note: you could set the physical output here to the next /* Note: you could set the physical output here to the next
highest priority, or to the relinquish default if no highest priority, or to the relinquish default if no
priorities are set. priorities are set.
@@ -249,7 +255,8 @@ bool Analog_Output_Present_Value_Relinquish(uint32_t object_instance,
} }
/* note: the object name must be unique within this device */ /* note: the object name must be unique within this device */
char *Analog_Output_Name(uint32_t object_instance) char *Analog_Output_Name(
uint32_t object_instance)
{ {
static char text_string[32] = ""; /* okay for single thread */ static char text_string[32] = ""; /* okay for single thread */
@@ -262,11 +269,13 @@ char *Analog_Output_Name(uint32_t object_instance)
} }
/* return apdu len, or -1 on error */ /* return apdu len, or -1 on error */
int Analog_Output_Encode_Property_APDU(uint8_t * apdu, int Analog_Output_Encode_Property_APDU(
uint8_t * apdu,
uint32_t object_instance, uint32_t object_instance,
BACNET_PROPERTY_ID property, BACNET_PROPERTY_ID property,
int32_t array_index, int32_t array_index,
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code) BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code)
{ {
int len = 0; int len = 0;
int apdu_len = 0; /* return value */ int apdu_len = 0; /* return value */
@@ -280,14 +289,16 @@ int Analog_Output_Encode_Property_APDU(uint8_t * apdu,
Analog_Output_Init(); Analog_Output_Init();
switch (property) { switch (property) {
case PROP_OBJECT_IDENTIFIER: case PROP_OBJECT_IDENTIFIER:
apdu_len = encode_application_object_id(&apdu[0], OBJECT_ANALOG_OUTPUT, apdu_len =
encode_application_object_id(&apdu[0], OBJECT_ANALOG_OUTPUT,
object_instance); object_instance);
break; break;
case PROP_OBJECT_NAME: case PROP_OBJECT_NAME:
case PROP_DESCRIPTION: case PROP_DESCRIPTION:
characterstring_init_ansi(&char_string, characterstring_init_ansi(&char_string,
Analog_Output_Name(object_instance)); Analog_Output_Name(object_instance));
apdu_len = encode_application_character_string(&apdu[0], &char_string); apdu_len =
encode_application_character_string(&apdu[0], &char_string);
break; break;
case PROP_OBJECT_TYPE: case PROP_OBJECT_TYPE:
apdu_len = apdu_len =
@@ -306,7 +317,8 @@ int Analog_Output_Encode_Property_APDU(uint8_t * apdu,
apdu_len = encode_application_bitstring(&apdu[0], &bit_string); apdu_len = encode_application_bitstring(&apdu[0], &bit_string);
break; break;
case PROP_EVENT_STATE: case PROP_EVENT_STATE:
apdu_len = encode_application_enumerated(&apdu[0], EVENT_STATE_NORMAL); apdu_len =
encode_application_enumerated(&apdu[0], EVENT_STATE_NORMAL);
break; break;
case PROP_OUT_OF_SERVICE: case PROP_OUT_OF_SERVICE:
object_index = Analog_Output_Instance_To_Index(object_instance); object_index = Analog_Output_Instance_To_Index(object_instance);
@@ -332,7 +344,9 @@ int Analog_Output_Encode_Property_APDU(uint8_t * apdu,
len = encode_application_null(&apdu[apdu_len]); len = encode_application_null(&apdu[apdu_len]);
else { else {
real_value = Analog_Output_Level[object_index][i]; real_value = Analog_Output_Level[object_index][i];
len = encode_application_real(&apdu[apdu_len], real_value); len =
encode_application_real(&apdu[apdu_len],
real_value);
} }
/* add it if we have room */ /* add it if we have room */
if ((apdu_len + len) < MAX_APDU) if ((apdu_len + len) < MAX_APDU)
@@ -354,7 +368,8 @@ int Analog_Output_Encode_Property_APDU(uint8_t * apdu,
else { else {
real_value = real_value =
Analog_Output_Level[object_index][array_index - 1]; Analog_Output_Level[object_index][array_index - 1];
apdu_len = encode_application_real(&apdu[0], real_value); apdu_len =
encode_application_real(&apdu[0], real_value);
} }
} else { } else {
*error_class = ERROR_CLASS_PROPERTY; *error_class = ERROR_CLASS_PROPERTY;
@@ -378,8 +393,10 @@ int Analog_Output_Encode_Property_APDU(uint8_t * apdu,
} }
/* returns true if successful */ /* returns true if successful */
bool Analog_Output_Write_Property(BACNET_WRITE_PROPERTY_DATA * wp_data, bool Analog_Output_Write_Property(
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code) BACNET_WRITE_PROPERTY_DATA * wp_data,
BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code)
{ {
bool status = false; /* return value */ bool status = false; /* return value */
unsigned int object_index = 0; unsigned int object_index = 0;
@@ -460,7 +477,8 @@ bool Analog_Output_Write_Property(BACNET_WRITE_PROPERTY_DATA * wp_data,
#include <string.h> #include <string.h>
#include "ctest.h" #include "ctest.h"
void testAnalogOutput(Test * pTest) void testAnalogOutput(
Test * pTest)
{ {
uint8_t apdu[MAX_APDU] = { 0 }; uint8_t apdu[MAX_APDU] = { 0 };
int len = 0; int len = 0;
@@ -475,8 +493,7 @@ void testAnalogOutput(Test * pTest)
len = Analog_Output_Encode_Property_APDU(&apdu[0], len = Analog_Output_Encode_Property_APDU(&apdu[0],
instance, instance,
PROP_OBJECT_IDENTIFIER, PROP_OBJECT_IDENTIFIER, BACNET_ARRAY_ALL, &error_class, &error_code);
BACNET_ARRAY_ALL, &error_class, &error_code);
ct_test(pTest, len != 0); ct_test(pTest, len != 0);
len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value); len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value);
ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_OBJECT_ID); ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_OBJECT_ID);
@@ -489,7 +506,8 @@ void testAnalogOutput(Test * pTest)
} }
#ifdef TEST_ANALOG_OUTPUT #ifdef TEST_ANALOG_OUTPUT
int main(void) int main(
void)
{ {
Test *pTest; Test *pTest;
bool rc; bool rc;
bacnet-stack/demo/object/av.c
+43 -27
View File
@@ -56,8 +56,7 @@ static bool Analog_Value_Out_Of_Service[MAX_ANALOG_VALUES];
static bool Analog_Value_Initialized = false; static bool Analog_Value_Initialized = false;
/* These three arrays are used by the ReadPropertyMultiple handler */ /* These three arrays are used by the ReadPropertyMultiple handler */
static const int Analog_Value_Properties_Required[] = static const int Analog_Value_Properties_Required[] = {
{
PROP_OBJECT_IDENTIFIER, PROP_OBJECT_IDENTIFIER,
PROP_OBJECT_NAME, PROP_OBJECT_NAME,
PROP_OBJECT_TYPE, PROP_OBJECT_TYPE,
@@ -69,16 +68,14 @@ static const int Analog_Value_Properties_Required[] =
-1 -1
}; };
static const int Analog_Value_Properties_Optional[] = static const int Analog_Value_Properties_Optional[] = {
{
PROP_DESCRIPTION, PROP_DESCRIPTION,
PROP_PRIORITY_ARRAY, PROP_PRIORITY_ARRAY,
PROP_RELINQUISH_DEFAULT, PROP_RELINQUISH_DEFAULT,
-1 -1
}; };
static const int Analog_Value_Properties_Proprietary[] = static const int Analog_Value_Properties_Proprietary[] = {
{
-1 -1
}; };
@@ -97,7 +94,8 @@ void Analog_Value_Property_Lists(
return; return;
} }
void Analog_Value_Init(void) void Analog_Value_Init(
void)
{ {
unsigned i, j; unsigned i, j;
@@ -118,7 +116,8 @@ void Analog_Value_Init(void)
/* we simply have 0-n object instances. Yours might be */ /* we simply have 0-n object instances. Yours might be */
/* more complex, and then you need validate that the */ /* more complex, and then you need validate that the */
/* given instance exists */ /* given instance exists */
bool Analog_Value_Valid_Instance(uint32_t object_instance) bool Analog_Value_Valid_Instance(
uint32_t object_instance)
{ {
Analog_Value_Init(); Analog_Value_Init();
if (object_instance < MAX_ANALOG_VALUES) if (object_instance < MAX_ANALOG_VALUES)
@@ -129,7 +128,8 @@ bool Analog_Value_Valid_Instance(uint32_t object_instance)
/* we simply have 0-n object instances. Yours might be */ /* we simply have 0-n object instances. Yours might be */
/* more complex, and then count how many you have */ /* more complex, and then count how many you have */
unsigned Analog_Value_Count(void) unsigned Analog_Value_Count(
void)
{ {
Analog_Value_Init(); Analog_Value_Init();
return MAX_ANALOG_VALUES; return MAX_ANALOG_VALUES;
@@ -138,7 +138,8 @@ unsigned Analog_Value_Count(void)
/* we simply have 0-n object instances. Yours might be */ /* we simply have 0-n object instances. Yours might be */
/* more complex, and then you need to return the instance */ /* more complex, and then you need to return the instance */
/* that correlates to the correct index */ /* that correlates to the correct index */
uint32_t Analog_Value_Index_To_Instance(unsigned index) uint32_t Analog_Value_Index_To_Instance(
unsigned index)
{ {
Analog_Value_Init(); Analog_Value_Init();
return index; return index;
@@ -147,7 +148,8 @@ uint32_t Analog_Value_Index_To_Instance(unsigned index)
/* we simply have 0-n object instances. Yours might be */ /* we simply have 0-n object instances. Yours might be */
/* more complex, and then you need to return the index */ /* more complex, and then you need to return the index */
/* that correlates to the correct instance number */ /* that correlates to the correct instance number */
unsigned Analog_Value_Instance_To_Index(uint32_t object_instance) unsigned Analog_Value_Instance_To_Index(
uint32_t object_instance)
{ {
unsigned index = MAX_ANALOG_VALUES; unsigned index = MAX_ANALOG_VALUES;
@@ -158,7 +160,8 @@ unsigned Analog_Value_Instance_To_Index(uint32_t object_instance)
return index; return index;
} }
static float Analog_Value_Present_Value(uint32_t object_instance) static float Analog_Value_Present_Value(
uint32_t object_instance)
{ {
float value = ANALOG_RELINQUISH_DEFAULT; float value = ANALOG_RELINQUISH_DEFAULT;
unsigned index = 0; unsigned index = 0;
@@ -179,7 +182,8 @@ static float Analog_Value_Present_Value(uint32_t object_instance)
} }
/* note: the object name must be unique within this device */ /* note: the object name must be unique within this device */
char *Analog_Value_Name(uint32_t object_instance) char *Analog_Value_Name(
uint32_t object_instance)
{ {
static char text_string[32] = ""; /* okay for single thread */ static char text_string[32] = ""; /* okay for single thread */
@@ -192,11 +196,13 @@ char *Analog_Value_Name(uint32_t object_instance)
} }
/* return apdu len, or -1 on error */ /* return apdu len, or -1 on error */
int Analog_Value_Encode_Property_APDU(uint8_t * apdu, int Analog_Value_Encode_Property_APDU(
uint8_t * apdu,
uint32_t object_instance, uint32_t object_instance,
BACNET_PROPERTY_ID property, BACNET_PROPERTY_ID property,
int32_t array_index, int32_t array_index,
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code) BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code)
{ {
int len = 0; int len = 0;
int apdu_len = 0; /* return value */ int apdu_len = 0; /* return value */
@@ -210,17 +216,20 @@ int Analog_Value_Encode_Property_APDU(uint8_t * apdu,
Analog_Value_Init(); Analog_Value_Init();
switch (property) { switch (property) {
case PROP_OBJECT_IDENTIFIER: case PROP_OBJECT_IDENTIFIER:
apdu_len = encode_application_object_id(&apdu[0], OBJECT_ANALOG_VALUE, apdu_len =
encode_application_object_id(&apdu[0], OBJECT_ANALOG_VALUE,
object_instance); object_instance);
break; break;
case PROP_OBJECT_NAME: case PROP_OBJECT_NAME:
case PROP_DESCRIPTION: case PROP_DESCRIPTION:
characterstring_init_ansi(&char_string, characterstring_init_ansi(&char_string,
Analog_Value_Name(object_instance)); Analog_Value_Name(object_instance));
apdu_len = encode_application_character_string(&apdu[0], &char_string); apdu_len =
encode_application_character_string(&apdu[0], &char_string);
break; break;
case PROP_OBJECT_TYPE: case PROP_OBJECT_TYPE:
apdu_len = encode_application_enumerated(&apdu[0], OBJECT_ANALOG_VALUE); apdu_len =
encode_application_enumerated(&apdu[0], OBJECT_ANALOG_VALUE);
break; break;
case PROP_PRESENT_VALUE: case PROP_PRESENT_VALUE:
real_value = Analog_Value_Present_Value(object_instance); real_value = Analog_Value_Present_Value(object_instance);
@@ -235,7 +244,8 @@ int Analog_Value_Encode_Property_APDU(uint8_t * apdu,
apdu_len = encode_application_bitstring(&apdu[0], &bit_string); apdu_len = encode_application_bitstring(&apdu[0], &bit_string);
break; break;
case PROP_EVENT_STATE: case PROP_EVENT_STATE:
apdu_len = encode_application_enumerated(&apdu[0], EVENT_STATE_NORMAL); apdu_len =
encode_application_enumerated(&apdu[0], EVENT_STATE_NORMAL);
break; break;
case PROP_OUT_OF_SERVICE: case PROP_OUT_OF_SERVICE:
object_index = Analog_Value_Instance_To_Index(object_instance); object_index = Analog_Value_Instance_To_Index(object_instance);
@@ -261,7 +271,9 @@ int Analog_Value_Encode_Property_APDU(uint8_t * apdu,
len = encode_application_null(&apdu[apdu_len]); len = encode_application_null(&apdu[apdu_len]);
else { else {
real_value = Analog_Value_Level[object_index][i]; real_value = Analog_Value_Level[object_index][i];
len = encode_application_real(&apdu[apdu_len], real_value); len =
encode_application_real(&apdu[apdu_len],
real_value);
} }
/* add it if we have room */ /* add it if we have room */
if ((apdu_len + len) < MAX_APDU) if ((apdu_len + len) < MAX_APDU)
@@ -282,7 +294,8 @@ int Analog_Value_Encode_Property_APDU(uint8_t * apdu,
else { else {
real_value = real_value =
Analog_Value_Level[object_index][array_index - 1]; Analog_Value_Level[object_index][array_index - 1];
apdu_len = encode_application_real(&apdu[0], real_value); apdu_len =
encode_application_real(&apdu[0], real_value);
} }
} else { } else {
*error_class = ERROR_CLASS_PROPERTY; *error_class = ERROR_CLASS_PROPERTY;
@@ -307,8 +320,10 @@ int Analog_Value_Encode_Property_APDU(uint8_t * apdu,
} }
/* returns true if successful */ /* returns true if successful */
bool Analog_Value_Write_Property(BACNET_WRITE_PROPERTY_DATA * wp_data, bool Analog_Value_Write_Property(
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code) BACNET_WRITE_PROPERTY_DATA * wp_data,
BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code)
{ {
bool status = false; /* return value */ bool status = false; /* return value */
unsigned int object_index = 0; unsigned int object_index = 0;
@@ -410,7 +425,8 @@ bool Analog_Value_Write_Property(BACNET_WRITE_PROPERTY_DATA * wp_data,
#include <string.h> #include <string.h>
#include "ctest.h" #include "ctest.h"
void testAnalog_Value(Test * pTest) void testAnalog_Value(
Test * pTest)
{ {
uint8_t apdu[MAX_APDU] = { 0 }; uint8_t apdu[MAX_APDU] = { 0 };
int len = 0; int len = 0;
@@ -425,8 +441,7 @@ void testAnalog_Value(Test * pTest)
len = Analog_Value_Encode_Property_APDU(&apdu[0], len = Analog_Value_Encode_Property_APDU(&apdu[0],
instance, instance,
PROP_OBJECT_IDENTIFIER, PROP_OBJECT_IDENTIFIER, BACNET_ARRAY_ALL, &error_class, &error_code);
BACNET_ARRAY_ALL, &error_class, &error_code);
ct_test(pTest, len != 0); ct_test(pTest, len != 0);
len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value); len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value);
ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_OBJECT_ID); ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_OBJECT_ID);
@@ -439,7 +454,8 @@ void testAnalog_Value(Test * pTest)
} }
#ifdef TEST_ANALOG_VALUE #ifdef TEST_ANALOG_VALUE
int main(void) int main(
void)
{ {
Test *pTest; Test *pTest;
bool rc; bool rc;
bacnet-stack/demo/object/bacfile.c
+42 -28
View File
@@ -53,8 +53,7 @@ static BACNET_FILE_LISTING BACnet_File_Listing[] = {
}; };
/* These three arrays are used by the ReadPropertyMultiple handler */ /* These three arrays are used by the ReadPropertyMultiple handler */
static const int bacfile_Properties_Required[] = static const int bacfile_Properties_Required[] = {
{
PROP_OBJECT_IDENTIFIER, PROP_OBJECT_IDENTIFIER,
PROP_OBJECT_NAME, PROP_OBJECT_NAME,
PROP_OBJECT_TYPE, PROP_OBJECT_TYPE,
@@ -67,14 +66,12 @@ static const int bacfile_Properties_Required[] =
-1 -1
}; };
static const int bacfile_Properties_Optional[] = static const int bacfile_Properties_Optional[] = {
{
PROP_DESCRIPTION, PROP_DESCRIPTION,
-1 -1
}; };
static const int bacfile_Properties_Proprietary[] = static const int bacfile_Properties_Proprietary[] = {
{
-1 -1
}; };
@@ -94,7 +91,8 @@ void BACfile_Property_Lists(
} }
char *bacfile_name(uint32_t instance) char *bacfile_name(
uint32_t instance)
{ {
uint32_t index = 0; uint32_t index = 0;
char *filename = NULL; char *filename = NULL;
@@ -111,12 +109,14 @@ char *bacfile_name(uint32_t instance)
return filename; return filename;
} }
bool bacfile_valid_instance(uint32_t object_instance) bool bacfile_valid_instance(
uint32_t object_instance)
{ {
return bacfile_name(object_instance) ? true : false; return bacfile_name(object_instance) ? true : false;
} }
uint32_t bacfile_count(void) uint32_t bacfile_count(
void)
{ {
uint32_t index = 0; uint32_t index = 0;
@@ -128,7 +128,8 @@ uint32_t bacfile_count(void)
return index; return index;
} }
uint32_t bacfile_index_to_instance(unsigned find_index) uint32_t bacfile_index_to_instance(
unsigned find_index)
{ {
uint32_t instance = BACNET_MAX_INSTANCE + 1; uint32_t instance = BACNET_MAX_INSTANCE + 1;
uint32_t index = 0; uint32_t index = 0;
@@ -145,7 +146,8 @@ uint32_t bacfile_index_to_instance(unsigned find_index)
return instance; return instance;
} }
static long fsize(FILE * pFile) static long fsize(
FILE * pFile)
{ {
long size = 0; long size = 0;
long origin = 0; long origin = 0;
@@ -159,7 +161,8 @@ static long fsize(FILE * pFile)
return (size); return (size);
} }
static unsigned bacfile_file_size(uint32_t object_instance) static unsigned bacfile_file_size(
uint32_t object_instance)
{ {
char *pFilename = NULL; char *pFilename = NULL;
FILE *pFile = NULL; FILE *pFile = NULL;
@@ -178,11 +181,13 @@ static unsigned bacfile_file_size(uint32_t object_instance)
} }
/* return the number of bytes used, or -1 on error */ /* return the number of bytes used, or -1 on error */
int bacfile_encode_property_apdu(uint8_t * apdu, int bacfile_encode_property_apdu(
uint8_t * apdu,
uint32_t object_instance, uint32_t object_instance,
BACNET_PROPERTY_ID property, BACNET_PROPERTY_ID property,
int32_t array_index, int32_t array_index,
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code) BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code)
{ {
int apdu_len = 0; /* return value */ int apdu_len = 0; /* return value */
char text_string[32] = { "" }; char text_string[32] = { "" };
@@ -199,7 +204,8 @@ int bacfile_encode_property_apdu(uint8_t * apdu,
case PROP_OBJECT_NAME: case PROP_OBJECT_NAME:
sprintf(text_string, "FILE %d", object_instance); sprintf(text_string, "FILE %d", object_instance);
characterstring_init_ansi(&char_string, text_string); characterstring_init_ansi(&char_string, text_string);
apdu_len = encode_application_character_string(&apdu[0], &char_string); apdu_len =
encode_application_character_string(&apdu[0], &char_string);
break; break;
case PROP_OBJECT_TYPE: case PROP_OBJECT_TYPE:
apdu_len = encode_application_enumerated(&apdu[0], OBJECT_FILE); apdu_len = encode_application_enumerated(&apdu[0], OBJECT_FILE);
@@ -207,11 +213,13 @@ int bacfile_encode_property_apdu(uint8_t * apdu,
case PROP_DESCRIPTION: case PROP_DESCRIPTION:
characterstring_init_ansi(&char_string, characterstring_init_ansi(&char_string,
bacfile_name(object_instance)); bacfile_name(object_instance));
apdu_len = encode_application_character_string(&apdu[0], &char_string); apdu_len =
encode_application_character_string(&apdu[0], &char_string);
break; break;
case PROP_FILE_TYPE: case PROP_FILE_TYPE:
characterstring_init_ansi(&char_string, "TEXT"); characterstring_init_ansi(&char_string, "TEXT");
apdu_len = encode_application_character_string(&apdu[0], &char_string); apdu_len =
encode_application_character_string(&apdu[0], &char_string);
break; break;
case PROP_FILE_SIZE: case PROP_FILE_SIZE:
apdu_len = encode_application_unsigned(&apdu[0], apdu_len = encode_application_unsigned(&apdu[0],
@@ -247,7 +255,8 @@ int bacfile_encode_property_apdu(uint8_t * apdu,
apdu_len = encode_application_boolean(&apdu[0], true); apdu_len = encode_application_boolean(&apdu[0], true);
break; break;
case PROP_FILE_ACCESS_METHOD: case PROP_FILE_ACCESS_METHOD:
apdu_len = encode_application_enumerated(&apdu[0], FILE_STREAM_ACCESS); apdu_len =
encode_application_enumerated(&apdu[0], FILE_STREAM_ACCESS);
break; break;
default: default:
*error_class = ERROR_CLASS_PROPERTY; *error_class = ERROR_CLASS_PROPERTY;
@@ -260,8 +269,10 @@ int bacfile_encode_property_apdu(uint8_t * apdu,
} }
/* returns true if successful */ /* returns true if successful */
bool bacfile_write_property(BACNET_WRITE_PROPERTY_DATA * wp_data, bool bacfile_write_property(
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code) BACNET_WRITE_PROPERTY_DATA * wp_data,
BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code)
{ {
bool status = false; /* return value */ bool status = false; /* return value */
int len = 0; int len = 0;
@@ -320,7 +331,8 @@ bool bacfile_write_property(BACNET_WRITE_PROPERTY_DATA * wp_data,
uint32_t bacfile_instance(char *filename) uint32_t bacfile_instance(
char *filename)
{ {
uint32_t index = 0; uint32_t index = 0;
uint32_t instance = BACNET_MAX_INSTANCE + 1; uint32_t instance = BACNET_MAX_INSTANCE + 1;
@@ -343,7 +355,8 @@ uint32_t bacfile_instance(char *filename)
/* Another way would be to store the */ /* Another way would be to store the */
/* invokeID and file instance in a list or table */ /* invokeID and file instance in a list or table */
/* when the request was sent */ /* when the request was sent */
uint32_t bacfile_instance_from_tsm(uint8_t invokeID) uint32_t bacfile_instance_from_tsm(
uint8_t invokeID)
{ {
BACNET_NPDU_DATA npdu_data = { 0 }; /* dummy for getting npdu length */ BACNET_NPDU_DATA npdu_data = { 0 }; /* dummy for getting npdu length */
BACNET_CONFIRMED_SERVICE_DATA service_data = { 0 }; BACNET_CONFIRMED_SERVICE_DATA service_data = { 0 };
@@ -383,7 +396,8 @@ uint32_t bacfile_instance_from_tsm(uint8_t invokeID)
} }
#endif #endif
bool bacfile_read_data(BACNET_ATOMIC_READ_FILE_DATA * data) bool bacfile_read_data(
BACNET_ATOMIC_READ_FILE_DATA * data)
{ {
char *pFilename = NULL; char *pFilename = NULL;
bool found = false; bool found = false;
@@ -395,8 +409,7 @@ bool bacfile_read_data(BACNET_ATOMIC_READ_FILE_DATA * data)
found = true; found = true;
pFile = fopen(pFilename, "rb"); pFile = fopen(pFilename, "rb");
if (pFile) { if (pFile) {
(void) fseek(pFile, (void) fseek(pFile, data->type.stream.fileStartPosition, SEEK_SET);
data->type.stream.fileStartPosition, SEEK_SET);
len = fread(octetstring_value(&data->fileData), 1, len = fread(octetstring_value(&data->fileData), 1,
data->type.stream.requestedOctetCount, pFile); data->type.stream.requestedOctetCount, pFile);
if (len < data->type.stream.requestedOctetCount) if (len < data->type.stream.requestedOctetCount)
@@ -417,7 +430,8 @@ bool bacfile_read_data(BACNET_ATOMIC_READ_FILE_DATA * data)
return found; return found;
} }
bool bacfile_write_stream_data(BACNET_ATOMIC_WRITE_FILE_DATA * data) bool bacfile_write_stream_data(
BACNET_ATOMIC_WRITE_FILE_DATA * data)
{ {
char *pFilename = NULL; char *pFilename = NULL;
bool found = false; bool found = false;
@@ -432,9 +446,9 @@ bool bacfile_write_stream_data(BACNET_ATOMIC_WRITE_FILE_DATA * data)
else else
pFile = fopen(pFilename, "rb+"); pFile = fopen(pFilename, "rb+");
if (pFile) { if (pFile) {
(void)fseek(pFile, data->type.stream.fileStartPosition, SEEK_SET); (void) fseek(pFile, data->type.stream.fileStartPosition, SEEK_SET);
if (fwrite(octetstring_value(&data->fileData), if (fwrite(octetstring_value(&data->fileData),
octetstring_length(&data->fileData),1,pFile) != 1) { octetstring_length(&data->fileData), 1, pFile) != 1) {
} }
fclose(pFile); fclose(pFile);
bacnet-stack/demo/object/bi.c
+34 -24
View File
@@ -38,8 +38,7 @@
static BACNET_BINARY_PV Present_Value[MAX_BINARY_INPUTS]; static BACNET_BINARY_PV Present_Value[MAX_BINARY_INPUTS];
/* These three arrays are used by the ReadPropertyMultiple handler */ /* These three arrays are used by the ReadPropertyMultiple handler */
static const int Binary_Input_Properties_Required[] = static const int Binary_Input_Properties_Required[] = {
{
PROP_OBJECT_IDENTIFIER, PROP_OBJECT_IDENTIFIER,
PROP_OBJECT_NAME, PROP_OBJECT_NAME,
PROP_OBJECT_TYPE, PROP_OBJECT_TYPE,
@@ -51,14 +50,12 @@ static const int Binary_Input_Properties_Required[] =
-1 -1
}; };
static const int Binary_Input_Properties_Optional[] = static const int Binary_Input_Properties_Optional[] = {
{
PROP_DESCRIPTION, PROP_DESCRIPTION,
-1 -1
}; };
static const int Binary_Input_Properties_Proprietary[] = static const int Binary_Input_Properties_Proprietary[] = {
{
-1 -1
}; };
@@ -80,7 +77,8 @@ void Binary_Input_Property_Lists(
/* we simply have 0-n object instances. Yours might be */ /* we simply have 0-n object instances. Yours might be */
/* more complex, and then you need validate that the */ /* more complex, and then you need validate that the */
/* given instance exists */ /* given instance exists */
bool Binary_Input_Valid_Instance(uint32_t object_instance) bool Binary_Input_Valid_Instance(
uint32_t object_instance)
{ {
if (object_instance < MAX_BINARY_INPUTS) if (object_instance < MAX_BINARY_INPUTS)
return true; return true;
@@ -90,7 +88,8 @@ bool Binary_Input_Valid_Instance(uint32_t object_instance)
/* we simply have 0-n object instances. Yours might be */ /* we simply have 0-n object instances. Yours might be */
/* more complex, and then count how many you have */ /* more complex, and then count how many you have */
unsigned Binary_Input_Count(void) unsigned Binary_Input_Count(
void)
{ {
return MAX_BINARY_INPUTS; return MAX_BINARY_INPUTS;
} }
@@ -98,12 +97,14 @@ unsigned Binary_Input_Count(void)
/* we simply have 0-n object instances. Yours might be */ /* we simply have 0-n object instances. Yours might be */
/* more complex, and then you need to return the instance */ /* more complex, and then you need to return the instance */
/* that correlates to the correct index */ /* that correlates to the correct index */
uint32_t Binary_Input_Index_To_Instance(unsigned index) uint32_t Binary_Input_Index_To_Instance(
unsigned index)
{ {
return index; return index;
} }
void Binary_Input_Init(void) void Binary_Input_Init(
void)
{ {
static bool initialized = false; static bool initialized = false;
unsigned i; unsigned i;
@@ -123,7 +124,8 @@ void Binary_Input_Init(void)
/* we simply have 0-n object instances. Yours might be */ /* we simply have 0-n object instances. Yours might be */
/* more complex, and then you need to return the index */ /* more complex, and then you need to return the index */
/* that correlates to the correct instance number */ /* that correlates to the correct instance number */
unsigned Binary_Input_Instance_To_Index(uint32_t object_instance) unsigned Binary_Input_Instance_To_Index(
uint32_t object_instance)
{ {
unsigned index = MAX_BINARY_INPUTS; unsigned index = MAX_BINARY_INPUTS;
@@ -134,8 +136,8 @@ unsigned Binary_Input_Instance_To_Index(uint32_t object_instance)
return index; return index;
} }
static BACNET_BINARY_PV Binary_Input_Present_Value(uint32_t static BACNET_BINARY_PV Binary_Input_Present_Value(
object_instance) uint32_t object_instance)
{ {
BACNET_BINARY_PV value = BINARY_INACTIVE; BACNET_BINARY_PV value = BINARY_INACTIVE;
unsigned index = 0; unsigned index = 0;
@@ -148,7 +150,8 @@ static BACNET_BINARY_PV Binary_Input_Present_Value(uint32_t
return value; return value;
} }
char *Binary_Input_Name(uint32_t object_instance) char *Binary_Input_Name(
uint32_t object_instance)
{ {
static char text_string[32] = ""; /* okay for single thread */ static char text_string[32] = ""; /* okay for single thread */
@@ -163,11 +166,13 @@ char *Binary_Input_Name(uint32_t object_instance)
/* return apdu length, or -1 on error */ /* return apdu length, or -1 on error */
/* assumption - object already exists, and has been bounds checked */ /* assumption - object already exists, and has been bounds checked */
int Binary_Input_Encode_Property_APDU(uint8_t * apdu, int Binary_Input_Encode_Property_APDU(
uint8_t * apdu,
uint32_t object_instance, uint32_t object_instance,
BACNET_PROPERTY_ID property, BACNET_PROPERTY_ID property,
int32_t array_index, int32_t array_index,
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code) BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code)
{ {
int apdu_len = 0; /* return value */ int apdu_len = 0; /* return value */
BACNET_BIT_STRING bit_string; BACNET_BIT_STRING bit_string;
@@ -179,7 +184,8 @@ int Binary_Input_Encode_Property_APDU(uint8_t * apdu,
Binary_Input_Init(); Binary_Input_Init();
switch (property) { switch (property) {
case PROP_OBJECT_IDENTIFIER: case PROP_OBJECT_IDENTIFIER:
apdu_len = encode_application_object_id(&apdu[0], OBJECT_BINARY_INPUT, apdu_len =
encode_application_object_id(&apdu[0], OBJECT_BINARY_INPUT,
object_instance); object_instance);
break; break;
case PROP_OBJECT_NAME: case PROP_OBJECT_NAME:
@@ -187,10 +193,12 @@ int Binary_Input_Encode_Property_APDU(uint8_t * apdu,
/* note: object name must be unique in our device */ /* note: object name must be unique in our device */
characterstring_init_ansi(&char_string, characterstring_init_ansi(&char_string,
Binary_Input_Name(object_instance)); Binary_Input_Name(object_instance));
apdu_len = encode_application_character_string(&apdu[0], &char_string); apdu_len =
encode_application_character_string(&apdu[0], &char_string);
break; break;
case PROP_OBJECT_TYPE: case PROP_OBJECT_TYPE:
apdu_len = encode_application_enumerated(&apdu[0], OBJECT_BINARY_INPUT); apdu_len =
encode_application_enumerated(&apdu[0], OBJECT_BINARY_INPUT);
break; break;
case PROP_PRESENT_VALUE: case PROP_PRESENT_VALUE:
/* note: you need to look up the actual value */ /* note: you need to look up the actual value */
@@ -209,7 +217,8 @@ int Binary_Input_Encode_Property_APDU(uint8_t * apdu,
break; break;
case PROP_EVENT_STATE: case PROP_EVENT_STATE:
/* note: see the details in the standard on how to use this */ /* note: see the details in the standard on how to use this */
apdu_len = encode_application_enumerated(&apdu[0], EVENT_STATE_NORMAL); apdu_len =
encode_application_enumerated(&apdu[0], EVENT_STATE_NORMAL);
break; break;
case PROP_OUT_OF_SERVICE: case PROP_OUT_OF_SERVICE:
apdu_len = encode_application_boolean(&apdu[0], false); apdu_len = encode_application_boolean(&apdu[0], false);
@@ -232,7 +241,8 @@ int Binary_Input_Encode_Property_APDU(uint8_t * apdu,
#include <string.h> #include <string.h>
#include "ctest.h" #include "ctest.h"
void testBinaryInput(Test * pTest) void testBinaryInput(
Test * pTest)
{ {
uint8_t apdu[MAX_APDU] = { 0 }; uint8_t apdu[MAX_APDU] = { 0 };
int len = 0; int len = 0;
@@ -248,8 +258,7 @@ void testBinaryInput(Test * pTest)
/* FIXME: we should do a lot more testing here... */ /* FIXME: we should do a lot more testing here... */
len = Binary_Input_Encode_Property_APDU(&apdu[0], len = Binary_Input_Encode_Property_APDU(&apdu[0],
instance, instance,
PROP_OBJECT_IDENTIFIER, PROP_OBJECT_IDENTIFIER, BACNET_ARRAY_ALL, &error_class, &error_code);
BACNET_ARRAY_ALL, &error_class, &error_code);
ct_test(pTest, len >= 0); ct_test(pTest, len >= 0);
len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value); len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value);
ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_OBJECT_ID); ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_OBJECT_ID);
@@ -262,7 +271,8 @@ void testBinaryInput(Test * pTest)
} }
#ifdef TEST_BINARY_INPUT #ifdef TEST_BINARY_INPUT
int main(void) int main(
void)
{ {
Test *pTest; Test *pTest;
bool rc; bool rc;
bacnet-stack/demo/object/bo.c
+37 -26
View File
@@ -48,8 +48,7 @@ static BACNET_BINARY_PV
static bool Binary_Output_Out_Of_Service[MAX_BINARY_OUTPUTS]; static bool Binary_Output_Out_Of_Service[MAX_BINARY_OUTPUTS];
/* These three arrays are used by the ReadPropertyMultiple handler */ /* These three arrays are used by the ReadPropertyMultiple handler */
static const int Binary_Output_Properties_Required[] = static const int Binary_Output_Properties_Required[] = {
{
PROP_OBJECT_IDENTIFIER, PROP_OBJECT_IDENTIFIER,
PROP_OBJECT_NAME, PROP_OBJECT_NAME,
PROP_OBJECT_TYPE, PROP_OBJECT_TYPE,
@@ -63,14 +62,12 @@ static const int Binary_Output_Properties_Required[] =
-1 -1
}; };
static const int Binary_Output_Properties_Optional[] = static const int Binary_Output_Properties_Optional[] = {
{
PROP_DESCRIPTION, PROP_DESCRIPTION,
-1 -1
}; };
static const int Binary_Output_Properties_Proprietary[] = static const int Binary_Output_Properties_Proprietary[] = {
{
-1 -1
}; };
@@ -89,7 +86,8 @@ void Binary_Output_Property_Lists(
return; return;
} }
void Binary_Output_Init(void) void Binary_Output_Init(
void)
{ {
unsigned i, j; unsigned i, j;
static bool initialized = false; static bool initialized = false;
@@ -111,7 +109,8 @@ void Binary_Output_Init(void)
/* we simply have 0-n object instances. Yours might be */ /* we simply have 0-n object instances. Yours might be */
/* more complex, and then you need validate that the */ /* more complex, and then you need validate that the */
/* given instance exists */ /* given instance exists */
bool Binary_Output_Valid_Instance(uint32_t object_instance) bool Binary_Output_Valid_Instance(
uint32_t object_instance)
{ {
if (object_instance < MAX_BINARY_OUTPUTS) if (object_instance < MAX_BINARY_OUTPUTS)
return true; return true;
@@ -121,7 +120,8 @@ bool Binary_Output_Valid_Instance(uint32_t object_instance)
/* we simply have 0-n object instances. Yours might be */ /* we simply have 0-n object instances. Yours might be */
/* more complex, and then count how many you have */ /* more complex, and then count how many you have */
unsigned Binary_Output_Count(void) unsigned Binary_Output_Count(
void)
{ {
return MAX_BINARY_OUTPUTS; return MAX_BINARY_OUTPUTS;
} }
@@ -129,7 +129,8 @@ unsigned Binary_Output_Count(void)
/* we simply have 0-n object instances. Yours might be */ /* we simply have 0-n object instances. Yours might be */
/* more complex, and then you need to return the instance */ /* more complex, and then you need to return the instance */
/* that correlates to the correct index */ /* that correlates to the correct index */
uint32_t Binary_Output_Index_To_Instance(unsigned index) uint32_t Binary_Output_Index_To_Instance(
unsigned index)
{ {
return index; return index;
} }
@@ -137,7 +138,8 @@ uint32_t Binary_Output_Index_To_Instance(unsigned index)
/* we simply have 0-n object instances. Yours might be */ /* we simply have 0-n object instances. Yours might be */
/* more complex, and then you need to return the index */ /* more complex, and then you need to return the index */
/* that correlates to the correct instance number */ /* that correlates to the correct instance number */
unsigned Binary_Output_Instance_To_Index(uint32_t object_instance) unsigned Binary_Output_Instance_To_Index(
uint32_t object_instance)
{ {
unsigned index = MAX_BINARY_OUTPUTS; unsigned index = MAX_BINARY_OUTPUTS;
@@ -147,8 +149,8 @@ unsigned Binary_Output_Instance_To_Index(uint32_t object_instance)
return index; return index;
} }
static BACNET_BINARY_PV Binary_Output_Present_Value(uint32_t static BACNET_BINARY_PV Binary_Output_Present_Value(
object_instance) uint32_t object_instance)
{ {
BACNET_BINARY_PV value = RELINQUISH_DEFAULT; BACNET_BINARY_PV value = RELINQUISH_DEFAULT;
unsigned index = 0; unsigned index = 0;
@@ -169,7 +171,8 @@ static BACNET_BINARY_PV Binary_Output_Present_Value(uint32_t
} }
/* note: the object name must be unique within this device */ /* note: the object name must be unique within this device */
char *Binary_Output_Name(uint32_t object_instance) char *Binary_Output_Name(
uint32_t object_instance)
{ {
static char text_string[32] = ""; /* okay for single thread */ static char text_string[32] = ""; /* okay for single thread */
@@ -182,11 +185,13 @@ char *Binary_Output_Name(uint32_t object_instance)
} }
/* return apdu len, or -1 on error */ /* return apdu len, or -1 on error */
int Binary_Output_Encode_Property_APDU(uint8_t * apdu, int Binary_Output_Encode_Property_APDU(
uint8_t * apdu,
uint32_t object_instance, uint32_t object_instance,
BACNET_PROPERTY_ID property, BACNET_PROPERTY_ID property,
int32_t array_index, int32_t array_index,
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code) BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code)
{ {
int len = 0; int len = 0;
int apdu_len = 0; /* return value */ int apdu_len = 0; /* return value */
@@ -201,7 +206,8 @@ int Binary_Output_Encode_Property_APDU(uint8_t * apdu,
Binary_Output_Init(); Binary_Output_Init();
switch (property) { switch (property) {
case PROP_OBJECT_IDENTIFIER: case PROP_OBJECT_IDENTIFIER:
apdu_len = encode_application_object_id(&apdu[0], OBJECT_BINARY_OUTPUT, apdu_len =
encode_application_object_id(&apdu[0], OBJECT_BINARY_OUTPUT,
object_instance); object_instance);
break; break;
/* note: Name and Description don't have to be the same. /* note: Name and Description don't have to be the same.
@@ -210,7 +216,8 @@ int Binary_Output_Encode_Property_APDU(uint8_t * apdu,
case PROP_DESCRIPTION: case PROP_DESCRIPTION:
characterstring_init_ansi(&char_string, characterstring_init_ansi(&char_string,
Binary_Output_Name(object_instance)); Binary_Output_Name(object_instance));
apdu_len = encode_application_character_string(&apdu[0], &char_string); apdu_len =
encode_application_character_string(&apdu[0], &char_string);
break; break;
case PROP_OBJECT_TYPE: case PROP_OBJECT_TYPE:
apdu_len = apdu_len =
@@ -231,7 +238,8 @@ int Binary_Output_Encode_Property_APDU(uint8_t * apdu,
break; break;
case PROP_EVENT_STATE: case PROP_EVENT_STATE:
/* note: see the details in the standard on how to use this */ /* note: see the details in the standard on how to use this */
apdu_len = encode_application_enumerated(&apdu[0], EVENT_STATE_NORMAL); apdu_len =
encode_application_enumerated(&apdu[0], EVENT_STATE_NORMAL);
break; break;
case PROP_OUT_OF_SERVICE: case PROP_OUT_OF_SERVICE:
object_index = Binary_Output_Instance_To_Index(object_instance); object_index = Binary_Output_Instance_To_Index(object_instance);
@@ -308,8 +316,10 @@ int Binary_Output_Encode_Property_APDU(uint8_t * apdu,
} }
/* returns true if successful */ /* returns true if successful */
bool Binary_Output_Write_Property(BACNET_WRITE_PROPERTY_DATA * wp_data, bool Binary_Output_Write_Property(
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code) BACNET_WRITE_PROPERTY_DATA * wp_data,
BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code)
{ {
bool status = false; /* return value */ bool status = false; /* return value */
unsigned int object_index = 0; unsigned int object_index = 0;
@@ -340,7 +350,7 @@ bool Binary_Output_Write_Property(BACNET_WRITE_PROPERTY_DATA * wp_data,
(priority != 6 /* reserved */ ) && (priority != 6 /* reserved */ ) &&
(value.type.Enumerated >= MIN_BINARY_PV) && (value.type.Enumerated >= MIN_BINARY_PV) &&
(value.type.Enumerated <= MAX_BINARY_PV)) { (value.type.Enumerated <= MAX_BINARY_PV)) {
level = (BACNET_BINARY_PV)value.type.Enumerated; level = (BACNET_BINARY_PV) value.type.Enumerated;
object_index = object_index =
Binary_Output_Instance_To_Index(wp_data-> Binary_Output_Instance_To_Index(wp_data->
object_instance); object_instance);
@@ -413,7 +423,8 @@ bool Binary_Output_Write_Property(BACNET_WRITE_PROPERTY_DATA * wp_data,
#include <string.h> #include <string.h>
#include "ctest.h" #include "ctest.h"
void testBinaryOutput(Test * pTest) void testBinaryOutput(
Test * pTest)
{ {
uint8_t apdu[MAX_APDU] = { 0 }; uint8_t apdu[MAX_APDU] = { 0 };
int len = 0; int len = 0;
@@ -428,8 +439,7 @@ void testBinaryOutput(Test * pTest)
len = Binary_Output_Encode_Property_APDU(&apdu[0], len = Binary_Output_Encode_Property_APDU(&apdu[0],
instance, instance,
PROP_OBJECT_IDENTIFIER, PROP_OBJECT_IDENTIFIER, BACNET_ARRAY_ALL, &error_class, &error_code);
BACNET_ARRAY_ALL, &error_class, &error_code);
ct_test(pTest, len != 0); ct_test(pTest, len != 0);
len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value); len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value);
ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_OBJECT_ID); ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_OBJECT_ID);
@@ -442,7 +452,8 @@ void testBinaryOutput(Test * pTest)
} }
#ifdef TEST_BINARY_OUTPUT #ifdef TEST_BINARY_OUTPUT
int main(void) int main(
void)
{ {
Test *pTest; Test *pTest;
bool rc; bool rc;
bacnet-stack/demo/object/bv.c
+39 -27
View File
@@ -48,8 +48,7 @@ static BACNET_BINARY_PV
static bool Binary_Value_Out_Of_Service[MAX_BINARY_VALUES]; static bool Binary_Value_Out_Of_Service[MAX_BINARY_VALUES];
/* These three arrays are used by the ReadPropertyMultiple handler */ /* These three arrays are used by the ReadPropertyMultiple handler */
static const int Binary_Value_Properties_Required[] = static const int Binary_Value_Properties_Required[] = {
{
PROP_OBJECT_IDENTIFIER, PROP_OBJECT_IDENTIFIER,
PROP_OBJECT_NAME, PROP_OBJECT_NAME,
PROP_OBJECT_TYPE, PROP_OBJECT_TYPE,
@@ -60,16 +59,14 @@ static const int Binary_Value_Properties_Required[] =
-1 -1
}; };
static const int Binary_Value_Properties_Optional[] = static const int Binary_Value_Properties_Optional[] = {
{
PROP_DESCRIPTION, PROP_DESCRIPTION,
PROP_PRIORITY_ARRAY, PROP_PRIORITY_ARRAY,
PROP_RELINQUISH_DEFAULT, PROP_RELINQUISH_DEFAULT,
-1 -1
}; };
static const int Binary_Value_Properties_Proprietary[] = static const int Binary_Value_Properties_Proprietary[] = {
{
-1 -1
}; };
@@ -88,7 +85,8 @@ void Binary_Value_Property_Lists(
return; return;
} }
void Binary_Value_Init(void) void Binary_Value_Init(
void)
{ {
unsigned i, j; unsigned i, j;
static bool initialized = false; static bool initialized = false;
@@ -110,7 +108,8 @@ void Binary_Value_Init(void)
/* we simply have 0-n object instances. Yours might be */ /* we simply have 0-n object instances. Yours might be */
/* more complex, and then you need validate that the */ /* more complex, and then you need validate that the */
/* given instance exists */ /* given instance exists */
bool Binary_Value_Valid_Instance(uint32_t object_instance) bool Binary_Value_Valid_Instance(
uint32_t object_instance)
{ {
if (object_instance < MAX_BINARY_VALUES) if (object_instance < MAX_BINARY_VALUES)
return true; return true;
@@ -120,7 +119,8 @@ bool Binary_Value_Valid_Instance(uint32_t object_instance)
/* we simply have 0-n object instances. Yours might be */ /* we simply have 0-n object instances. Yours might be */
/* more complex, and then count how many you have */ /* more complex, and then count how many you have */
unsigned Binary_Value_Count(void) unsigned Binary_Value_Count(
void)
{ {
return MAX_BINARY_VALUES; return MAX_BINARY_VALUES;
} }
@@ -128,7 +128,8 @@ unsigned Binary_Value_Count(void)
/* we simply have 0-n object instances. Yours might be */ /* we simply have 0-n object instances. Yours might be */
/* more complex, and then you need to return the instance */ /* more complex, and then you need to return the instance */
/* that correlates to the correct index */ /* that correlates to the correct index */
uint32_t Binary_Value_Index_To_Instance(unsigned index) uint32_t Binary_Value_Index_To_Instance(
unsigned index)
{ {
return index; return index;
} }
@@ -136,7 +137,8 @@ uint32_t Binary_Value_Index_To_Instance(unsigned index)
/* we simply have 0-n object instances. Yours might be */ /* we simply have 0-n object instances. Yours might be */
/* more complex, and then you need to return the index */ /* more complex, and then you need to return the index */
/* that correlates to the correct instance number */ /* that correlates to the correct instance number */
unsigned Binary_Value_Instance_To_Index(uint32_t object_instance) unsigned Binary_Value_Instance_To_Index(
uint32_t object_instance)
{ {
unsigned index = MAX_BINARY_VALUES; unsigned index = MAX_BINARY_VALUES;
@@ -146,8 +148,8 @@ unsigned Binary_Value_Instance_To_Index(uint32_t object_instance)
return index; return index;
} }
static BACNET_BINARY_PV Binary_Value_Present_Value(uint32_t static BACNET_BINARY_PV Binary_Value_Present_Value(
object_instance) uint32_t object_instance)
{ {
BACNET_BINARY_PV value = RELINQUISH_DEFAULT; BACNET_BINARY_PV value = RELINQUISH_DEFAULT;
unsigned index = 0; unsigned index = 0;
@@ -168,7 +170,8 @@ static BACNET_BINARY_PV Binary_Value_Present_Value(uint32_t
} }
/* note: the object name must be unique within this device */ /* note: the object name must be unique within this device */
char *Binary_Value_Name(uint32_t object_instance) char *Binary_Value_Name(
uint32_t object_instance)
{ {
static char text_string[32] = ""; /* okay for single thread */ static char text_string[32] = ""; /* okay for single thread */
@@ -181,11 +184,13 @@ char *Binary_Value_Name(uint32_t object_instance)
} }
/* return apdu len, or -1 on error */ /* return apdu len, or -1 on error */
int Binary_Value_Encode_Property_APDU(uint8_t * apdu, int Binary_Value_Encode_Property_APDU(
uint8_t * apdu,
uint32_t object_instance, uint32_t object_instance,
BACNET_PROPERTY_ID property, BACNET_PROPERTY_ID property,
int32_t array_index, int32_t array_index,
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code) BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code)
{ {
int len = 0; int len = 0;
int apdu_len = 0; /* return value */ int apdu_len = 0; /* return value */
@@ -199,7 +204,8 @@ int Binary_Value_Encode_Property_APDU(uint8_t * apdu,
Binary_Value_Init(); Binary_Value_Init();
switch (property) { switch (property) {
case PROP_OBJECT_IDENTIFIER: case PROP_OBJECT_IDENTIFIER:
apdu_len = encode_application_object_id(&apdu[0], OBJECT_BINARY_VALUE, apdu_len =
encode_application_object_id(&apdu[0], OBJECT_BINARY_VALUE,
object_instance); object_instance);
break; break;
/* note: Name and Description don't have to be the same. /* note: Name and Description don't have to be the same.
@@ -208,10 +214,12 @@ int Binary_Value_Encode_Property_APDU(uint8_t * apdu,
case PROP_DESCRIPTION: case PROP_DESCRIPTION:
characterstring_init_ansi(&char_string, characterstring_init_ansi(&char_string,
Binary_Value_Name(object_instance)); Binary_Value_Name(object_instance));
apdu_len = encode_application_character_string(&apdu[0], &char_string); apdu_len =
encode_application_character_string(&apdu[0], &char_string);
break; break;
case PROP_OBJECT_TYPE: case PROP_OBJECT_TYPE:
apdu_len = encode_application_enumerated(&apdu[0], OBJECT_BINARY_VALUE); apdu_len =
encode_application_enumerated(&apdu[0], OBJECT_BINARY_VALUE);
break; break;
case PROP_PRESENT_VALUE: case PROP_PRESENT_VALUE:
present_value = Binary_Value_Present_Value(object_instance); present_value = Binary_Value_Present_Value(object_instance);
@@ -228,7 +236,8 @@ int Binary_Value_Encode_Property_APDU(uint8_t * apdu,
break; break;
case PROP_EVENT_STATE: case PROP_EVENT_STATE:
/* note: see the details in the standard on how to use this */ /* note: see the details in the standard on how to use this */
apdu_len = encode_application_enumerated(&apdu[0], EVENT_STATE_NORMAL); apdu_len =
encode_application_enumerated(&apdu[0], EVENT_STATE_NORMAL);
break; break;
case PROP_OUT_OF_SERVICE: case PROP_OUT_OF_SERVICE:
object_index = Binary_Value_Instance_To_Index(object_instance); object_index = Binary_Value_Instance_To_Index(object_instance);
@@ -300,8 +309,10 @@ int Binary_Value_Encode_Property_APDU(uint8_t * apdu,
} }
/* returns true if successful */ /* returns true if successful */
bool Binary_Value_Write_Property(BACNET_WRITE_PROPERTY_DATA * wp_data, bool Binary_Value_Write_Property(
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code) BACNET_WRITE_PROPERTY_DATA * wp_data,
BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code)
{ {
bool status = false; /* return value */ bool status = false; /* return value */
unsigned int object_index = 0; unsigned int object_index = 0;
@@ -332,7 +343,7 @@ bool Binary_Value_Write_Property(BACNET_WRITE_PROPERTY_DATA * wp_data,
(priority != 6 /* reserved */ ) && (priority != 6 /* reserved */ ) &&
(value.type.Enumerated >= MIN_BINARY_PV) && (value.type.Enumerated >= MIN_BINARY_PV) &&
(value.type.Enumerated <= MAX_BINARY_PV)) { (value.type.Enumerated <= MAX_BINARY_PV)) {
level = (BACNET_BINARY_PV)value.type.Enumerated; level = (BACNET_BINARY_PV) value.type.Enumerated;
object_index = object_index =
Binary_Value_Instance_To_Index(wp_data-> Binary_Value_Instance_To_Index(wp_data->
object_instance); object_instance);
@@ -404,7 +415,8 @@ bool Binary_Value_Write_Property(BACNET_WRITE_PROPERTY_DATA * wp_data,
#include <string.h> #include <string.h>
#include "ctest.h" #include "ctest.h"
void testBinary_Value(Test * pTest) void testBinary_Value(
Test * pTest)
{ {
uint8_t apdu[MAX_APDU] = { 0 }; uint8_t apdu[MAX_APDU] = { 0 };
int len = 0; int len = 0;
@@ -419,8 +431,7 @@ void testBinary_Value(Test * pTest)
len = Binary_Value_Encode_Property_APDU(&apdu[0], len = Binary_Value_Encode_Property_APDU(&apdu[0],
instance, instance,
PROP_OBJECT_IDENTIFIER, PROP_OBJECT_IDENTIFIER, BACNET_ARRAY_ALL, &error_class, &error_code);
BACNET_ARRAY_ALL, &error_class, &error_code);
ct_test(pTest, len != 0); ct_test(pTest, len != 0);
len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value); len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value);
ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_OBJECT_ID); ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_OBJECT_ID);
@@ -433,7 +444,8 @@ void testBinary_Value(Test * pTest)
} }
#ifdef TEST_BINARY_VALUE #ifdef TEST_BINARY_VALUE
int main(void) int main(
void)
{ {
Test *pTest; Test *pTest;
bool rc; bool rc;
bacnet-stack/demo/object/device.c
+176 -91
View File
@@ -46,12 +46,11 @@
#include "device.h" /* me */ #include "device.h" /* me */
#include "datalink.h" #include "datalink.h"
#if defined(BACFILE) #if defined(BACFILE)
#include "bacfile.h" /* object list dependency */ #include "bacfile.h" /* object list dependency */
#endif #endif
/* These three arrays are used by the ReadPropertyMultiple handler */ /* These three arrays are used by the ReadPropertyMultiple handler */
static const int Device_Properties_Required[] = static const int Device_Properties_Required[] = {
{
PROP_OBJECT_IDENTIFIER, PROP_OBJECT_IDENTIFIER,
PROP_OBJECT_NAME, PROP_OBJECT_NAME,
PROP_OBJECT_TYPE, PROP_OBJECT_TYPE,
@@ -80,8 +79,7 @@ static const int Device_Properties_Required[] =
-1 -1
}; };
static const int Device_Properties_Optional[] = static const int Device_Properties_Optional[] = {
{
PROP_DESCRIPTION, PROP_DESCRIPTION,
PROP_LOCAL_TIME, PROP_LOCAL_TIME,
PROP_UTC_OFFSET, PROP_UTC_OFFSET,
@@ -91,8 +89,7 @@ static const int Device_Properties_Optional[] =
-1 -1
}; };
static const int Device_Properties_Proprietary[] = static const int Device_Properties_Proprietary[] = {
{
-1 -1
}; };
@@ -159,12 +156,14 @@ static uint8_t Database_Revision = 0;
/* Profile_Name */ /* Profile_Name */
/* methods to manipulate the data */ /* methods to manipulate the data */
uint32_t Device_Object_Instance_Number(void) uint32_t Device_Object_Instance_Number(
void)
{ {
return Object_Instance_Number; return Object_Instance_Number;
} }
bool Device_Set_Object_Instance_Number(uint32_t object_id) bool Device_Set_Object_Instance_Number(
uint32_t object_id)
{ {
bool status = true; /* return value */ bool status = true; /* return value */
@@ -176,19 +175,23 @@ bool Device_Set_Object_Instance_Number(uint32_t object_id)
return status; return status;
} }
bool Device_Valid_Object_Instance_Number(uint32_t object_id) bool Device_Valid_Object_Instance_Number(
uint32_t object_id)
{ {
/* BACnet allows for a wildcard instance number */ /* BACnet allows for a wildcard instance number */
return ((Object_Instance_Number == object_id) || return ((Object_Instance_Number == object_id) ||
(object_id == BACNET_MAX_INSTANCE)); (object_id == BACNET_MAX_INSTANCE));
} }
const char *Device_Object_Name(void) const char *Device_Object_Name(
void)
{ {
return Object_Name; return Object_Name;
} }
bool Device_Set_Object_Name(const char *name, size_t length) bool Device_Set_Object_Name(
const char *name,
size_t length)
{ {
bool status = false; /*return value */ bool status = false; /*return value */
@@ -204,38 +207,46 @@ bool Device_Set_Object_Name(const char *name, size_t length)
return status; return status;
} }
BACNET_DEVICE_STATUS Device_System_Status(void) BACNET_DEVICE_STATUS Device_System_Status(
void)
{ {
return System_Status; return System_Status;
} }
void Device_Set_System_Status(BACNET_DEVICE_STATUS status) void Device_Set_System_Status(
BACNET_DEVICE_STATUS status)
{ {
/* FIXME: bounds check? */ /* FIXME: bounds check? */
System_Status = status; System_Status = status;
} }
const char *Device_Vendor_Name(void) const char *Device_Vendor_Name(
void)
{ {
return Vendor_Name; return Vendor_Name;
} }
uint16_t Device_Vendor_Identifier(void) uint16_t Device_Vendor_Identifier(
void)
{ {
return Vendor_Identifier; return Vendor_Identifier;
} }
void Device_Set_Vendor_Identifier(uint16_t vendor_id) void Device_Set_Vendor_Identifier(
uint16_t vendor_id)
{ {
Vendor_Identifier = vendor_id; Vendor_Identifier = vendor_id;
} }
const char *Device_Model_Name(void) const char *Device_Model_Name(
void)
{ {
return Model_Name; return Model_Name;
} }
bool Device_Set_Model_Name(const char *name, size_t length) bool Device_Set_Model_Name(
const char *name,
size_t length)
{ {
bool status = false; /*return value */ bool status = false; /*return value */
@@ -248,17 +259,20 @@ bool Device_Set_Model_Name(const char *name, size_t length)
return status; return status;
} }
const char *Device_Firmware_Revision(void) const char *Device_Firmware_Revision(
void)
{ {
return BACnet_Version; return BACnet_Version;
} }
const char *Device_Application_Software_Version(void) const char *Device_Application_Software_Version(
void)
{ {
return Application_Software_Version; return Application_Software_Version;
} }
bool Device_Set_Application_Software_Version(const char *name, bool Device_Set_Application_Software_Version(
const char *name,
size_t length) size_t length)
{ {
bool status = false; /*return value */ bool status = false; /*return value */
@@ -272,12 +286,15 @@ bool Device_Set_Application_Software_Version(const char *name,
return status; return status;
} }
const char *Device_Description(void) const char *Device_Description(
void)
{ {
return Description; return Description;
} }
bool Device_Set_Description(const char *name, size_t length) bool Device_Set_Description(
const char *name,
size_t length)
{ {
bool status = false; /*return value */ bool status = false; /*return value */
@@ -290,12 +307,15 @@ bool Device_Set_Description(const char *name, size_t length)
return status; return status;
} }
const char *Device_Location(void) const char *Device_Location(
void)
{ {
return Location; return Location;
} }
bool Device_Set_Location(const char *name, size_t length) bool Device_Set_Location(
const char *name,
size_t length)
{ {
bool status = false; /*return value */ bool status = false; /*return value */
@@ -308,60 +328,71 @@ bool Device_Set_Location(const char *name, size_t length)
return status; return status;
} }
uint8_t Device_Protocol_Version(void) uint8_t Device_Protocol_Version(
void)
{ {
return BACNET_PROTOCOL_VERSION; return BACNET_PROTOCOL_VERSION;
} }
uint8_t Device_Protocol_Revision(void) uint8_t Device_Protocol_Revision(
void)
{ {
return BACNET_PROTOCOL_REVISION; return BACNET_PROTOCOL_REVISION;
} }
uint16_t Device_Max_APDU_Length_Accepted(void) uint16_t Device_Max_APDU_Length_Accepted(
void)
{ {
return MAX_APDU; return MAX_APDU;
} }
BACNET_SEGMENTATION Device_Segmentation_Supported(void) BACNET_SEGMENTATION Device_Segmentation_Supported(
void)
{ {
return SEGMENTATION_NONE; return SEGMENTATION_NONE;
} }
uint16_t Device_APDU_Timeout(void) uint16_t Device_APDU_Timeout(
void)
{ {
return APDU_Timeout; return APDU_Timeout;
} }
/* in milliseconds */ /* in milliseconds */
void Device_Set_APDU_Timeout(uint16_t timeout) void Device_Set_APDU_Timeout(
uint16_t timeout)
{ {
APDU_Timeout = timeout; APDU_Timeout = timeout;
} }
uint8_t Device_Number_Of_APDU_Retries(void) uint8_t Device_Number_Of_APDU_Retries(
void)
{ {
return Number_Of_APDU_Retries; return Number_Of_APDU_Retries;
} }
void Device_Set_Number_Of_APDU_Retries(uint8_t retries) void Device_Set_Number_Of_APDU_Retries(
uint8_t retries)
{ {
Number_Of_APDU_Retries = retries; Number_Of_APDU_Retries = retries;
} }
uint8_t Device_Database_Revision(void) uint8_t Device_Database_Revision(
void)
{ {
return Database_Revision; return Database_Revision;
} }
void Device_Set_Database_Revision(uint8_t revision) void Device_Set_Database_Revision(
uint8_t revision)
{ {
Database_Revision = revision; Database_Revision = revision;
} }
/* Since many network clients depend on the object list */ /* Since many network clients depend on the object list */
/* for discovery, it must be consistent! */ /* for discovery, it must be consistent! */
unsigned Device_Object_List_Count(void) unsigned Device_Object_List_Count(
void)
{ {
unsigned count = 1; unsigned count = 1;
@@ -381,8 +412,10 @@ unsigned Device_Object_List_Count(void)
return count; return count;
} }
bool Device_Object_List_Identifier(unsigned array_index, bool Device_Object_List_Identifier(
int *object_type, uint32_t * instance) unsigned array_index,
int *object_type,
uint32_t * instance)
{ {
bool status = false; bool status = false;
unsigned object_index = 0; unsigned object_index = 0;
@@ -528,8 +561,10 @@ bool Device_Object_List_Identifier(unsigned array_index,
return status; return status;
} }
bool Device_Valid_Object_Name(const char *object_name, bool Device_Valid_Object_Name(
int *object_type, uint32_t * object_instance) const char *object_name,
int *object_type,
uint32_t * object_instance)
{ {
bool found = false; bool found = false;
int type = 0; int type = 0;
@@ -558,7 +593,9 @@ bool Device_Valid_Object_Name(const char *object_name,
} }
/* returns the name or NULL if not found */ /* returns the name or NULL if not found */
char *Device_Valid_Object_Id(int object_type, uint32_t object_instance) char *Device_Valid_Object_Id(
int object_type,
uint32_t object_instance)
{ {
char *name = NULL; /* return value */ char *name = NULL; /* return value */
@@ -608,10 +645,12 @@ char *Device_Valid_Object_Id(int object_type, uint32_t object_instance)
/* return the length of the apdu encoded or -1 for error or /* return the length of the apdu encoded or -1 for error or
-2 for abort message */ -2 for abort message */
int Device_Encode_Property_APDU(uint8_t * apdu, int Device_Encode_Property_APDU(
uint8_t * apdu,
BACNET_PROPERTY_ID property, BACNET_PROPERTY_ID property,
int32_t array_index, int32_t array_index,
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code) BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code)
{ {
int apdu_len = 0; /* return value */ int apdu_len = 0; /* return value */
int len = 0; /* apdu len intermediate value */ int len = 0; /* apdu len intermediate value */
@@ -629,37 +668,44 @@ int Device_Encode_Property_APDU(uint8_t * apdu,
break; break;
case PROP_OBJECT_NAME: case PROP_OBJECT_NAME:
characterstring_init_ansi(&char_string, Object_Name); characterstring_init_ansi(&char_string, Object_Name);
apdu_len = encode_application_character_string(&apdu[0], &char_string); apdu_len =
encode_application_character_string(&apdu[0], &char_string);
break; break;
case PROP_OBJECT_TYPE: case PROP_OBJECT_TYPE:
apdu_len = encode_application_enumerated(&apdu[0], OBJECT_DEVICE); apdu_len = encode_application_enumerated(&apdu[0], OBJECT_DEVICE);
break; break;
case PROP_DESCRIPTION: case PROP_DESCRIPTION:
characterstring_init_ansi(&char_string, Description); characterstring_init_ansi(&char_string, Description);
apdu_len = encode_application_character_string(&apdu[0], &char_string); apdu_len =
encode_application_character_string(&apdu[0], &char_string);
break; break;
case PROP_SYSTEM_STATUS: case PROP_SYSTEM_STATUS:
apdu_len = encode_application_enumerated(&apdu[0], System_Status); apdu_len = encode_application_enumerated(&apdu[0], System_Status);
break; break;
case PROP_VENDOR_NAME: case PROP_VENDOR_NAME:
characterstring_init_ansi(&char_string, Vendor_Name); characterstring_init_ansi(&char_string, Vendor_Name);
apdu_len = encode_application_character_string(&apdu[0], &char_string); apdu_len =
encode_application_character_string(&apdu[0], &char_string);
break; break;
case PROP_VENDOR_IDENTIFIER: case PROP_VENDOR_IDENTIFIER:
apdu_len = encode_application_unsigned(&apdu[0], Vendor_Identifier); apdu_len =
encode_application_unsigned(&apdu[0], Vendor_Identifier);
break; break;
case PROP_MODEL_NAME: case PROP_MODEL_NAME:
characterstring_init_ansi(&char_string, Model_Name); characterstring_init_ansi(&char_string, Model_Name);
apdu_len = encode_application_character_string(&apdu[0], &char_string); apdu_len =
encode_application_character_string(&apdu[0], &char_string);
break; break;
case PROP_FIRMWARE_REVISION: case PROP_FIRMWARE_REVISION:
characterstring_init_ansi(&char_string, BACnet_Version); characterstring_init_ansi(&char_string, BACnet_Version);
apdu_len = encode_application_character_string(&apdu[0], &char_string); apdu_len =
encode_application_character_string(&apdu[0], &char_string);
break; break;
case PROP_APPLICATION_SOFTWARE_VERSION: case PROP_APPLICATION_SOFTWARE_VERSION:
characterstring_init_ansi(&char_string, characterstring_init_ansi(&char_string,
Application_Software_Version); Application_Software_Version);
apdu_len = encode_application_character_string(&apdu[0], &char_string); apdu_len =
encode_application_character_string(&apdu[0], &char_string);
break; break;
/* FIXME: if you support time */ /* FIXME: if you support time */
case PROP_LOCAL_TIME: case PROP_LOCAL_TIME:
@@ -690,11 +736,13 @@ int Device_Encode_Property_APDU(uint8_t * apdu,
break; break;
case PROP_PROTOCOL_VERSION: case PROP_PROTOCOL_VERSION:
apdu_len = apdu_len =
encode_application_unsigned(&apdu[0], Device_Protocol_Version()); encode_application_unsigned(&apdu[0],
Device_Protocol_Version());
break; break;
case PROP_PROTOCOL_REVISION: case PROP_PROTOCOL_REVISION:
apdu_len = apdu_len =
encode_application_unsigned(&apdu[0], Device_Protocol_Revision()); encode_application_unsigned(&apdu[0],
Device_Protocol_Revision());
break; break;
/* BACnet Legacy Support */ /* BACnet Legacy Support */
case PROP_PROTOCOL_CONFORMANCE_CLASS: case PROP_PROTOCOL_CONFORMANCE_CLASS:
@@ -706,7 +754,7 @@ int Device_Encode_Property_APDU(uint8_t * apdu,
for (i = 0; i < MAX_BACNET_SERVICES_SUPPORTED; i++) { for (i = 0; i < MAX_BACNET_SERVICES_SUPPORTED; i++) {
/* automatic lookup based on handlers set */ /* automatic lookup based on handlers set */
bitstring_set_bit(&bit_string, (uint8_t) i, bitstring_set_bit(&bit_string, (uint8_t) i,
apdu_service_supported((BACNET_SERVICES_SUPPORTED)i)); apdu_service_supported((BACNET_SERVICES_SUPPORTED) i));
} }
apdu_len = encode_application_bitstring(&apdu[0], &bit_string); apdu_len = encode_application_bitstring(&apdu[0], &bit_string);
break; break;
@@ -809,15 +857,18 @@ int Device_Encode_Property_APDU(uint8_t * apdu,
/* FIXME: encode the list here, if it exists */ /* FIXME: encode the list here, if it exists */
break; break;
case PROP_DATABASE_REVISION: case PROP_DATABASE_REVISION:
apdu_len = encode_application_unsigned(&apdu[0], Database_Revision); apdu_len =
encode_application_unsigned(&apdu[0], Database_Revision);
break; break;
#if defined(BACDL_MSTP) #if defined(BACDL_MSTP)
case PROP_MAX_INFO_FRAMES: case PROP_MAX_INFO_FRAMES:
apdu_len = apdu_len =
encode_application_unsigned(&apdu[0], dlmstp_max_info_frames()); encode_application_unsigned(&apdu[0],
dlmstp_max_info_frames());
break; break;
case PROP_MAX_MASTER: case PROP_MAX_MASTER:
apdu_len = encode_application_unsigned(&apdu[0], dlmstp_max_master()); apdu_len =
encode_application_unsigned(&apdu[0], dlmstp_max_master());
break; break;
#endif #endif
default: default:
@@ -831,8 +882,10 @@ int Device_Encode_Property_APDU(uint8_t * apdu,
} }
/* returns true if successful */ /* returns true if successful */
bool Device_Write_Property(BACNET_WRITE_PROPERTY_DATA * wp_data, bool Device_Write_Property(
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code) BACNET_WRITE_PROPERTY_DATA * wp_data,
BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code)
{ {
bool status = false; /* return value */ bool status = false; /* return value */
int len = 0; int len = 0;
@@ -900,7 +953,8 @@ bool Device_Write_Property(BACNET_WRITE_PROPERTY_DATA * wp_data,
case PROP_SYSTEM_STATUS: case PROP_SYSTEM_STATUS:
if (value.tag == BACNET_APPLICATION_TAG_ENUMERATED) { if (value.tag == BACNET_APPLICATION_TAG_ENUMERATED) {
/* FIXME: bounds check? */ /* FIXME: bounds check? */
Device_Set_System_Status((BACNET_DEVICE_STATUS)value.type.Enumerated); Device_Set_System_Status((BACNET_DEVICE_STATUS) value.type.
Enumerated);
status = true; status = true;
} else { } else {
*error_class = ERROR_CLASS_PROPERTY; *error_class = ERROR_CLASS_PROPERTY;
@@ -975,7 +1029,8 @@ bool Device_Write_Property(BACNET_WRITE_PROPERTY_DATA * wp_data,
#include <string.h> #include <string.h>
#include "ctest.h" #include "ctest.h"
void testDevice(Test * pTest) void testDevice(
Test * pTest)
{ {
bool status = false; bool status = false;
const char *name = "Patricia"; const char *name = "Patricia";
@@ -1009,165 +1064,195 @@ void testDevice(Test * pTest)
#ifdef TEST_DEVICE #ifdef TEST_DEVICE
/* stubs to dependencies to keep unit test simple */ /* stubs to dependencies to keep unit test simple */
char *Analog_Input_Name(uint32_t object_instance) char *Analog_Input_Name(
uint32_t object_instance)
{ {
(void) object_instance; (void) object_instance;
return ""; return "";
} }
unsigned Analog_Input_Count(void) unsigned Analog_Input_Count(
void)
{ {
return 0; return 0;
} }
uint32_t Analog_Input_Index_To_Instance(unsigned index) uint32_t Analog_Input_Index_To_Instance(
unsigned index)
{ {
return index; return index;
} }
char *Analog_Output_Name(uint32_t object_instance) char *Analog_Output_Name(
uint32_t object_instance)
{ {
(void) object_instance; (void) object_instance;
return ""; return "";
} }
unsigned Analog_Output_Count(void) unsigned Analog_Output_Count(
void)
{ {
return 0; return 0;
} }
uint32_t Analog_Output_Index_To_Instance(unsigned index) uint32_t Analog_Output_Index_To_Instance(
unsigned index)
{ {
return index; return index;
} }
char *Analog_Value_Name(uint32_t object_instance) char *Analog_Value_Name(
uint32_t object_instance)
{ {
(void) object_instance; (void) object_instance;
return ""; return "";
} }
unsigned Analog_Value_Count(void) unsigned Analog_Value_Count(
void)
{ {
return 0; return 0;
} }
uint32_t Analog_Value_Index_To_Instance(unsigned index) uint32_t Analog_Value_Index_To_Instance(
unsigned index)
{ {
return index; return index;
} }
char *Binary_Input_Name(uint32_t object_instance) char *Binary_Input_Name(
uint32_t object_instance)
{ {
(void) object_instance; (void) object_instance;
return ""; return "";
} }
unsigned Binary_Input_Count(void) unsigned Binary_Input_Count(
void)
{ {
return 0; return 0;
} }
uint32_t Binary_Input_Index_To_Instance(unsigned index) uint32_t Binary_Input_Index_To_Instance(
unsigned index)
{ {
return index; return index;
} }
char *Binary_Output_Name(uint32_t object_instance) char *Binary_Output_Name(
uint32_t object_instance)
{ {
(void) object_instance; (void) object_instance;
return ""; return "";
} }
unsigned Binary_Output_Count(void) unsigned Binary_Output_Count(
void)
{ {
return 0; return 0;
} }
uint32_t Binary_Output_Index_To_Instance(unsigned index) uint32_t Binary_Output_Index_To_Instance(
unsigned index)
{ {
return index; return index;
} }
char *Binary_Value_Name(uint32_t object_instance) char *Binary_Value_Name(
uint32_t object_instance)
{ {
(void) object_instance; (void) object_instance;
return ""; return "";
} }
unsigned Binary_Value_Count(void) unsigned Binary_Value_Count(
void)
{ {
return 0; return 0;
} }
uint32_t Binary_Value_Index_To_Instance(unsigned index) uint32_t Binary_Value_Index_To_Instance(
unsigned index)
{ {
return index; return index;
} }
char *Life_Safety_Point_Name(uint32_t object_instance) char *Life_Safety_Point_Name(
uint32_t object_instance)
{ {
(void) object_instance; (void) object_instance;
return ""; return "";
} }
unsigned Life_Safety_Point_Count(void) unsigned Life_Safety_Point_Count(
void)
{ {
return 0; return 0;
} }
uint32_t Life_Safety_Point_Index_To_Instance(unsigned index) uint32_t Life_Safety_Point_Index_To_Instance(
unsigned index)
{ {
return index; return index;
} }
char *Load_Control_Name(uint32_t object_instance) char *Load_Control_Name(
uint32_t object_instance)
{ {
(void) object_instance; (void) object_instance;
return ""; return "";
} }
unsigned Load_Control_Count(void) unsigned Load_Control_Count(
void)
{ {
return 0; return 0;
} }
uint32_t Load_Control_Index_To_Instance(unsigned index) uint32_t Load_Control_Index_To_Instance(
unsigned index)
{ {
return index; return index;
} }
char *Multistate_Output_Name(uint32_t object_instance) char *Multistate_Output_Name(
uint32_t object_instance)
{ {
(void) object_instance; (void) object_instance;
return ""; return "";
} }
unsigned Multistate_Output_Count(void) unsigned Multistate_Output_Count(
void)
{ {
return 0; return 0;
} }
uint32_t Multistate_Output_Index_To_Instance(unsigned index) uint32_t Multistate_Output_Index_To_Instance(
unsigned index)
{ {
return index; return index;
} }
#if defined(BACFILE) #if defined(BACFILE)
uint32_t bacfile_count(void) uint32_t bacfile_count(
void)
{ {
return 0; return 0;
} }
#endif #endif
#if defined(BACFILE) #if defined(BACFILE)
uint32_t bacfile_index_to_instance(unsigned find_index) uint32_t bacfile_index_to_instance(
unsigned find_index)
{ {
return find_index; return find_index;
} }
#endif #endif
int main(void) int main(
void)
{ {
Test *pTest; Test *pTest;
bool rc; bool rc;
bacnet-stack/demo/object/lc.c
+127 -93
View File
@@ -138,8 +138,7 @@ static float Shed_Level_Values[MAX_SHED_LEVELS] = {
static bool Load_Control_Initialized = false; static bool Load_Control_Initialized = false;
/* These three arrays are used by the ReadPropertyMultiple handler */ /* These three arrays are used by the ReadPropertyMultiple handler */
static const int Load_Control_Properties_Required[] = static const int Load_Control_Properties_Required[] = {
{
PROP_OBJECT_IDENTIFIER, PROP_OBJECT_IDENTIFIER,
PROP_OBJECT_NAME, PROP_OBJECT_NAME,
PROP_OBJECT_TYPE, PROP_OBJECT_TYPE,
@@ -158,15 +157,13 @@ static const int Load_Control_Properties_Required[] =
-1 -1
}; };
static const int Load_Control_Properties_Optional[] = static const int Load_Control_Properties_Optional[] = {
{
PROP_DESCRIPTION, PROP_DESCRIPTION,
PROP_FULL_DUTY_BASELINE, PROP_FULL_DUTY_BASELINE,
-1 -1
}; };
static const int Load_Control_Properties_Proprietary[] = static const int Load_Control_Properties_Proprietary[] = {
{
-1 -1
}; };
@@ -185,7 +182,8 @@ void Load_Control_Property_Lists(
return; return;
} }
void Load_Control_Init(void) void Load_Control_Init(
void)
{ {
unsigned i, j; unsigned i, j;
@@ -221,7 +219,8 @@ void Load_Control_Init(void)
/* we simply have 0-n object instances. Yours might be */ /* we simply have 0-n object instances. Yours might be */
/* more complex, and then you need validate that the */ /* more complex, and then you need validate that the */
/* given instance exists */ /* given instance exists */
bool Load_Control_Valid_Instance(uint32_t object_instance) bool Load_Control_Valid_Instance(
uint32_t object_instance)
{ {
Load_Control_Init(); Load_Control_Init();
if (object_instance < MAX_LOAD_CONTROLS) if (object_instance < MAX_LOAD_CONTROLS)
@@ -232,7 +231,8 @@ bool Load_Control_Valid_Instance(uint32_t object_instance)
/* we simply have 0-n object instances. Yours might be */ /* we simply have 0-n object instances. Yours might be */
/* more complex, and then count how many you have */ /* more complex, and then count how many you have */
unsigned Load_Control_Count(void) unsigned Load_Control_Count(
void)
{ {
Load_Control_Init(); Load_Control_Init();
return MAX_LOAD_CONTROLS; return MAX_LOAD_CONTROLS;
@@ -241,7 +241,8 @@ unsigned Load_Control_Count(void)
/* we simply have 0-n object instances. Yours might be */ /* we simply have 0-n object instances. Yours might be */
/* more complex, and then you need to return the instance */ /* more complex, and then you need to return the instance */
/* that correlates to the correct index */ /* that correlates to the correct index */
uint32_t Load_Control_Index_To_Instance(unsigned index) uint32_t Load_Control_Index_To_Instance(
unsigned index)
{ {
Load_Control_Init(); Load_Control_Init();
return index; return index;
@@ -250,7 +251,8 @@ uint32_t Load_Control_Index_To_Instance(unsigned index)
/* we simply have 0-n object instances. Yours might be */ /* we simply have 0-n object instances. Yours might be */
/* more complex, and then you need to return the index */ /* more complex, and then you need to return the index */
/* that correlates to the correct instance number */ /* that correlates to the correct instance number */
unsigned Load_Control_Instance_To_Index(uint32_t object_instance) unsigned Load_Control_Instance_To_Index(
uint32_t object_instance)
{ {
unsigned index = MAX_LOAD_CONTROLS; unsigned index = MAX_LOAD_CONTROLS;
@@ -261,8 +263,8 @@ unsigned Load_Control_Instance_To_Index(uint32_t object_instance)
return index; return index;
} }
static BACNET_SHED_STATE Load_Control_Present_Value(uint32_t static BACNET_SHED_STATE Load_Control_Present_Value(
object_instance) uint32_t object_instance)
{ {
BACNET_SHED_STATE value = BACNET_SHED_INACTIVE; BACNET_SHED_STATE value = BACNET_SHED_INACTIVE;
unsigned index = 0; unsigned index = 0;
@@ -277,7 +279,8 @@ static BACNET_SHED_STATE Load_Control_Present_Value(uint32_t
} }
/* note: the object name must be unique within this device */ /* note: the object name must be unique within this device */
char *Load_Control_Name(uint32_t object_instance) char *Load_Control_Name(
uint32_t object_instance)
{ {
static char text_string[32] = ""; /* okay for single thread */ static char text_string[32] = ""; /* okay for single thread */
@@ -289,7 +292,8 @@ char *Load_Control_Name(uint32_t object_instance)
return NULL; return NULL;
} }
static void Update_Current_Time(BACNET_DATE_TIME * bdatetime) static void Update_Current_Time(
BACNET_DATE_TIME * bdatetime)
{ {
time_t timer; time_t timer;
struct tm *tblock; struct tm *tblock;
@@ -319,7 +323,8 @@ struct tm {
} }
/* convert the shed level request into an Analog Output Present_Value */ /* convert the shed level request into an Analog Output Present_Value */
static float Requested_Shed_Level_Value(int object_index) static float Requested_Shed_Level_Value(
int object_index)
{ {
unsigned shed_level_index = 0; unsigned shed_level_index = 0;
unsigned i = 0; unsigned i = 0;
@@ -352,7 +357,8 @@ static float Requested_Shed_Level_Value(int object_index)
return requested_level; return requested_level;
} }
static void Shed_Level_Copy(BACNET_SHED_LEVEL * dest, static void Shed_Level_Copy(
BACNET_SHED_LEVEL * dest,
BACNET_SHED_LEVEL * src) BACNET_SHED_LEVEL * src)
{ {
if (dest && src) { if (dest && src) {
@@ -372,7 +378,8 @@ static void Shed_Level_Copy(BACNET_SHED_LEVEL * dest,
} }
} }
static void Shed_Level_Default_Set(BACNET_SHED_LEVEL * dest, static void Shed_Level_Default_Set(
BACNET_SHED_LEVEL * dest,
BACNET_SHED_LEVEL_TYPE type) BACNET_SHED_LEVEL_TYPE type)
{ {
if (dest) { if (dest) {
@@ -392,7 +399,8 @@ static void Shed_Level_Default_Set(BACNET_SHED_LEVEL * dest,
} }
} }
static bool Able_To_Meet_Shed_Request(int object_index) static bool Able_To_Meet_Shed_Request(
int object_index)
{ {
float level = 0.0; float level = 0.0;
float requested_level = 0.0; float requested_level = 0.0;
@@ -427,7 +435,8 @@ static LOAD_CONTROL_STATE Load_Control_State[MAX_LOAD_CONTROLS];
static LOAD_CONTROL_STATE Load_Control_State_Previously[MAX_LOAD_CONTROLS]; static LOAD_CONTROL_STATE Load_Control_State_Previously[MAX_LOAD_CONTROLS];
#if PRINT_ENABLED_DEBUG #if PRINT_ENABLED_DEBUG
static void Print_Load_Control_State(int object_index) static void Print_Load_Control_State(
int object_index)
{ {
char *Load_Control_State_Text[MAX_LOAD_CONTROLS] = { char *Load_Control_State_Text[MAX_LOAD_CONTROLS] = {
"SHED_INACTIVE", "SHED_INACTIVE",
@@ -445,7 +454,8 @@ static void Print_Load_Control_State(int object_index)
} }
#endif #endif
void Load_Control_State_Machine(int object_index) void Load_Control_State_Machine(
int object_index)
{ {
unsigned i = 0; /* loop counter */ unsigned i = 0; /* loop counter */
int diff = 0; /* used for datetime comparison */ int diff = 0; /* used for datetime comparison */
@@ -510,8 +520,7 @@ void Load_Control_State_Machine(int object_index)
/* FIXME: stop shedding! i.e. relinquish */ /* FIXME: stop shedding! i.e. relinquish */
#if PRINT_ENABLED_DEBUG #if PRINT_ENABLED_DEBUG
printf("Load Control[%d]:Current Time" printf("Load Control[%d]:Current Time"
" is after Start Time + Duration\n", " is after Start Time + Duration\n", object_index);
object_index);
#endif #endif
Load_Control_State[object_index] = SHED_INACTIVE; Load_Control_State[object_index] = SHED_INACTIVE;
break; break;
@@ -528,8 +537,7 @@ void Load_Control_State_Machine(int object_index)
/* current time after to start time */ /* current time after to start time */
#if PRINT_ENABLED_DEBUG #if PRINT_ENABLED_DEBUG
printf("Load Control[%d]:Current Time" printf("Load Control[%d]:Current Time"
" is after Start Time\n", " is after Start Time\n", object_index);
object_index);
#endif #endif
/* AbleToMeetShed */ /* AbleToMeetShed */
if (Able_To_Meet_Shed_Request(object_index)) { if (Able_To_Meet_Shed_Request(object_index)) {
@@ -652,7 +660,8 @@ void Load_Control_State_Machine(int object_index)
} }
/* call every second or so */ /* call every second or so */
void Load_Control_State_Machine_Handler(void) void Load_Control_State_Machine_Handler(
void)
{ {
unsigned i = 0; unsigned i = 0;
static bool initialized = false; static bool initialized = false;
@@ -680,11 +689,13 @@ void Load_Control_State_Machine_Handler(void)
} }
/* return apdu len, or -1 on error */ /* return apdu len, or -1 on error */
int Load_Control_Encode_Property_APDU(uint8_t * apdu, int Load_Control_Encode_Property_APDU(
uint8_t * apdu,
uint32_t object_instance, uint32_t object_instance,
BACNET_PROPERTY_ID property, BACNET_PROPERTY_ID property,
int32_t array_index, int32_t array_index,
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code) BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code)
{ {
int len = 0; int len = 0;
int apdu_len = 0; /* return value */ int apdu_len = 0; /* return value */
@@ -699,16 +710,19 @@ int Load_Control_Encode_Property_APDU(uint8_t * apdu,
object_index = Load_Control_Instance_To_Index(object_instance); object_index = Load_Control_Instance_To_Index(object_instance);
switch (property) { switch (property) {
case PROP_OBJECT_IDENTIFIER: case PROP_OBJECT_IDENTIFIER:
apdu_len = encode_application_object_id(&apdu[0], OBJECT_LOAD_CONTROL, apdu_len =
encode_application_object_id(&apdu[0], OBJECT_LOAD_CONTROL,
object_instance); object_instance);
break; break;
case PROP_OBJECT_NAME: case PROP_OBJECT_NAME:
characterstring_init_ansi(&char_string, characterstring_init_ansi(&char_string,
Load_Control_Name(object_instance)); Load_Control_Name(object_instance));
apdu_len = encode_application_character_string(&apdu[0], &char_string); apdu_len =
encode_application_character_string(&apdu[0], &char_string);
break; break;
case PROP_OBJECT_TYPE: case PROP_OBJECT_TYPE:
apdu_len = encode_application_enumerated(&apdu[0], OBJECT_LOAD_CONTROL); apdu_len =
encode_application_enumerated(&apdu[0], OBJECT_LOAD_CONTROL);
break; break;
/* optional property /* optional property
case PROP_DESCRIPTION: case PROP_DESCRIPTION:
@@ -738,7 +752,8 @@ int Load_Control_Encode_Property_APDU(uint8_t * apdu,
apdu_len = encode_application_bitstring(&apdu[0], &bit_string); apdu_len = encode_application_bitstring(&apdu[0], &bit_string);
break; break;
case PROP_EVENT_STATE: case PROP_EVENT_STATE:
apdu_len = encode_application_enumerated(&apdu[0], EVENT_STATE_NORMAL); apdu_len =
encode_application_enumerated(&apdu[0], EVENT_STATE_NORMAL);
break; break;
case PROP_REQUESTED_SHED_LEVEL: case PROP_REQUESTED_SHED_LEVEL:
switch (Requested_Shed_Level[object_index].type) { switch (Requested_Shed_Level[object_index].type) {
@@ -758,7 +773,9 @@ int Load_Control_Encode_Property_APDU(uint8_t * apdu,
} }
break; break;
case PROP_START_TIME: case PROP_START_TIME:
len = encode_application_date(&apdu[0], &Start_Time[object_index].date); len =
encode_application_date(&apdu[0],
&Start_Time[object_index].date);
apdu_len = len; apdu_len = len;
len = encode_application_time(&apdu[apdu_len], len = encode_application_time(&apdu[apdu_len],
&Start_Time[object_index].time); &Start_Time[object_index].time);
@@ -817,7 +834,8 @@ int Load_Control_Encode_Property_APDU(uint8_t * apdu,
case PROP_SHED_LEVELS: case PROP_SHED_LEVELS:
/* Array element zero is the number of elements in the array */ /* Array element zero is the number of elements in the array */
if (array_index == 0) if (array_index == 0)
apdu_len = encode_application_unsigned(&apdu[0], MAX_SHED_LEVELS); apdu_len =
encode_application_unsigned(&apdu[0], MAX_SHED_LEVELS);
/* if no index was specified, then try to encode the entire list */ /* if no index was specified, then try to encode the entire list */
/* into one packet. */ /* into one packet. */
else if (array_index == BACNET_ARRAY_ALL) { else if (array_index == BACNET_ARRAY_ALL) {
@@ -851,7 +869,8 @@ int Load_Control_Encode_Property_APDU(uint8_t * apdu,
case PROP_SHED_LEVEL_DESCRIPTIONS: case PROP_SHED_LEVEL_DESCRIPTIONS:
/* Array element zero is the number of elements in the array */ /* Array element zero is the number of elements in the array */
if (array_index == 0) if (array_index == 0)
apdu_len = encode_application_unsigned(&apdu[0], MAX_SHED_LEVELS); apdu_len =
encode_application_unsigned(&apdu[0], MAX_SHED_LEVELS);
/* if no index was specified, then try to encode the entire list */ /* if no index was specified, then try to encode the entire list */
/* into one packet. */ /* into one packet. */
else if (array_index == BACNET_ARRAY_ALL) { else if (array_index == BACNET_ARRAY_ALL) {
@@ -896,8 +915,10 @@ int Load_Control_Encode_Property_APDU(uint8_t * apdu,
} }
/* returns true if successful */ /* returns true if successful */
bool Load_Control_Write_Property(BACNET_WRITE_PROPERTY_DATA * wp_data, bool Load_Control_Write_Property(
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code) BACNET_WRITE_PROPERTY_DATA * wp_data,
BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code)
{ {
bool status = false; /* return value */ bool status = false; /* return value */
unsigned int object_index = 0; unsigned int object_index = 0;
@@ -915,8 +936,7 @@ bool Load_Control_Write_Property(BACNET_WRITE_PROPERTY_DATA * wp_data,
wp_data->application_data_len, &value); wp_data->application_data_len, &value);
/* FIXME: len < application_data_len: more data? */ /* FIXME: len < application_data_len: more data? */
/* FIXME: len == 0: unable to decode? */ /* FIXME: len == 0: unable to decode? */
object_index = object_index = Load_Control_Instance_To_Index(wp_data->object_instance);
Load_Control_Instance_To_Index(wp_data->object_instance);
switch (wp_data->object_property) { switch (wp_data->object_property) {
case PROP_REQUESTED_SHED_LEVEL: case PROP_REQUESTED_SHED_LEVEL:
len = bacapp_decode_context_data(wp_data->application_data, len = bacapp_decode_context_data(wp_data->application_data,
@@ -1041,8 +1061,10 @@ bool Load_Control_Write_Property(BACNET_WRITE_PROPERTY_DATA * wp_data,
#include "ctest.h" #include "ctest.h"
#if 0 #if 0
static void Load_Control_WriteProperty_Request_Shed_Percent(Test * pTest, static void Load_Control_WriteProperty_Request_Shed_Percent(
int instance, unsigned percent) Test * pTest,
int instance,
unsigned percent)
{ {
bool status = false; bool status = false;
BACNET_APPLICATION_DATA_VALUE value; BACNET_APPLICATION_DATA_VALUE value;
@@ -1062,14 +1084,15 @@ static void Load_Control_WriteProperty_Request_Shed_Percent(Test * pTest,
wp_data.application_data_len = wp_data.application_data_len =
bacapp_encode_data(&wp_data.application_data[0], &value); bacapp_encode_data(&wp_data.application_data[0], &value);
ct_test(pTest, wp_data.application_data_len > 0); ct_test(pTest, wp_data.application_data_len > 0);
status = Load_Control_Write_Property(&wp_data, status = Load_Control_Write_Property(&wp_data, &error_class, &error_code);
&error_class, &error_code);
ct_test(pTest, status == true); ct_test(pTest, status == true);
} }
#endif #endif
static void Load_Control_WriteProperty_Request_Shed_Level(Test * pTest, static void Load_Control_WriteProperty_Request_Shed_Level(
int instance, unsigned level) Test * pTest,
int instance,
unsigned level)
{ {
bool status = false; bool status = false;
BACNET_APPLICATION_DATA_VALUE value; BACNET_APPLICATION_DATA_VALUE value;
@@ -1089,14 +1112,15 @@ static void Load_Control_WriteProperty_Request_Shed_Level(Test * pTest,
wp_data.application_data_len = wp_data.application_data_len =
bacapp_encode_data(&wp_data.application_data[0], &value); bacapp_encode_data(&wp_data.application_data[0], &value);
ct_test(pTest, wp_data.application_data_len > 0); ct_test(pTest, wp_data.application_data_len > 0);
status = Load_Control_Write_Property(&wp_data, status = Load_Control_Write_Property(&wp_data, &error_class, &error_code);
&error_class, &error_code);
ct_test(pTest, status == true); ct_test(pTest, status == true);
} }
#if 0 #if 0
static void Load_Control_WriteProperty_Request_Shed_Amount(Test * pTest, static void Load_Control_WriteProperty_Request_Shed_Amount(
int instance, float amount) Test * pTest,
int instance,
float amount)
{ {
bool status = false; bool status = false;
BACNET_APPLICATION_DATA_VALUE value; BACNET_APPLICATION_DATA_VALUE value;
@@ -1116,13 +1140,14 @@ static void Load_Control_WriteProperty_Request_Shed_Amount(Test * pTest,
wp_data.application_data_len = wp_data.application_data_len =
bacapp_encode_data(&wp_data.application_data[0], &value); bacapp_encode_data(&wp_data.application_data[0], &value);
ct_test(pTest, wp_data.application_data_len > 0); ct_test(pTest, wp_data.application_data_len > 0);
status = Load_Control_Write_Property(&wp_data, status = Load_Control_Write_Property(&wp_data, &error_class, &error_code);
&error_class, &error_code);
ct_test(pTest, status == true); ct_test(pTest, status == true);
} }
#endif #endif
static void Load_Control_WriteProperty_Enable(Test * pTest, int instance, static void Load_Control_WriteProperty_Enable(
Test * pTest,
int instance,
bool enable) bool enable)
{ {
bool status = false; bool status = false;
@@ -1144,13 +1169,14 @@ static void Load_Control_WriteProperty_Enable(Test * pTest, int instance,
wp_data.application_data_len = wp_data.application_data_len =
bacapp_encode_data(&wp_data.application_data[0], &value); bacapp_encode_data(&wp_data.application_data[0], &value);
ct_test(pTest, wp_data.application_data_len > 0); ct_test(pTest, wp_data.application_data_len > 0);
status = Load_Control_Write_Property(&wp_data, status = Load_Control_Write_Property(&wp_data, &error_class, &error_code);
&error_class, &error_code);
ct_test(pTest, status == true); ct_test(pTest, status == true);
} }
static void Load_Control_WriteProperty_Shed_Duration(Test * pTest, static void Load_Control_WriteProperty_Shed_Duration(
int instance, unsigned duration) Test * pTest,
int instance,
unsigned duration)
{ {
bool status = false; bool status = false;
BACNET_APPLICATION_DATA_VALUE value; BACNET_APPLICATION_DATA_VALUE value;
@@ -1170,13 +1196,14 @@ static void Load_Control_WriteProperty_Shed_Duration(Test * pTest,
wp_data.application_data_len = wp_data.application_data_len =
bacapp_encode_data(&wp_data.application_data[0], &value); bacapp_encode_data(&wp_data.application_data[0], &value);
ct_test(pTest, wp_data.application_data_len > 0); ct_test(pTest, wp_data.application_data_len > 0);
status = Load_Control_Write_Property(&wp_data, status = Load_Control_Write_Property(&wp_data, &error_class, &error_code);
&error_class, &error_code);
ct_test(pTest, status == true); ct_test(pTest, status == true);
} }
static void Load_Control_WriteProperty_Duty_Window(Test * pTest, static void Load_Control_WriteProperty_Duty_Window(
int instance, unsigned duration) Test * pTest,
int instance,
unsigned duration)
{ {
bool status = false; bool status = false;
BACNET_APPLICATION_DATA_VALUE value; BACNET_APPLICATION_DATA_VALUE value;
@@ -1196,12 +1223,12 @@ static void Load_Control_WriteProperty_Duty_Window(Test * pTest,
wp_data.application_data_len = wp_data.application_data_len =
bacapp_encode_data(&wp_data.application_data[0], &value); bacapp_encode_data(&wp_data.application_data[0], &value);
ct_test(pTest, wp_data.application_data_len > 0); ct_test(pTest, wp_data.application_data_len > 0);
status = Load_Control_Write_Property(&wp_data, status = Load_Control_Write_Property(&wp_data, &error_class, &error_code);
&error_class, &error_code);
ct_test(pTest, status == true); ct_test(pTest, status == true);
} }
static void Load_Control_WriteProperty_Start_Time_Wildcards(Test * pTest, static void Load_Control_WriteProperty_Start_Time_Wildcards(
Test * pTest,
int instance) int instance)
{ {
int len = 0; int len = 0;
@@ -1230,14 +1257,20 @@ static void Load_Control_WriteProperty_Start_Time_Wildcards(Test * pTest,
bacapp_encode_data(&wp_data.application_data[len], &value); bacapp_encode_data(&wp_data.application_data[len], &value);
ct_test(pTest, wp_data.application_data_len > 0); ct_test(pTest, wp_data.application_data_len > 0);
wp_data.application_data_len += len; wp_data.application_data_len += len;
status = Load_Control_Write_Property(&wp_data, status = Load_Control_Write_Property(&wp_data, &error_class, &error_code);
&error_class, &error_code);
ct_test(pTest, status == true); ct_test(pTest, status == true);
} }
static void Load_Control_WriteProperty_Start_Time(Test * pTest, int instance, static void Load_Control_WriteProperty_Start_Time(
uint16_t year, uint8_t month, uint8_t day, Test * pTest,
uint8_t hour, uint8_t minute, uint8_t seconds, uint8_t hundredths) int instance,
uint16_t year,
uint8_t month,
uint8_t day,
uint8_t hour,
uint8_t minute,
uint8_t seconds,
uint8_t hundredths)
{ {
int len = 0; int len = 0;
bool status = false; bool status = false;
@@ -1265,12 +1298,12 @@ static void Load_Control_WriteProperty_Start_Time(Test * pTest, int instance,
bacapp_encode_data(&wp_data.application_data[len], &value); bacapp_encode_data(&wp_data.application_data[len], &value);
ct_test(pTest, wp_data.application_data_len > 0); ct_test(pTest, wp_data.application_data_len > 0);
wp_data.application_data_len += len; wp_data.application_data_len += len;
status = Load_Control_Write_Property(&wp_data, status = Load_Control_Write_Property(&wp_data, &error_class, &error_code);
&error_class, &error_code);
ct_test(pTest, status == true); ct_test(pTest, status == true);
} }
void testLoadControlStateMachine(Test * pTest) void testLoadControlStateMachine(
Test * pTest)
{ {
unsigned i = 0, j = 0; unsigned i = 0, j = 0;
uint8_t level = 0; uint8_t level = 0;
@@ -1296,9 +1329,9 @@ void testLoadControlStateMachine(Test * pTest)
/* CancelShed - Requested_Shed_Level equal to default value */ /* CancelShed - Requested_Shed_Level equal to default value */
Load_Control_Init(); Load_Control_Init();
Load_Control_WriteProperty_Request_Shed_Level(pTest, 0, 0); Load_Control_WriteProperty_Request_Shed_Level(pTest, 0, 0);
Load_Control_WriteProperty_Start_Time(pTest, 0, 2007,2,27,15,0,0,0); Load_Control_WriteProperty_Start_Time(pTest, 0, 2007, 2, 27, 15, 0, 0, 0);
Load_Control_WriteProperty_Shed_Duration(pTest, 0, 5); Load_Control_WriteProperty_Shed_Duration(pTest, 0, 5);
datetime_set_values(&Current_Time, 2007,2,27,15,0,0,0); datetime_set_values(&Current_Time, 2007, 2, 27, 15, 0, 0, 0);
Load_Control_State_Machine(0); Load_Control_State_Machine(0);
ct_test(pTest, Load_Control_State[0] == SHED_REQUEST_PENDING); ct_test(pTest, Load_Control_State[0] == SHED_REQUEST_PENDING);
Load_Control_State_Machine(0); Load_Control_State_Machine(0);
@@ -1309,8 +1342,8 @@ void testLoadControlStateMachine(Test * pTest)
Load_Control_WriteProperty_Enable(pTest, 0, true); Load_Control_WriteProperty_Enable(pTest, 0, true);
Load_Control_WriteProperty_Request_Shed_Level(pTest, 0, 1); Load_Control_WriteProperty_Request_Shed_Level(pTest, 0, 1);
Load_Control_WriteProperty_Shed_Duration(pTest, 0, 5); Load_Control_WriteProperty_Shed_Duration(pTest, 0, 5);
Load_Control_WriteProperty_Start_Time(pTest, 0, 2007,2,27,15,0,0,0); Load_Control_WriteProperty_Start_Time(pTest, 0, 2007, 2, 27, 15, 0, 0, 0);
datetime_set_values(&Current_Time, 2007,2,28,15,0,0,0); datetime_set_values(&Current_Time, 2007, 2, 28, 15, 0, 0, 0);
Load_Control_State_Machine(0); Load_Control_State_Machine(0);
ct_test(pTest, Load_Control_State[0] == SHED_REQUEST_PENDING); ct_test(pTest, Load_Control_State[0] == SHED_REQUEST_PENDING);
Load_Control_State_Machine(0); Load_Control_State_Machine(0);
@@ -1321,8 +1354,8 @@ void testLoadControlStateMachine(Test * pTest)
Load_Control_WriteProperty_Enable(pTest, 0, true); Load_Control_WriteProperty_Enable(pTest, 0, true);
Load_Control_WriteProperty_Request_Shed_Level(pTest, 0, 1); Load_Control_WriteProperty_Request_Shed_Level(pTest, 0, 1);
Load_Control_WriteProperty_Shed_Duration(pTest, 0, 5); Load_Control_WriteProperty_Shed_Duration(pTest, 0, 5);
Load_Control_WriteProperty_Start_Time(pTest, 0, 2007,2,27,15,0,0,0); Load_Control_WriteProperty_Start_Time(pTest, 0, 2007, 2, 27, 15, 0, 0, 0);
datetime_set_values(&Current_Time, 2007,2,27,5,0,0,0); datetime_set_values(&Current_Time, 2007, 2, 27, 5, 0, 0, 0);
Load_Control_State_Machine(0); Load_Control_State_Machine(0);
ct_test(pTest, Load_Control_State[0] == SHED_REQUEST_PENDING); ct_test(pTest, Load_Control_State[0] == SHED_REQUEST_PENDING);
Load_Control_State_Machine(0); Load_Control_State_Machine(0);
@@ -1336,7 +1369,7 @@ void testLoadControlStateMachine(Test * pTest)
Load_Control_WriteProperty_Duty_Window(pTest, 0, 60); Load_Control_WriteProperty_Duty_Window(pTest, 0, 60);
Load_Control_State_Machine(0); Load_Control_State_Machine(0);
ct_test(pTest, Load_Control_State[0] == SHED_REQUEST_PENDING); ct_test(pTest, Load_Control_State[0] == SHED_REQUEST_PENDING);
Load_Control_WriteProperty_Start_Time(pTest, 0, 2007,2,27,15,0,0,1); Load_Control_WriteProperty_Start_Time(pTest, 0, 2007, 2, 27, 15, 0, 0, 1);
Load_Control_State_Machine(0); Load_Control_State_Machine(0);
ct_test(pTest, Load_Control_State[0] == SHED_REQUEST_PENDING); ct_test(pTest, Load_Control_State[0] == SHED_REQUEST_PENDING);
Load_Control_State_Machine(0); Load_Control_State_Machine(0);
@@ -1349,21 +1382,21 @@ void testLoadControlStateMachine(Test * pTest)
Load_Control_WriteProperty_Enable(pTest, 0, true); Load_Control_WriteProperty_Enable(pTest, 0, true);
Load_Control_WriteProperty_Request_Shed_Level(pTest, 0, 1); Load_Control_WriteProperty_Request_Shed_Level(pTest, 0, 1);
Load_Control_WriteProperty_Shed_Duration(pTest, 0, 120); Load_Control_WriteProperty_Shed_Duration(pTest, 0, 120);
Load_Control_WriteProperty_Start_Time(pTest, 0, 2007,2,27,15,0,0,0); Load_Control_WriteProperty_Start_Time(pTest, 0, 2007, 2, 27, 15, 0, 0, 0);
datetime_set_values(&Current_Time, 2007,2,27,5,0,0,0); datetime_set_values(&Current_Time, 2007, 2, 27, 5, 0, 0, 0);
Load_Control_State_Machine(0); Load_Control_State_Machine(0);
ct_test(pTest, Load_Control_State[0] == SHED_REQUEST_PENDING); ct_test(pTest, Load_Control_State[0] == SHED_REQUEST_PENDING);
Load_Control_State_Machine(0); Load_Control_State_Machine(0);
ct_test(pTest, Load_Control_State[0] == SHED_REQUEST_PENDING); ct_test(pTest, Load_Control_State[0] == SHED_REQUEST_PENDING);
/* set to lowest value so we cannot meet the shed level */ /* set to lowest value so we cannot meet the shed level */
datetime_set_values(&Current_Time, 2007,2,27,16,0,0,0); datetime_set_values(&Current_Time, 2007, 2, 27, 16, 0, 0, 0);
Analog_Output_Present_Value_Set(0, 0, 16); Analog_Output_Present_Value_Set(0, 0, 16);
Load_Control_State_Machine(0); Load_Control_State_Machine(0);
ct_test(pTest, Load_Control_State[0] == SHED_NON_COMPLIANT); ct_test(pTest, Load_Control_State[0] == SHED_NON_COMPLIANT);
Load_Control_State_Machine(0); Load_Control_State_Machine(0);
ct_test(pTest, Load_Control_State[0] == SHED_NON_COMPLIANT); ct_test(pTest, Load_Control_State[0] == SHED_NON_COMPLIANT);
/* FinishedUnsuccessfulShed */ /* FinishedUnsuccessfulShed */
datetime_set_values(&Current_Time, 2007,2,27,23,0,0,0); datetime_set_values(&Current_Time, 2007, 2, 27, 23, 0, 0, 0);
Load_Control_State_Machine(0); Load_Control_State_Machine(0);
ct_test(pTest, Load_Control_State[0] == SHED_INACTIVE); ct_test(pTest, Load_Control_State[0] == SHED_INACTIVE);
@@ -1372,44 +1405,45 @@ void testLoadControlStateMachine(Test * pTest)
Load_Control_WriteProperty_Enable(pTest, 0, true); Load_Control_WriteProperty_Enable(pTest, 0, true);
Load_Control_WriteProperty_Request_Shed_Level(pTest, 0, 1); Load_Control_WriteProperty_Request_Shed_Level(pTest, 0, 1);
Load_Control_WriteProperty_Shed_Duration(pTest, 0, 120); Load_Control_WriteProperty_Shed_Duration(pTest, 0, 120);
Load_Control_WriteProperty_Start_Time(pTest, 0, 2007,2,27,15,0,0,0); Load_Control_WriteProperty_Start_Time(pTest, 0, 2007, 2, 27, 15, 0, 0, 0);
datetime_set_values(&Current_Time, 2007,2,27,5,0,0,0); datetime_set_values(&Current_Time, 2007, 2, 27, 5, 0, 0, 0);
Load_Control_State_Machine(0); Load_Control_State_Machine(0);
ct_test(pTest, Load_Control_State[0] == SHED_REQUEST_PENDING); ct_test(pTest, Load_Control_State[0] == SHED_REQUEST_PENDING);
Load_Control_State_Machine(0); Load_Control_State_Machine(0);
ct_test(pTest, Load_Control_State[0] == SHED_REQUEST_PENDING); ct_test(pTest, Load_Control_State[0] == SHED_REQUEST_PENDING);
/* set to lowest value so we cannot meet the shed level */ /* set to lowest value so we cannot meet the shed level */
datetime_set_values(&Current_Time, 2007,2,27,16,0,0,0); datetime_set_values(&Current_Time, 2007, 2, 27, 16, 0, 0, 0);
Analog_Output_Present_Value_Set(0, 0, 16); Analog_Output_Present_Value_Set(0, 0, 16);
Load_Control_State_Machine(0); Load_Control_State_Machine(0);
ct_test(pTest, Load_Control_State[0] == SHED_NON_COMPLIANT); ct_test(pTest, Load_Control_State[0] == SHED_NON_COMPLIANT);
Load_Control_State_Machine(0); Load_Control_State_Machine(0);
ct_test(pTest, Load_Control_State[0] == SHED_NON_COMPLIANT); ct_test(pTest, Load_Control_State[0] == SHED_NON_COMPLIANT);
/* FinishedUnsuccessfulShed */ /* FinishedUnsuccessfulShed */
Load_Control_WriteProperty_Start_Time(pTest, 0, 2007,2,27,16,0,0,0); Load_Control_WriteProperty_Start_Time(pTest, 0, 2007, 2, 27, 16, 0, 0, 0);
Load_Control_State_Machine(0); Load_Control_State_Machine(0);
ct_test(pTest, Load_Control_State[0] == SHED_REQUEST_PENDING); ct_test(pTest, Load_Control_State[0] == SHED_REQUEST_PENDING);
Load_Control_State_Machine(0); Load_Control_State_Machine(0);
ct_test(pTest, Load_Control_State[0] == SHED_REQUEST_PENDING); ct_test(pTest, Load_Control_State[0] == SHED_REQUEST_PENDING);
datetime_set_values(&Current_Time, 2007,2,27,16,0,1,0); datetime_set_values(&Current_Time, 2007, 2, 27, 16, 0, 1, 0);
Load_Control_State_Machine(0); Load_Control_State_Machine(0);
ct_test(pTest, Load_Control_State[0] == SHED_NON_COMPLIANT); ct_test(pTest, Load_Control_State[0] == SHED_NON_COMPLIANT);
/* CanNowComplyWithShed */ /* CanNowComplyWithShed */
Analog_Output_Present_Value_Set(0, 100, 16); Analog_Output_Present_Value_Set(0, 100, 16);
datetime_set_values(&Current_Time, 2007,2,27,16,0,2,0); datetime_set_values(&Current_Time, 2007, 2, 27, 16, 0, 2, 0);
Load_Control_State_Machine(0); Load_Control_State_Machine(0);
ct_test(pTest, Load_Control_State[0] == SHED_COMPLIANT); ct_test(pTest, Load_Control_State[0] == SHED_COMPLIANT);
level = Analog_Output_Present_Value(0); level = Analog_Output_Present_Value(0);
ct_test(pTest, level == 90); ct_test(pTest, level == 90);
/* FinishedSuccessfulShed */ /* FinishedSuccessfulShed */
datetime_set_values(&Current_Time, 2007,2,27,23,0,0,0); datetime_set_values(&Current_Time, 2007, 2, 27, 23, 0, 0, 0);
Load_Control_State_Machine(0); Load_Control_State_Machine(0);
ct_test(pTest, Load_Control_State[0] == SHED_INACTIVE); ct_test(pTest, Load_Control_State[0] == SHED_INACTIVE);
level = Analog_Output_Present_Value(0); level = Analog_Output_Present_Value(0);
ct_test(pTest, level == 100); ct_test(pTest, level == 100);
} }
void testLoadControl(Test * pTest) void testLoadControl(
Test * pTest)
{ {
uint8_t apdu[MAX_APDU] = { 0 }; uint8_t apdu[MAX_APDU] = { 0 };
int len = 0; int len = 0;
@@ -1423,8 +1457,7 @@ void testLoadControl(Test * pTest)
len = Load_Control_Encode_Property_APDU(&apdu[0], len = Load_Control_Encode_Property_APDU(&apdu[0],
instance, instance,
PROP_OBJECT_IDENTIFIER, PROP_OBJECT_IDENTIFIER, BACNET_ARRAY_ALL, &error_class, &error_code);
BACNET_ARRAY_ALL, &error_class, &error_code);
ct_test(pTest, len != 0); ct_test(pTest, len != 0);
len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value); len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value);
ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_OBJECT_ID); ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_OBJECT_ID);
@@ -1437,7 +1470,8 @@ void testLoadControl(Test * pTest)
} }
#ifdef TEST_LOAD_CONTROL #ifdef TEST_LOAD_CONTROL
int main(void) int main(
void)
{ {
Test *pTest; Test *pTest;
bool rc; bool rc;
bacnet-stack/demo/object/lo.c
+75 -48
View File
@@ -76,7 +76,8 @@ static BACNET_LIGHTING_COMMAND Lighting_Command[MAX_LIGHTING_OUTPUTS];
/* we need to have our arrays initialized before answering any calls */ /* we need to have our arrays initialized before answering any calls */
static bool Lighting_Output_Initialized = false; static bool Lighting_Output_Initialized = false;
int Lighting_Output_Encode_Lighting_Command(uint8_t * apdu, int Lighting_Output_Encode_Lighting_Command(
uint8_t * apdu,
BACNET_LIGHTING_COMMAND * data) BACNET_LIGHTING_COMMAND * data)
{ {
int apdu_len = 0; /* total length of the apdu, return value */ int apdu_len = 0; /* total length of the apdu, return value */
@@ -85,42 +86,36 @@ int Lighting_Output_Encode_Lighting_Command(uint8_t * apdu,
uint32_t unsigned_value = 0; uint32_t unsigned_value = 0;
if (apdu) { if (apdu) {
len = encode_context_enumerated(&apdu[apdu_len], 0, len = encode_context_enumerated(&apdu[apdu_len], 0, data->operation);
data->operation);
apdu_len += len; apdu_len += len;
/* optional level? */ /* optional level? */
if (data->level != 255) { if (data->level != 255) {
real_value = data->level; real_value = data->level;
len = encode_context_real(&apdu[apdu_len], 1, len = encode_context_real(&apdu[apdu_len], 1, real_value);
real_value);
apdu_len += len; apdu_len += len;
} }
/* optional ramp-rate */ /* optional ramp-rate */
if (data->ramp_rate != 255) { if (data->ramp_rate != 255) {
real_value = data->ramp_rate; real_value = data->ramp_rate;
len = encode_context_real(&apdu[apdu_len], 2, len = encode_context_real(&apdu[apdu_len], 2, real_value);
real_value);
apdu_len += len; apdu_len += len;
} }
/* optional step increment */ /* optional step increment */
if (data->step_increment != 255) { if (data->step_increment != 255) {
real_value = data->step_increment; real_value = data->step_increment;
len = encode_context_real(&apdu[apdu_len], 3, len = encode_context_real(&apdu[apdu_len], 3, real_value);
real_value);
apdu_len += len; apdu_len += len;
} }
/* optional fade time */ /* optional fade time */
if (data->fade_time != 0) { if (data->fade_time != 0) {
real_value = data->fade_time; real_value = data->fade_time;
len = encode_context_real(&apdu[apdu_len], 4, len = encode_context_real(&apdu[apdu_len], 4, real_value);
real_value);
apdu_len += len; apdu_len += len;
} }
/* optional duration */ /* optional duration */
if (data->duration != 0) { if (data->duration != 0) {
unsigned_value = data->duration; unsigned_value = data->duration;
len = encode_context_unsigned(&apdu[apdu_len], 5, len = encode_context_unsigned(&apdu[apdu_len], 5, unsigned_value);
unsigned_value);
apdu_len += len; apdu_len += len;
} }
} }
@@ -128,8 +123,10 @@ int Lighting_Output_Encode_Lighting_Command(uint8_t * apdu,
return apdu_len; return apdu_len;
} }
int Lighting_Output_Decode_Lighting_Command(uint8_t * apdu, int Lighting_Output_Decode_Lighting_Command(
unsigned apdu_max_len, BACNET_LIGHTING_COMMAND * data) uint8_t * apdu,
unsigned apdu_max_len,
BACNET_LIGHTING_COMMAND * data)
{ {
int len = 0; int len = 0;
int apdu_len = 0; int apdu_len = 0;
@@ -150,7 +147,9 @@ int Lighting_Output_Decode_Lighting_Command(uint8_t * apdu,
len = decode_tag_number_and_value(&apdu[apdu_len], len = decode_tag_number_and_value(&apdu[apdu_len],
&tag_number, &len_value_type); &tag_number, &len_value_type);
apdu_len += len; apdu_len += len;
len = decode_enumerated(&apdu[apdu_len], len_value_type, &data->operation); len =
decode_enumerated(&apdu[apdu_len], len_value_type,
&data->operation);
apdu_len += len; apdu_len += len;
/* Tag 1: level - OPTIONAL */ /* Tag 1: level - OPTIONAL */
if (decode_is_context_tag(&apdu[apdu_len], 1)) { if (decode_is_context_tag(&apdu[apdu_len], 1)) {
@@ -171,7 +170,8 @@ int Lighting_Output_Decode_Lighting_Command(uint8_t * apdu,
} }
void Lighting_Output_Init(void) void Lighting_Output_Init(
void)
{ {
unsigned i, j; unsigned i, j;
@@ -197,7 +197,8 @@ void Lighting_Output_Init(void)
/* we simply have 0-n object instances. Yours might be */ /* we simply have 0-n object instances. Yours might be */
/* more complex, and then you need validate that the */ /* more complex, and then you need validate that the */
/* given instance exists */ /* given instance exists */
bool Lighting_Output_Valid_Instance(uint32_t object_instance) bool Lighting_Output_Valid_Instance(
uint32_t object_instance)
{ {
Lighting_Output_Init(); Lighting_Output_Init();
if (object_instance < MAX_LIGHTING_OUTPUTS) if (object_instance < MAX_LIGHTING_OUTPUTS)
@@ -208,7 +209,8 @@ bool Lighting_Output_Valid_Instance(uint32_t object_instance)
/* we simply have 0-n object instances. Yours might be */ /* we simply have 0-n object instances. Yours might be */
/* more complex, and then count how many you have */ /* more complex, and then count how many you have */
unsigned Lighting_Output_Count(void) unsigned Lighting_Output_Count(
void)
{ {
Lighting_Output_Init(); Lighting_Output_Init();
return MAX_LIGHTING_OUTPUTS; return MAX_LIGHTING_OUTPUTS;
@@ -217,7 +219,8 @@ unsigned Lighting_Output_Count(void)
/* we simply have 0-n object instances. Yours might be */ /* we simply have 0-n object instances. Yours might be */
/* more complex, and then you need to return the instance */ /* more complex, and then you need to return the instance */
/* that correlates to the correct index */ /* that correlates to the correct index */
uint32_t Lighting_Output_Index_To_Instance(unsigned index) uint32_t Lighting_Output_Index_To_Instance(
unsigned index)
{ {
Lighting_Output_Init(); Lighting_Output_Init();
return index; return index;
@@ -226,7 +229,8 @@ uint32_t Lighting_Output_Index_To_Instance(unsigned index)
/* we simply have 0-n object instances. Yours might be */ /* we simply have 0-n object instances. Yours might be */
/* more complex, and then you need to return the index */ /* more complex, and then you need to return the index */
/* that correlates to the correct instance number */ /* that correlates to the correct instance number */
unsigned Lighting_Output_Instance_To_Index(uint32_t object_instance) unsigned Lighting_Output_Instance_To_Index(
uint32_t object_instance)
{ {
unsigned index = MAX_LIGHTING_OUTPUTS; unsigned index = MAX_LIGHTING_OUTPUTS;
@@ -237,7 +241,8 @@ unsigned Lighting_Output_Instance_To_Index(uint32_t object_instance)
return index; return index;
} }
float Lighting_Output_Present_Value(uint32_t object_instance) float Lighting_Output_Present_Value(
uint32_t object_instance)
{ {
float value = LIGHTING_RELINQUISH_DEFAULT; float value = LIGHTING_RELINQUISH_DEFAULT;
unsigned index = 0; unsigned index = 0;
@@ -257,7 +262,8 @@ float Lighting_Output_Present_Value(uint32_t object_instance)
return value; return value;
} }
unsigned Lighting_Output_Present_Value_Priority(uint32_t object_instance) unsigned Lighting_Output_Present_Value_Priority(
uint32_t object_instance)
{ {
unsigned index = 0; /* instance to index conversion */ unsigned index = 0; /* instance to index conversion */
unsigned i = 0; /* loop counter */ unsigned i = 0; /* loop counter */
@@ -277,8 +283,10 @@ unsigned Lighting_Output_Present_Value_Priority(uint32_t object_instance)
return priority; return priority;
} }
bool Lighting_Output_Present_Value_Set(uint32_t object_instance, bool Lighting_Output_Present_Value_Set(
float value, unsigned priority) uint32_t object_instance,
float value,
unsigned priority)
{ {
unsigned index = 0; unsigned index = 0;
bool status = false; bool status = false;
@@ -288,7 +296,7 @@ bool Lighting_Output_Present_Value_Set(uint32_t object_instance,
if (priority && (priority <= BACNET_MAX_PRIORITY) && if (priority && (priority <= BACNET_MAX_PRIORITY) &&
(priority != 6 /* reserved */ ) && (priority != 6 /* reserved */ ) &&
(value >= 0.0) && (value <= 100.0)) { (value >= 0.0) && (value <= 100.0)) {
Lighting_Output_Level[index][priority-1] = (uint8_t) value; Lighting_Output_Level[index][priority - 1] = (uint8_t) value;
/* Note: you could set the physical output here to the next /* Note: you could set the physical output here to the next
highest priority, or to the relinquish default if no highest priority, or to the relinquish default if no
priorities are set. priorities are set.
@@ -302,7 +310,8 @@ bool Lighting_Output_Present_Value_Set(uint32_t object_instance,
return status; return status;
} }
bool Lighting_Output_Present_Value_Relinquish(uint32_t object_instance, bool Lighting_Output_Present_Value_Relinquish(
uint32_t object_instance,
int priority) int priority)
{ {
unsigned index = 0; unsigned index = 0;
@@ -312,7 +321,7 @@ bool Lighting_Output_Present_Value_Relinquish(uint32_t object_instance,
if (index < MAX_LIGHTING_OUTPUTS) { if (index < MAX_LIGHTING_OUTPUTS) {
if (priority && (priority <= BACNET_MAX_PRIORITY) && if (priority && (priority <= BACNET_MAX_PRIORITY) &&
(priority != 6 /* reserved */ )) { (priority != 6 /* reserved */ )) {
Lighting_Output_Level[index][priority-1] = LIGHTING_LEVEL_NULL; Lighting_Output_Level[index][priority - 1] = LIGHTING_LEVEL_NULL;
/* Note: you could set the physical output here to the next /* Note: you could set the physical output here to the next
highest priority, or to the relinquish default if no highest priority, or to the relinquish default if no
priorities are set. priorities are set.
@@ -326,7 +335,8 @@ bool Lighting_Output_Present_Value_Relinquish(uint32_t object_instance,
return status; return status;
} }
float Lighting_Output_Progress_Value(uint32_t object_instance) float Lighting_Output_Progress_Value(
uint32_t object_instance)
{ {
float value = LIGHTING_RELINQUISH_DEFAULT; float value = LIGHTING_RELINQUISH_DEFAULT;
unsigned index = 0; unsigned index = 0;
@@ -341,7 +351,8 @@ float Lighting_Output_Progress_Value(uint32_t object_instance)
} }
/* note: the object name must be unique within this device */ /* note: the object name must be unique within this device */
char *Lighting_Output_Name(uint32_t object_instance) char *Lighting_Output_Name(
uint32_t object_instance)
{ {
static char text_string[32] = ""; /* okay for single thread */ static char text_string[32] = ""; /* okay for single thread */
@@ -354,11 +365,13 @@ char *Lighting_Output_Name(uint32_t object_instance)
} }
/* return apdu len, or -1 on error */ /* return apdu len, or -1 on error */
int Lighting_Output_Encode_Property_APDU(uint8_t * apdu, int Lighting_Output_Encode_Property_APDU(
uint8_t * apdu,
uint32_t object_instance, uint32_t object_instance,
BACNET_PROPERTY_ID property, BACNET_PROPERTY_ID property,
int32_t array_index, int32_t array_index,
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code) BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code)
{ {
int len = 0; int len = 0;
int apdu_len = 0; /* return value */ int apdu_len = 0; /* return value */
@@ -372,7 +385,8 @@ int Lighting_Output_Encode_Property_APDU(uint8_t * apdu,
Lighting_Output_Init(); Lighting_Output_Init();
switch (property) { switch (property) {
case PROP_OBJECT_IDENTIFIER: case PROP_OBJECT_IDENTIFIER:
apdu_len = encode_application_object_id(&apdu[0], OBJECT_LIGHTING_OUTPUT, apdu_len =
encode_application_object_id(&apdu[0], OBJECT_LIGHTING_OUTPUT,
object_instance); object_instance);
break; break;
case PROP_OBJECT_NAME: case PROP_OBJECT_NAME:
@@ -381,11 +395,13 @@ int Lighting_Output_Encode_Property_APDU(uint8_t * apdu,
/* FIXME: description could be writable and different than object name */ /* FIXME: description could be writable and different than object name */
characterstring_init_ansi(&char_string, characterstring_init_ansi(&char_string,
Lighting_Output_Name(object_instance)); Lighting_Output_Name(object_instance));
apdu_len = encode_application_character_string(&apdu[0], &char_string); apdu_len =
encode_application_character_string(&apdu[0], &char_string);
break; break;
case PROP_OBJECT_TYPE: case PROP_OBJECT_TYPE:
apdu_len = apdu_len =
encode_application_enumerated(&apdu[0], OBJECT_LIGHTING_OUTPUT); encode_application_enumerated(&apdu[0],
OBJECT_LIGHTING_OUTPUT);
break; break;
case PROP_PRESENT_VALUE: case PROP_PRESENT_VALUE:
real_value = Lighting_Output_Present_Value(object_instance); real_value = Lighting_Output_Present_Value(object_instance);
@@ -408,7 +424,8 @@ int Lighting_Output_Encode_Property_APDU(uint8_t * apdu,
apdu_len = encode_application_bitstring(&apdu[0], &bit_string); apdu_len = encode_application_bitstring(&apdu[0], &bit_string);
break; break;
case PROP_EVENT_STATE: case PROP_EVENT_STATE:
apdu_len = encode_application_enumerated(&apdu[0], EVENT_STATE_NORMAL); apdu_len =
encode_application_enumerated(&apdu[0], EVENT_STATE_NORMAL);
break; break;
case PROP_OUT_OF_SERVICE: case PROP_OUT_OF_SERVICE:
object_index = Lighting_Output_Instance_To_Index(object_instance); object_index = Lighting_Output_Instance_To_Index(object_instance);
@@ -430,11 +447,14 @@ int Lighting_Output_Encode_Property_APDU(uint8_t * apdu,
Lighting_Output_Instance_To_Index(object_instance); Lighting_Output_Instance_To_Index(object_instance);
for (i = 0; i < BACNET_MAX_PRIORITY; i++) { for (i = 0; i < BACNET_MAX_PRIORITY; i++) {
/* FIXME: check if we have room before adding it to APDU */ /* FIXME: check if we have room before adding it to APDU */
if (Lighting_Output_Level[object_index][i] == LIGHTING_LEVEL_NULL) if (Lighting_Output_Level[object_index][i] ==
LIGHTING_LEVEL_NULL)
len = encode_application_null(&apdu[apdu_len]); len = encode_application_null(&apdu[apdu_len]);
else { else {
real_value = Lighting_Output_Level[object_index][i]; real_value = Lighting_Output_Level[object_index][i];
len = encode_application_real(&apdu[apdu_len], real_value); len =
encode_application_real(&apdu[apdu_len],
real_value);
} }
/* add it if we have room */ /* add it if we have room */
if ((apdu_len + len) < MAX_APDU) if ((apdu_len + len) < MAX_APDU)
@@ -455,8 +475,10 @@ int Lighting_Output_Encode_Property_APDU(uint8_t * apdu,
apdu_len = encode_application_null(&apdu[0]); apdu_len = encode_application_null(&apdu[0]);
else { else {
real_value = real_value =
Lighting_Output_Level[object_index][array_index - 1]; Lighting_Output_Level[object_index][array_index -
apdu_len = encode_application_real(&apdu[0], real_value); 1];
apdu_len =
encode_application_real(&apdu[0], real_value);
} }
} else { } else {
*error_class = ERROR_CLASS_PROPERTY; *error_class = ERROR_CLASS_PROPERTY;
@@ -481,8 +503,10 @@ int Lighting_Output_Encode_Property_APDU(uint8_t * apdu,
} }
/* returns true if successful */ /* returns true if successful */
bool Lighting_Output_Write_Property(BACNET_WRITE_PROPERTY_DATA * wp_data, bool Lighting_Output_Write_Property(
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code) BACNET_WRITE_PROPERTY_DATA * wp_data,
BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code)
{ {
bool status = false; /* return value */ bool status = false; /* return value */
unsigned int object_index = 0; unsigned int object_index = 0;
@@ -523,7 +547,8 @@ bool Lighting_Output_Write_Property(BACNET_WRITE_PROPERTY_DATA * wp_data,
} else if (value.tag == BACNET_APPLICATION_TAG_NULL) { } else if (value.tag == BACNET_APPLICATION_TAG_NULL) {
level = LIGHTING_LEVEL_NULL; level = LIGHTING_LEVEL_NULL;
object_index = object_index =
Lighting_Output_Instance_To_Index(wp_data->object_instance); Lighting_Output_Instance_To_Index(wp_data->
object_instance);
status = status =
Lighting_Output_Present_Value_Relinquish(wp_data-> Lighting_Output_Present_Value_Relinquish(wp_data->
object_instance, wp_data->priority); object_instance, wp_data->priority);
@@ -551,7 +576,8 @@ bool Lighting_Output_Write_Property(BACNET_WRITE_PROPERTY_DATA * wp_data,
case PROP_OUT_OF_SERVICE: case PROP_OUT_OF_SERVICE:
if (value.tag == BACNET_APPLICATION_TAG_BOOLEAN) { if (value.tag == BACNET_APPLICATION_TAG_BOOLEAN) {
object_index = object_index =
Lighting_Output_Instance_To_Index(wp_data->object_instance); Lighting_Output_Instance_To_Index(wp_data->
object_instance);
Lighting_Output_Out_Of_Service[object_index] = Lighting_Output_Out_Of_Service[object_index] =
value.type.Boolean; value.type.Boolean;
status = true; status = true;
@@ -575,7 +601,8 @@ bool Lighting_Output_Write_Property(BACNET_WRITE_PROPERTY_DATA * wp_data,
#include <string.h> #include <string.h>
#include "ctest.h" #include "ctest.h"
void testLightingOutput(Test * pTest) void testLightingOutput(
Test * pTest)
{ {
uint8_t apdu[MAX_APDU] = { 0 }; uint8_t apdu[MAX_APDU] = { 0 };
int len = 0; int len = 0;
@@ -590,8 +617,7 @@ void testLightingOutput(Test * pTest)
len = Lighting_Output_Encode_Property_APDU(&apdu[0], len = Lighting_Output_Encode_Property_APDU(&apdu[0],
instance, instance,
PROP_OBJECT_IDENTIFIER, PROP_OBJECT_IDENTIFIER, BACNET_ARRAY_ALL, &error_class, &error_code);
BACNET_ARRAY_ALL, &error_class, &error_code);
ct_test(pTest, len != 0); ct_test(pTest, len != 0);
len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value); len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value);
ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_OBJECT_ID); ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_OBJECT_ID);
@@ -604,7 +630,8 @@ void testLightingOutput(Test * pTest)
} }
#ifdef TEST_LIGHTING_OUTPUT #ifdef TEST_LIGHTING_OUTPUT
int main(void) int main(
void)
{ {
Test *pTest; Test *pTest;
bool rc; bool rc;
bacnet-stack/demo/object/lsp.c
+40 -32
View File
@@ -38,8 +38,7 @@
#define MAX_LIFE_SAFETY_POINTS 7 #define MAX_LIFE_SAFETY_POINTS 7
/* Here are our stored levels.*/ /* Here are our stored levels.*/
static BACNET_LIFE_SAFETY_MODE static BACNET_LIFE_SAFETY_MODE Life_Safety_Point_Mode[MAX_LIFE_SAFETY_POINTS];
Life_Safety_Point_Mode[MAX_LIFE_SAFETY_POINTS];
static BACNET_LIFE_SAFETY_STATE static BACNET_LIFE_SAFETY_STATE
Life_Safety_Point_State[MAX_LIFE_SAFETY_POINTS]; Life_Safety_Point_State[MAX_LIFE_SAFETY_POINTS];
static BACNET_SILENCED_STATE static BACNET_SILENCED_STATE
@@ -51,8 +50,7 @@ static BACNET_LIFE_SAFETY_OPERATION
static bool Life_Safety_Point_Out_Of_Service[MAX_LIFE_SAFETY_POINTS]; static bool Life_Safety_Point_Out_Of_Service[MAX_LIFE_SAFETY_POINTS];
/* These three arrays are used by the ReadPropertyMultiple handler */ /* These three arrays are used by the ReadPropertyMultiple handler */
static const int Life_Safety_Point_Properties_Required[] = static const int Life_Safety_Point_Properties_Required[] = {
{
PROP_OBJECT_IDENTIFIER, PROP_OBJECT_IDENTIFIER,
PROP_OBJECT_NAME, PROP_OBJECT_NAME,
PROP_OBJECT_TYPE, PROP_OBJECT_TYPE,
@@ -68,14 +66,12 @@ static const int Life_Safety_Point_Properties_Required[] =
-1 -1
}; };
static const int Life_Safety_Point_Properties_Optional[] = static const int Life_Safety_Point_Properties_Optional[] = {
{
PROP_DESCRIPTION, PROP_DESCRIPTION,
-1 -1
}; };
static const int Life_Safety_Point_Properties_Proprietary[] = static const int Life_Safety_Point_Properties_Proprietary[] = {
{
-1 -1
}; };
@@ -94,7 +90,8 @@ void Life_Safety_Point_Property_Lists(
return; return;
} }
void Life_Safety_Point_Init(void) void Life_Safety_Point_Init(
void)
{ {
static bool initialized = false; static bool initialized = false;
unsigned i; unsigned i;
@@ -106,8 +103,7 @@ void Life_Safety_Point_Init(void)
for (i = 0; i < MAX_LIFE_SAFETY_POINTS; i++) { for (i = 0; i < MAX_LIFE_SAFETY_POINTS; i++) {
Life_Safety_Point_Mode[i] = LIFE_SAFETY_MODE_DEFAULT; Life_Safety_Point_Mode[i] = LIFE_SAFETY_MODE_DEFAULT;
Life_Safety_Point_State[i] = LIFE_SAFETY_STATE_QUIET; Life_Safety_Point_State[i] = LIFE_SAFETY_STATE_QUIET;
Life_Safety_Point_Silenced_State[i] = Life_Safety_Point_Silenced_State[i] = SILENCED_STATE_UNSILENCED;
SILENCED_STATE_UNSILENCED;
Life_Safety_Point_Operation[i] = LIFE_SAFETY_OPERATION_NONE; Life_Safety_Point_Operation[i] = LIFE_SAFETY_OPERATION_NONE;
} }
} }
@@ -118,7 +114,8 @@ void Life_Safety_Point_Init(void)
/* we simply have 0-n object instances. Yours might be */ /* we simply have 0-n object instances. Yours might be */
/* more complex, and then you need validate that the */ /* more complex, and then you need validate that the */
/* given instance exists */ /* given instance exists */
bool Life_Safety_Point_Valid_Instance(uint32_t object_instance) bool Life_Safety_Point_Valid_Instance(
uint32_t object_instance)
{ {
Life_Safety_Point_Init(); Life_Safety_Point_Init();
if (object_instance < MAX_LIFE_SAFETY_POINTS) if (object_instance < MAX_LIFE_SAFETY_POINTS)
@@ -129,7 +126,8 @@ bool Life_Safety_Point_Valid_Instance(uint32_t object_instance)
/* we simply have 0-n object instances. Yours might be */ /* we simply have 0-n object instances. Yours might be */
/* more complex, and then count how many you have */ /* more complex, and then count how many you have */
unsigned Life_Safety_Point_Count(void) unsigned Life_Safety_Point_Count(
void)
{ {
Life_Safety_Point_Init(); Life_Safety_Point_Init();
return MAX_LIFE_SAFETY_POINTS; return MAX_LIFE_SAFETY_POINTS;
@@ -138,7 +136,8 @@ unsigned Life_Safety_Point_Count(void)
/* we simply have 0-n object instances. Yours might be */ /* we simply have 0-n object instances. Yours might be */
/* more complex, and then you need to return the instance */ /* more complex, and then you need to return the instance */
/* that correlates to the correct index */ /* that correlates to the correct index */
uint32_t Life_Safety_Point_Index_To_Instance(unsigned index) uint32_t Life_Safety_Point_Index_To_Instance(
unsigned index)
{ {
Life_Safety_Point_Init(); Life_Safety_Point_Init();
return index; return index;
@@ -147,7 +146,8 @@ uint32_t Life_Safety_Point_Index_To_Instance(unsigned index)
/* we simply have 0-n object instances. Yours might be */ /* we simply have 0-n object instances. Yours might be */
/* more complex, and then you need to return the index */ /* more complex, and then you need to return the index */
/* that correlates to the correct instance number */ /* that correlates to the correct instance number */
unsigned Life_Safety_Point_Instance_To_Index(uint32_t object_instance) unsigned Life_Safety_Point_Instance_To_Index(
uint32_t object_instance)
{ {
unsigned index = MAX_LIFE_SAFETY_POINTS; unsigned index = MAX_LIFE_SAFETY_POINTS;
@@ -158,8 +158,8 @@ unsigned Life_Safety_Point_Instance_To_Index(uint32_t object_instance)
return index; return index;
} }
static BACNET_LIFE_SAFETY_STATE Life_Safety_Point_Present_Value(uint32_t static BACNET_LIFE_SAFETY_STATE Life_Safety_Point_Present_Value(
object_instance) uint32_t object_instance)
{ {
BACNET_LIFE_SAFETY_STATE present_value = LIFE_SAFETY_STATE_QUIET; BACNET_LIFE_SAFETY_STATE present_value = LIFE_SAFETY_STATE_QUIET;
unsigned index = 0; unsigned index = 0;
@@ -173,7 +173,8 @@ static BACNET_LIFE_SAFETY_STATE Life_Safety_Point_Present_Value(uint32_t
} }
/* note: the object name must be unique within this device */ /* note: the object name must be unique within this device */
char *Life_Safety_Point_Name(uint32_t object_instance) char *Life_Safety_Point_Name(
uint32_t object_instance)
{ {
static char text_string[32] = ""; /* okay for single thread */ static char text_string[32] = ""; /* okay for single thread */
@@ -186,11 +187,13 @@ char *Life_Safety_Point_Name(uint32_t object_instance)
} }
/* return apdu len, or -1 on error */ /* return apdu len, or -1 on error */
int Life_Safety_Point_Encode_Property_APDU(uint8_t * apdu, int Life_Safety_Point_Encode_Property_APDU(
uint8_t * apdu,
uint32_t object_instance, uint32_t object_instance,
BACNET_PROPERTY_ID property, BACNET_PROPERTY_ID property,
int32_t array_index, int32_t array_index,
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code) BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code)
{ {
int len = 0; int len = 0;
int apdu_len = 0; /* return value */ int apdu_len = 0; /* return value */
@@ -209,18 +212,20 @@ int Life_Safety_Point_Encode_Property_APDU(uint8_t * apdu,
switch (property) { switch (property) {
case PROP_OBJECT_IDENTIFIER: case PROP_OBJECT_IDENTIFIER:
apdu_len = apdu_len =
encode_application_object_id(&apdu[0], OBJECT_LIFE_SAFETY_POINT, encode_application_object_id(&apdu[0],
object_instance); OBJECT_LIFE_SAFETY_POINT, object_instance);
break; break;
case PROP_OBJECT_NAME: case PROP_OBJECT_NAME:
case PROP_DESCRIPTION: case PROP_DESCRIPTION:
characterstring_init_ansi(&char_string, characterstring_init_ansi(&char_string,
Life_Safety_Point_Name(object_instance)); Life_Safety_Point_Name(object_instance));
apdu_len = encode_application_character_string(&apdu[0], &char_string); apdu_len =
encode_application_character_string(&apdu[0], &char_string);
break; break;
case PROP_OBJECT_TYPE: case PROP_OBJECT_TYPE:
apdu_len = apdu_len =
encode_application_enumerated(&apdu[0], OBJECT_LIFE_SAFETY_POINT); encode_application_enumerated(&apdu[0],
OBJECT_LIFE_SAFETY_POINT);
break; break;
case PROP_PRESENT_VALUE: case PROP_PRESENT_VALUE:
present_value = Life_Safety_Point_Present_Value(object_instance); present_value = Life_Safety_Point_Present_Value(object_instance);
@@ -235,7 +240,8 @@ int Life_Safety_Point_Encode_Property_APDU(uint8_t * apdu,
apdu_len = encode_application_bitstring(&apdu[0], &bit_string); apdu_len = encode_application_bitstring(&apdu[0], &bit_string);
break; break;
case PROP_EVENT_STATE: case PROP_EVENT_STATE:
apdu_len = encode_application_enumerated(&apdu[0], EVENT_STATE_NORMAL); apdu_len =
encode_application_enumerated(&apdu[0], EVENT_STATE_NORMAL);
break; break;
case PROP_OUT_OF_SERVICE: case PROP_OUT_OF_SERVICE:
object_index = object_index =
@@ -284,8 +290,10 @@ int Life_Safety_Point_Encode_Property_APDU(uint8_t * apdu,
} }
/* returns true if successful */ /* returns true if successful */
bool Life_Safety_Point_Write_Property(BACNET_WRITE_PROPERTY_DATA * wp_data, bool Life_Safety_Point_Write_Property(
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code) BACNET_WRITE_PROPERTY_DATA * wp_data,
BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code)
{ {
bool status = false; /* return value */ bool status = false; /* return value */
unsigned int object_index = 0; unsigned int object_index = 0;
@@ -351,7 +359,8 @@ bool Life_Safety_Point_Write_Property(BACNET_WRITE_PROPERTY_DATA * wp_data,
#include <string.h> #include <string.h>
#include "ctest.h" #include "ctest.h"
void testLifeSafetyPoint(Test * pTest) void testLifeSafetyPoint(
Test * pTest)
{ {
uint8_t apdu[MAX_APDU] = { 0 }; uint8_t apdu[MAX_APDU] = { 0 };
int len = 0; int len = 0;
@@ -366,8 +375,7 @@ void testLifeSafetyPoint(Test * pTest)
len = Life_Safety_Point_Encode_Property_APDU(&apdu[0], len = Life_Safety_Point_Encode_Property_APDU(&apdu[0],
instance, instance,
PROP_OBJECT_IDENTIFIER, PROP_OBJECT_IDENTIFIER, BACNET_ARRAY_ALL, &error_class, &error_code);
BACNET_ARRAY_ALL, &error_class, &error_code);
ct_test(pTest, len != 0); ct_test(pTest, len != 0);
len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value); len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value);
ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_OBJECT_ID); ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_OBJECT_ID);
@@ -380,7 +388,8 @@ void testLifeSafetyPoint(Test * pTest)
} }
#ifdef TEST_LIFE_SAFETY_POINT #ifdef TEST_LIFE_SAFETY_POINT
int main(void) int main(
void)
{ {
Test *pTest; Test *pTest;
bool rc; bool rc;
@@ -399,4 +408,3 @@ int main(void)
} }
#endif /* TEST_LIFE_SAFETY_POINT */ #endif /* TEST_LIFE_SAFETY_POINT */
#endif /* TEST */ #endif /* TEST */
bacnet-stack/demo/object/mso.c
+40 -27
View File
@@ -53,8 +53,7 @@ static uint8_t
static bool Multistate_Output_Out_Of_Service[MAX_MULTISTATE_OUTPUTS]; static bool Multistate_Output_Out_Of_Service[MAX_MULTISTATE_OUTPUTS];
/* These three arrays are used by the ReadPropertyMultiple handler */ /* These three arrays are used by the ReadPropertyMultiple handler */
static const int Multistate_Output_Properties_Required[] = static const int Multistate_Output_Properties_Required[] = {
{
PROP_OBJECT_IDENTIFIER, PROP_OBJECT_IDENTIFIER,
PROP_OBJECT_NAME, PROP_OBJECT_NAME,
PROP_OBJECT_TYPE, PROP_OBJECT_TYPE,
@@ -68,14 +67,12 @@ static const int Multistate_Output_Properties_Required[] =
-1 -1
}; };
static const int Multistate_Output_Properties_Optional[] = static const int Multistate_Output_Properties_Optional[] = {
{
PROP_DESCRIPTION, PROP_DESCRIPTION,
-1 -1
}; };
static const int Multistate_Output_Properties_Proprietary[] = static const int Multistate_Output_Properties_Proprietary[] = {
{
-1 -1
}; };
@@ -94,7 +91,8 @@ void Multistate_Output_Property_Lists(
return; return;
} }
void Multistate_Output_Init(void) void Multistate_Output_Init(
void)
{ {
unsigned i, j; unsigned i, j;
static bool initialized = false; static bool initialized = false;
@@ -116,7 +114,8 @@ void Multistate_Output_Init(void)
/* we simply have 0-n object instances. Yours might be */ /* we simply have 0-n object instances. Yours might be */
/* more complex, and then you need validate that the */ /* more complex, and then you need validate that the */
/* given instance exists */ /* given instance exists */
bool Multistate_Output_Valid_Instance(uint32_t object_instance) bool Multistate_Output_Valid_Instance(
uint32_t object_instance)
{ {
if (object_instance < MAX_MULTISTATE_OUTPUTS) if (object_instance < MAX_MULTISTATE_OUTPUTS)
return true; return true;
@@ -126,7 +125,8 @@ bool Multistate_Output_Valid_Instance(uint32_t object_instance)
/* we simply have 0-n object instances. Yours might be */ /* we simply have 0-n object instances. Yours might be */
/* more complex, and then count how many you have */ /* more complex, and then count how many you have */
unsigned Multistate_Output_Count(void) unsigned Multistate_Output_Count(
void)
{ {
return MAX_MULTISTATE_OUTPUTS; return MAX_MULTISTATE_OUTPUTS;
} }
@@ -134,7 +134,8 @@ unsigned Multistate_Output_Count(void)
/* we simply have 0-n object instances. Yours might be */ /* we simply have 0-n object instances. Yours might be */
/* more complex, and then you need to return the instance */ /* more complex, and then you need to return the instance */
/* that correlates to the correct index */ /* that correlates to the correct index */
uint32_t Multistate_Output_Index_To_Instance(unsigned index) uint32_t Multistate_Output_Index_To_Instance(
unsigned index)
{ {
return index; return index;
} }
@@ -142,7 +143,8 @@ uint32_t Multistate_Output_Index_To_Instance(unsigned index)
/* we simply have 0-n object instances. Yours might be */ /* we simply have 0-n object instances. Yours might be */
/* more complex, and then you need to return the index */ /* more complex, and then you need to return the index */
/* that correlates to the correct instance number */ /* that correlates to the correct instance number */
unsigned Multistate_Output_Instance_To_Index(uint32_t object_instance) unsigned Multistate_Output_Instance_To_Index(
uint32_t object_instance)
{ {
unsigned index = MAX_MULTISTATE_OUTPUTS; unsigned index = MAX_MULTISTATE_OUTPUTS;
@@ -152,7 +154,8 @@ unsigned Multistate_Output_Instance_To_Index(uint32_t object_instance)
return index; return index;
} }
static uint32_t Multistate_Output_Present_Value(uint32_t object_instance) static uint32_t Multistate_Output_Present_Value(
uint32_t object_instance)
{ {
uint32_t value = MULTISTATE_RELINQUISH_DEFAULT; uint32_t value = MULTISTATE_RELINQUISH_DEFAULT;
unsigned index = 0; unsigned index = 0;
@@ -173,7 +176,8 @@ static uint32_t Multistate_Output_Present_Value(uint32_t object_instance)
} }
/* note: the object name must be unique within this device */ /* note: the object name must be unique within this device */
char *Multistate_Output_Name(uint32_t object_instance) char *Multistate_Output_Name(
uint32_t object_instance)
{ {
static char text_string[32] = ""; /* okay for single thread */ static char text_string[32] = ""; /* okay for single thread */
@@ -186,11 +190,13 @@ char *Multistate_Output_Name(uint32_t object_instance)
} }
/* return apdu len, or -1 on error */ /* return apdu len, or -1 on error */
int Multistate_Output_Encode_Property_APDU(uint8_t * apdu, int Multistate_Output_Encode_Property_APDU(
uint8_t * apdu,
uint32_t object_instance, uint32_t object_instance,
BACNET_PROPERTY_ID property, BACNET_PROPERTY_ID property,
int32_t array_index, int32_t array_index,
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code) BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code)
{ {
int len = 0; int len = 0;
int apdu_len = 0; /* return value */ int apdu_len = 0; /* return value */
@@ -205,8 +211,8 @@ int Multistate_Output_Encode_Property_APDU(uint8_t * apdu,
switch (property) { switch (property) {
case PROP_OBJECT_IDENTIFIER: case PROP_OBJECT_IDENTIFIER:
apdu_len = apdu_len =
encode_application_object_id(&apdu[0], OBJECT_MULTI_STATE_OUTPUT, encode_application_object_id(&apdu[0],
object_instance); OBJECT_MULTI_STATE_OUTPUT, object_instance);
break; break;
/* note: Name and Description don't have to be the same. /* note: Name and Description don't have to be the same.
You could make Description writable and different */ You could make Description writable and different */
@@ -214,11 +220,13 @@ int Multistate_Output_Encode_Property_APDU(uint8_t * apdu,
case PROP_DESCRIPTION: case PROP_DESCRIPTION:
characterstring_init_ansi(&char_string, characterstring_init_ansi(&char_string,
Multistate_Output_Name(object_instance)); Multistate_Output_Name(object_instance));
apdu_len = encode_application_character_string(&apdu[0], &char_string); apdu_len =
encode_application_character_string(&apdu[0], &char_string);
break; break;
case PROP_OBJECT_TYPE: case PROP_OBJECT_TYPE:
apdu_len = apdu_len =
encode_application_enumerated(&apdu[0], OBJECT_MULTI_STATE_OUTPUT); encode_application_enumerated(&apdu[0],
OBJECT_MULTI_STATE_OUTPUT);
break; break;
case PROP_PRESENT_VALUE: case PROP_PRESENT_VALUE:
present_value = Multistate_Output_Present_Value(object_instance); present_value = Multistate_Output_Present_Value(object_instance);
@@ -235,7 +243,8 @@ int Multistate_Output_Encode_Property_APDU(uint8_t * apdu,
break; break;
case PROP_EVENT_STATE: case PROP_EVENT_STATE:
/* note: see the details in the standard on how to use this */ /* note: see the details in the standard on how to use this */
apdu_len = encode_application_enumerated(&apdu[0], EVENT_STATE_NORMAL); apdu_len =
encode_application_enumerated(&apdu[0], EVENT_STATE_NORMAL);
break; break;
case PROP_OUT_OF_SERVICE: case PROP_OUT_OF_SERVICE:
object_index = object_index =
@@ -287,7 +296,8 @@ int Multistate_Output_Encode_Property_APDU(uint8_t * apdu,
Multistate_Output_Level[object_index][array_index - Multistate_Output_Level[object_index][array_index -
1]; 1];
apdu_len = apdu_len =
encode_application_unsigned(&apdu[0], present_value); encode_application_unsigned(&apdu[0],
present_value);
} }
} else { } else {
*error_class = ERROR_CLASS_PROPERTY; *error_class = ERROR_CLASS_PROPERTY;
@@ -317,8 +327,10 @@ int Multistate_Output_Encode_Property_APDU(uint8_t * apdu,
} }
/* returns true if successful */ /* returns true if successful */
bool Multistate_Output_Write_Property(BACNET_WRITE_PROPERTY_DATA * wp_data, bool Multistate_Output_Write_Property(
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code) BACNET_WRITE_PROPERTY_DATA * wp_data,
BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code)
{ {
bool status = false; /* return value */ bool status = false; /* return value */
unsigned int object_index = 0; unsigned int object_index = 0;
@@ -425,7 +437,8 @@ bool Multistate_Output_Write_Property(BACNET_WRITE_PROPERTY_DATA * wp_data,
#include <string.h> #include <string.h>
#include "ctest.h" #include "ctest.h"
void testMultistateOutput(Test * pTest) void testMultistateOutput(
Test * pTest)
{ {
uint8_t apdu[MAX_APDU] = { 0 }; uint8_t apdu[MAX_APDU] = { 0 };
int len = 0; int len = 0;
@@ -440,8 +453,7 @@ void testMultistateOutput(Test * pTest)
len = Multistate_Output_Encode_Property_APDU(&apdu[0], len = Multistate_Output_Encode_Property_APDU(&apdu[0],
instance, instance,
PROP_OBJECT_IDENTIFIER, PROP_OBJECT_IDENTIFIER, BACNET_ARRAY_ALL, &error_class, &error_code);
BACNET_ARRAY_ALL, &error_class, &error_code);
ct_test(pTest, len != 0); ct_test(pTest, len != 0);
len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value); len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value);
ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_OBJECT_ID); ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_OBJECT_ID);
@@ -454,7 +466,8 @@ void testMultistateOutput(Test * pTest)
} }
#ifdef TEST_MULTISTATE_OUTPUT #ifdef TEST_MULTISTATE_OUTPUT
int main(void) int main(
void)
{ {
Test *pTest; Test *pTest;
bool rc; bool rc;
bacnet-stack/demo/readfile/main.c
+34 -28
View File
@@ -61,9 +61,11 @@ static bool End_Of_File_Detected = false;
static bool Error_Detected = false; static bool Error_Detected = false;
static uint8_t Current_Invoke_ID = 0; static uint8_t Current_Invoke_ID = 0;
static void Atomic_Read_File_Error_Handler(BACNET_ADDRESS * src, static void Atomic_Read_File_Error_Handler(
BACNET_ADDRESS * src,
uint8_t invoke_id, uint8_t invoke_id,
BACNET_ERROR_CLASS error_class, BACNET_ERROR_CODE error_code) BACNET_ERROR_CLASS error_class,
BACNET_ERROR_CODE error_code)
{ {
/* FIXME: verify src and invoke id */ /* FIXME: verify src and invoke id */
(void) src; (void) src;
@@ -74,34 +76,39 @@ static void Atomic_Read_File_Error_Handler(BACNET_ADDRESS * src,
Error_Detected = true; Error_Detected = true;
} }
void MyAbortHandler(BACNET_ADDRESS * src, void MyAbortHandler(
uint8_t invoke_id, uint8_t abort_reason, bool server) BACNET_ADDRESS * src,
uint8_t invoke_id,
uint8_t abort_reason,
bool server)
{ {
/* FIXME: verify src and invoke id */ /* FIXME: verify src and invoke id */
(void) src; (void) src;
(void) invoke_id; (void) invoke_id;
(void) server; (void) server;
printf("\r\nBACnet Abort!\r\n"); printf("\r\nBACnet Abort!\r\n");
printf("Abort Reason: %s\r\n", printf("Abort Reason: %s\r\n", bactext_abort_reason_name(abort_reason));
bactext_abort_reason_name(abort_reason));
Error_Detected = true; Error_Detected = true;
} }
void MyRejectHandler(BACNET_ADDRESS * src, void MyRejectHandler(
uint8_t invoke_id, uint8_t reject_reason) BACNET_ADDRESS * src,
uint8_t invoke_id,
uint8_t reject_reason)
{ {
/* FIXME: verify src and invoke id */ /* FIXME: verify src and invoke id */
(void) src; (void) src;
(void) invoke_id; (void) invoke_id;
printf("\r\nBACnet Reject!\r\n"); printf("\r\nBACnet Reject!\r\n");
printf("Reject Reason: %s\r\n", printf("Reject Reason: %s\r\n", bactext_reject_reason_name(reject_reason));
bactext_reject_reason_name(reject_reason));
Error_Detected = true; Error_Detected = true;
} }
static void AtomicReadFileAckHandler(uint8_t * service_request, static void AtomicReadFileAckHandler(
uint8_t * service_request,
uint16_t service_len, uint16_t service_len,
BACNET_ADDRESS * src, BACNET_CONFIRMED_SERVICE_ACK_DATA * service_data) BACNET_ADDRESS * src,
BACNET_CONFIRMED_SERVICE_ACK_DATA * service_data)
{ {
int len = 0; int len = 0;
BACNET_ATOMIC_READ_FILE_DATA data; BACNET_ATOMIC_READ_FILE_DATA data;
@@ -109,8 +116,7 @@ static void AtomicReadFileAckHandler(uint8_t * service_request,
size_t octets_written = 0; size_t octets_written = 0;
(void) src; /* FIXME: validate the source address matches */ (void) src; /* FIXME: validate the source address matches */
len = arf_ack_decode_service_request(service_request, len = arf_ack_decode_service_request(service_request, service_len, &data);
service_len, &data);
if (len > 0) { if (len > 0) {
/* validate the parameters before storing data */ /* validate the parameters before storing data */
if ((data.access == FILE_STREAM_ACCESS) && if ((data.access == FILE_STREAM_ACCESS) &&
@@ -131,8 +137,7 @@ static void AtomicReadFileAckHandler(uint8_t * service_request,
Local_File_Name); Local_File_Name);
else else
printf("\r%u bytes", printf("\r%u bytes",
(data.type.stream.fileStartPosition + (data.type.stream.fileStartPosition + octets_written));
octets_written));
fclose(pFile); fclose(pFile);
} }
if (data.endOfFile) { if (data.endOfFile) {
@@ -143,8 +148,10 @@ static void AtomicReadFileAckHandler(uint8_t * service_request,
} }
} }
static void LocalIAmHandler(uint8_t * service_request, static void LocalIAmHandler(
uint16_t service_len, BACNET_ADDRESS * src) uint8_t * service_request,
uint16_t service_len,
BACNET_ADDRESS * src)
{ {
int len = 0; int len = 0;
uint32_t device_id = 0; uint32_t device_id = 0;
@@ -164,15 +171,14 @@ static void LocalIAmHandler(uint8_t * service_request,
return; return;
} }
static void Init_Service_Handlers(void) static void Init_Service_Handlers(
void)
{ {
/* we need to handle who-is /* we need to handle who-is
to support dynamic device binding to us */ to support dynamic device binding to us */
apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_WHO_IS, apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_WHO_IS, handler_who_is);
handler_who_is);
/* handle i-am to support binding to other devices */ /* handle i-am to support binding to other devices */
apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_I_AM, apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_I_AM, LocalIAmHandler);
LocalIAmHandler);
/* set the handler for all the services we don't implement /* set the handler for all the services we don't implement
It is required to send the proper reject message... */ It is required to send the proper reject message... */
apdu_set_unrecognized_service_handler_handler apdu_set_unrecognized_service_handler_handler
@@ -190,7 +196,9 @@ static void Init_Service_Handlers(void)
apdu_set_reject_handler(MyRejectHandler); apdu_set_reject_handler(MyRejectHandler);
} }
int main(int argc, char *argv[]) int main(
int argc,
char *argv[])
{ {
BACNET_ADDRESS src = { 0 }; /* address where message came from */ BACNET_ADDRESS src = { 0 }; /* address where message came from */
uint16_t pdu_len = 0; uint16_t pdu_len = 0;
@@ -237,8 +245,7 @@ int main(int argc, char *argv[])
timeout_seconds = (Device_APDU_Timeout() / 1000) * timeout_seconds = (Device_APDU_Timeout() / 1000) *
Device_Number_Of_APDU_Retries(); Device_Number_Of_APDU_Retries();
/* try to bind with the device */ /* try to bind with the device */
Send_WhoIs(Target_Device_Object_Instance, Send_WhoIs(Target_Device_Object_Instance, Target_Device_Object_Instance);
Target_Device_Object_Instance);
/* loop forever */ /* loop forever */
for (;;) { for (;;) {
/* increment timer - exit if timed out */ /* increment timer - exit if timed out */
@@ -253,8 +260,7 @@ int main(int argc, char *argv[])
} }
/* at least one second has passed */ /* at least one second has passed */
if (current_seconds != last_seconds) if (current_seconds != last_seconds)
tsm_timer_milliseconds(((current_seconds - tsm_timer_milliseconds(((current_seconds - last_seconds) * 1000));
last_seconds) * 1000));
if (End_Of_File_Detected || Error_Detected) if (End_Of_File_Detected || Error_Detected)
break; break;
/* wait until the device is bound, or timeout and quit */ /* wait until the device is bound, or timeout and quit */
bacnet-stack/demo/readprop/main.c
+27 -22
View File
@@ -66,51 +66,57 @@ static int32_t Target_Object_Index = BACNET_ARRAY_ALL;
static BACNET_ADDRESS Target_Address; static BACNET_ADDRESS Target_Address;
static bool Error_Detected = false; static bool Error_Detected = false;
static void MyErrorHandler(BACNET_ADDRESS * src, static void MyErrorHandler(
BACNET_ADDRESS * src,
uint8_t invoke_id, uint8_t invoke_id,
BACNET_ERROR_CLASS error_class, BACNET_ERROR_CODE error_code) BACNET_ERROR_CLASS error_class,
BACNET_ERROR_CODE error_code)
{ {
/* FIXME: verify src and invoke id */ /* FIXME: verify src and invoke id */
(void) src; (void) src;
(void) invoke_id; (void) invoke_id;
printf("BACnet Error: %s: %s\r\n", printf("BACnet Error: %s: %s\r\n",
bactext_error_class_name((int)error_class), bactext_error_class_name((int) error_class),
bactext_error_code_name((int)error_code)); bactext_error_code_name((int) error_code));
Error_Detected = true; Error_Detected = true;
} }
void MyAbortHandler(BACNET_ADDRESS * src, void MyAbortHandler(
uint8_t invoke_id, uint8_t abort_reason, bool server) BACNET_ADDRESS * src,
uint8_t invoke_id,
uint8_t abort_reason,
bool server)
{ {
/* FIXME: verify src and invoke id */ /* FIXME: verify src and invoke id */
(void) src; (void) src;
(void) invoke_id; (void) invoke_id;
(void) server; (void) server;
printf("BACnet Abort: %s\r\n", printf("BACnet Abort: %s\r\n",
bactext_abort_reason_name((int)abort_reason)); bactext_abort_reason_name((int) abort_reason));
Error_Detected = true; Error_Detected = true;
} }
void MyRejectHandler(BACNET_ADDRESS * src, void MyRejectHandler(
uint8_t invoke_id, uint8_t reject_reason) BACNET_ADDRESS * src,
uint8_t invoke_id,
uint8_t reject_reason)
{ {
/* FIXME: verify src and invoke id */ /* FIXME: verify src and invoke id */
(void) src; (void) src;
(void) invoke_id; (void) invoke_id;
printf("BACnet Reject: %s\r\n", printf("BACnet Reject: %s\r\n",
bactext_reject_reason_name((int)reject_reason)); bactext_reject_reason_name((int) reject_reason));
Error_Detected = true; Error_Detected = true;
} }
static void Init_Service_Handlers(void) static void Init_Service_Handlers(
void)
{ {
/* we need to handle who-is /* we need to handle who-is
to support dynamic device binding to us */ to support dynamic device binding to us */
apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_WHO_IS, apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_WHO_IS, handler_who_is);
handler_who_is);
/* handle i-am to support binding to other devices */ /* handle i-am to support binding to other devices */
apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_I_AM, apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_I_AM, handler_i_am_bind);
handler_i_am_bind);
/* set the handler for all the services we don't implement /* set the handler for all the services we don't implement
It is required to send the proper reject message... */ It is required to send the proper reject message... */
apdu_set_unrecognized_service_handler_handler apdu_set_unrecognized_service_handler_handler
@@ -122,13 +128,14 @@ static void Init_Service_Handlers(void)
apdu_set_confirmed_ack_handler(SERVICE_CONFIRMED_READ_PROPERTY, apdu_set_confirmed_ack_handler(SERVICE_CONFIRMED_READ_PROPERTY,
handler_read_property_ack); handler_read_property_ack);
/* handle any errors coming back */ /* handle any errors coming back */
apdu_set_error_handler(SERVICE_CONFIRMED_READ_PROPERTY, apdu_set_error_handler(SERVICE_CONFIRMED_READ_PROPERTY, MyErrorHandler);
MyErrorHandler);
apdu_set_abort_handler(MyAbortHandler); apdu_set_abort_handler(MyAbortHandler);
apdu_set_reject_handler(MyRejectHandler); apdu_set_reject_handler(MyRejectHandler);
} }
int main(int argc, char *argv[]) int main(
int argc,
char *argv[])
{ {
BACNET_ADDRESS src = { 0 }; /* address where message came from */ BACNET_ADDRESS src = { 0 }; /* address where message came from */
uint16_t pdu_len = 0; uint16_t pdu_len = 0;
@@ -186,8 +193,7 @@ int main(int argc, char *argv[])
timeout_seconds = (Device_APDU_Timeout() / 1000) * timeout_seconds = (Device_APDU_Timeout() / 1000) *
Device_Number_Of_APDU_Retries(); Device_Number_Of_APDU_Retries();
/* try to bind with the device */ /* try to bind with the device */
Send_WhoIs(Target_Device_Object_Instance, Send_WhoIs(Target_Device_Object_Instance, Target_Device_Object_Instance);
Target_Device_Object_Instance);
/* loop forever */ /* loop forever */
for (;;) { for (;;) {
/* increment timer - exit if timed out */ /* increment timer - exit if timed out */
@@ -202,8 +208,7 @@ int main(int argc, char *argv[])
} }
/* at least one second has passed */ /* at least one second has passed */
if (current_seconds != last_seconds) if (current_seconds != last_seconds)
tsm_timer_milliseconds(((current_seconds - tsm_timer_milliseconds(((current_seconds - last_seconds) * 1000));
last_seconds) * 1000));
if (Error_Detected) if (Error_Detected)
break; break;
/* wait until the device is bound, or timeout and quit */ /* wait until the device is bound, or timeout and quit */
bacnet-stack/demo/reinit/main.c
+28 -28
View File
@@ -56,15 +56,16 @@ static uint8_t Rx_Buf[MAX_MPDU] = { 0 };
/* global variables used in this file */ /* global variables used in this file */
static uint32_t Target_Device_Object_Instance = BACNET_MAX_INSTANCE; static uint32_t Target_Device_Object_Instance = BACNET_MAX_INSTANCE;
static BACNET_ADDRESS Target_Address; static BACNET_ADDRESS Target_Address;
static BACNET_REINITIALIZED_STATE Reinitialize_State = static BACNET_REINITIALIZED_STATE Reinitialize_State = BACNET_REINIT_COLDSTART;
BACNET_REINIT_COLDSTART;
static char *Reinitialize_Password = NULL; static char *Reinitialize_Password = NULL;
static bool Error_Detected = false; static bool Error_Detected = false;
static void MyErrorHandler(BACNET_ADDRESS * src, static void MyErrorHandler(
BACNET_ADDRESS * src,
uint8_t invoke_id, uint8_t invoke_id,
BACNET_ERROR_CLASS error_class, BACNET_ERROR_CODE error_code) BACNET_ERROR_CLASS error_class,
BACNET_ERROR_CODE error_code)
{ {
/* FIXME: verify src and invoke id */ /* FIXME: verify src and invoke id */
(void) src; (void) src;
@@ -75,30 +76,34 @@ static void MyErrorHandler(BACNET_ADDRESS * src,
Error_Detected = true; Error_Detected = true;
} }
void MyAbortHandler(BACNET_ADDRESS * src, void MyAbortHandler(
uint8_t invoke_id, uint8_t abort_reason, bool server) BACNET_ADDRESS * src,
uint8_t invoke_id,
uint8_t abort_reason,
bool server)
{ {
/* FIXME: verify src and invoke id */ /* FIXME: verify src and invoke id */
(void) src; (void) src;
(void) invoke_id; (void) invoke_id;
(void) server; (void) server;
printf("BACnet Abort: %s\r\n", printf("BACnet Abort: %s\r\n", bactext_abort_reason_name(abort_reason));
bactext_abort_reason_name(abort_reason));
Error_Detected = true; Error_Detected = true;
} }
void MyRejectHandler(BACNET_ADDRESS * src, void MyRejectHandler(
uint8_t invoke_id, uint8_t reject_reason) BACNET_ADDRESS * src,
uint8_t invoke_id,
uint8_t reject_reason)
{ {
/* FIXME: verify src and invoke id */ /* FIXME: verify src and invoke id */
(void) src; (void) src;
(void) invoke_id; (void) invoke_id;
printf("BACnet Reject: %s\r\n", printf("BACnet Reject: %s\r\n", bactext_reject_reason_name(reject_reason));
bactext_reject_reason_name(reject_reason));
Error_Detected = true; Error_Detected = true;
} }
void MyReinitializeDeviceSimpleAckHandler(BACNET_ADDRESS * src, void MyReinitializeDeviceSimpleAckHandler(
BACNET_ADDRESS * src,
uint8_t invoke_id) uint8_t invoke_id)
{ {
(void) src; (void) src;
@@ -106,15 +111,14 @@ void MyReinitializeDeviceSimpleAckHandler(BACNET_ADDRESS * src,
printf("ReinitializeDevice Acknowledged!\r\n"); printf("ReinitializeDevice Acknowledged!\r\n");
} }
static void Init_Service_Handlers(void) static void Init_Service_Handlers(
void)
{ {
/* we need to handle who-is /* we need to handle who-is
to support dynamic device binding to us */ to support dynamic device binding to us */
apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_WHO_IS, apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_WHO_IS, handler_who_is);
handler_who_is);
/* handle i-am to support binding to other devices */ /* handle i-am to support binding to other devices */
apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_I_AM, apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_I_AM, handler_i_am_bind);
handler_i_am_bind);
/* set the handler for all the services we don't implement /* set the handler for all the services we don't implement
It is required to send the proper reject message... */ It is required to send the proper reject message... */
apdu_set_unrecognized_service_handler_handler apdu_set_unrecognized_service_handler_handler
@@ -133,7 +137,9 @@ static void Init_Service_Handlers(void)
apdu_set_reject_handler(MyRejectHandler); apdu_set_reject_handler(MyRejectHandler);
} }
int main(int argc, char *argv[]) int main(
int argc,
char *argv[])
{ {
BACNET_ADDRESS src = { 0 }; /* address where message came from */ BACNET_ADDRESS src = { 0 }; /* address where message came from */
uint16_t pdu_len = 0; uint16_t pdu_len = 0;
@@ -188,19 +194,14 @@ int main(int argc, char *argv[])
timeout_seconds = (Device_APDU_Timeout() / 1000) * timeout_seconds = (Device_APDU_Timeout() / 1000) *
Device_Number_Of_APDU_Retries(); Device_Number_Of_APDU_Retries();
/* try to bind with the device */ /* try to bind with the device */
Send_WhoIs(Target_Device_Object_Instance, Send_WhoIs(Target_Device_Object_Instance, Target_Device_Object_Instance);
Target_Device_Object_Instance);
/* loop forever */ /* loop forever */
for (;;) { for (;;) {
/* increment timer - exit if timed out */ /* increment timer - exit if timed out */
current_seconds = time(NULL); current_seconds = time(NULL);
/* returns 0 bytes on timeout */ /* returns 0 bytes on timeout */
pdu_len = datalink_receive( pdu_len = datalink_receive(&src, &Rx_Buf[0], MAX_MPDU, timeout);
&src,
&Rx_Buf[0],
MAX_MPDU,
timeout);
/* process */ /* process */
if (pdu_len) { if (pdu_len) {
@@ -208,8 +209,7 @@ int main(int argc, char *argv[])
} }
/* at least one second has passed */ /* at least one second has passed */
if (current_seconds != last_seconds) if (current_seconds != last_seconds)
tsm_timer_milliseconds(((current_seconds - tsm_timer_milliseconds(((current_seconds - last_seconds) * 1000));
last_seconds) * 1000));
if (Error_Detected) if (Error_Detected)
break; break;
/* wait until the device is bound, or timeout and quit */ /* wait until the device is bound, or timeout and quit */
bacnet-stack/demo/server/main.c
+11 -12
View File
@@ -55,13 +55,12 @@
/* buffers used for receiving */ /* buffers used for receiving */
static uint8_t Rx_Buf[MAX_MPDU] = { 0 }; static uint8_t Rx_Buf[MAX_MPDU] = { 0 };
static void Init_Service_Handlers(void) static void Init_Service_Handlers(
void)
{ {
/* we need to handle who-is to support dynamic device binding */ /* we need to handle who-is to support dynamic device binding */
apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_WHO_IS, apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_WHO_IS, handler_who_is);
handler_who_is); apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_WHO_HAS, handler_who_has);
apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_WHO_HAS,
handler_who_has);
/* set the handler for all the services we don't implement */ /* set the handler for all the services we don't implement */
/* It is required to send the proper reject message... */ /* It is required to send the proper reject message... */
apdu_set_unrecognized_service_handler_handler apdu_set_unrecognized_service_handler_handler
@@ -83,8 +82,7 @@ static void Init_Service_Handlers(void)
apdu_set_confirmed_handler(SERVICE_CONFIRMED_REINITIALIZE_DEVICE, apdu_set_confirmed_handler(SERVICE_CONFIRMED_REINITIALIZE_DEVICE,
handler_reinitialize_device); handler_reinitialize_device);
apdu_set_unconfirmed_handler apdu_set_unconfirmed_handler
(SERVICE_UNCONFIRMED_UTC_TIME_SYNCHRONIZATION, (SERVICE_UNCONFIRMED_UTC_TIME_SYNCHRONIZATION, handler_timesync_utc);
handler_timesync_utc);
apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_TIME_SYNCHRONIZATION, apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_TIME_SYNCHRONIZATION,
handler_timesync); handler_timesync);
/* handle communication so we can shutup when asked */ /* handle communication so we can shutup when asked */
@@ -93,12 +91,15 @@ static void Init_Service_Handlers(void)
handler_device_communication_control); handler_device_communication_control);
} }
static void cleanup(void) static void cleanup(
void)
{ {
datalink_cleanup(); datalink_cleanup();
} }
int main(int argc, char *argv[]) int main(
int argc,
char *argv[])
{ {
BACNET_ADDRESS src = { 0 }; /* address where message came from */ BACNET_ADDRESS src = { 0 }; /* address where message came from */
uint16_t pdu_len = 0; uint16_t pdu_len = 0;
@@ -147,9 +148,7 @@ int main(int argc, char *argv[])
"BACnet Stack Version %s\n" "BACnet Stack Version %s\n"
"BACnet Device ID: %u\n" "BACnet Device ID: %u\n"
"Max APDU: %d\n", "Max APDU: %d\n",
BACnet_Version, BACnet_Version, Device_Object_Instance_Number(), MAX_APDU);
Device_Object_Instance_Number(),
MAX_APDU);
Init_Service_Handlers(); Init_Service_Handlers();
BIP_Debug = true; BIP_Debug = true;
if (!datalink_init(getenv("BACNET_IFACE"))) if (!datalink_init(getenv("BACNET_IFACE")))
bacnet-stack/demo/timesync/main.c
+18 -14
View File
@@ -56,35 +56,38 @@ static int32_t Target_Object_Instance_Max = BACNET_MAX_INSTANCE;
static bool Error_Detected = false; static bool Error_Detected = false;
void MyAbortHandler(BACNET_ADDRESS * src, void MyAbortHandler(
uint8_t invoke_id, uint8_t abort_reason, bool server) BACNET_ADDRESS * src,
uint8_t invoke_id,
uint8_t abort_reason,
bool server)
{ {
/* FIXME: verify src and invoke id */ /* FIXME: verify src and invoke id */
(void) src; (void) src;
(void) invoke_id; (void) invoke_id;
(void) server; (void) server;
printf("BACnet Abort: %s\r\n", printf("BACnet Abort: %s\r\n", bactext_abort_reason_name(abort_reason));
bactext_abort_reason_name(abort_reason));
Error_Detected = true; Error_Detected = true;
} }
void MyRejectHandler(BACNET_ADDRESS * src, void MyRejectHandler(
uint8_t invoke_id, uint8_t reject_reason) BACNET_ADDRESS * src,
uint8_t invoke_id,
uint8_t reject_reason)
{ {
/* FIXME: verify src and invoke id */ /* FIXME: verify src and invoke id */
(void) src; (void) src;
(void) invoke_id; (void) invoke_id;
printf("BACnet Reject: %s\r\n", printf("BACnet Reject: %s\r\n", bactext_reject_reason_name(reject_reason));
bactext_reject_reason_name(reject_reason));
Error_Detected = true; Error_Detected = true;
} }
static void Init_Service_Handlers(void) static void Init_Service_Handlers(
void)
{ {
/* we need to handle who-is /* we need to handle who-is
to support dynamic device binding to us */ to support dynamic device binding to us */
apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_WHO_IS, apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_WHO_IS, handler_who_is);
handler_who_is);
/* set the handler for all the services we don't implement /* set the handler for all the services we don't implement
It is required to send the proper reject message... */ It is required to send the proper reject message... */
apdu_set_unrecognized_service_handler_handler apdu_set_unrecognized_service_handler_handler
@@ -94,8 +97,7 @@ static void Init_Service_Handlers(void)
handler_read_property); handler_read_property);
/* handle the reply (request) coming in */ /* handle the reply (request) coming in */
apdu_set_unconfirmed_handler apdu_set_unconfirmed_handler
(SERVICE_UNCONFIRMED_UTC_TIME_SYNCHRONIZATION, (SERVICE_UNCONFIRMED_UTC_TIME_SYNCHRONIZATION, handler_timesync_utc);
handler_timesync_utc);
apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_TIME_SYNCHRONIZATION, apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_TIME_SYNCHRONIZATION,
handler_timesync); handler_timesync);
/* handle any errors coming back */ /* handle any errors coming back */
@@ -103,7 +105,9 @@ static void Init_Service_Handlers(void)
apdu_set_reject_handler(MyRejectHandler); apdu_set_reject_handler(MyRejectHandler);
} }
int main(int argc, char *argv[]) int main(
int argc,
char *argv[])
{ {
BACNET_ADDRESS src = { 0 }; /* address where message came from */ BACNET_ADDRESS src = { 0 }; /* address where message came from */
uint16_t pdu_len = 0; uint16_t pdu_len = 0;
bacnet-stack/demo/ucov/main.c
+8 -8
View File
@@ -49,15 +49,14 @@
#include "client.h" #include "client.h"
#include "txbuf.h" #include "txbuf.h"
static void Init_Service_Handlers(void) static void Init_Service_Handlers(
void)
{ {
/* we need to handle who-is /* we need to handle who-is
to support dynamic device binding to us */ to support dynamic device binding to us */
apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_WHO_IS, apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_WHO_IS, handler_who_is);
handler_who_is);
/* handle i-am to support binding to other devices */ /* handle i-am to support binding to other devices */
apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_I_AM, apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_I_AM, handler_i_am_bind);
handler_i_am_bind);
/* set the handler for all the services we don't implement /* set the handler for all the services we don't implement
It is required to send the proper reject message... */ It is required to send the proper reject message... */
apdu_set_unrecognized_service_handler_handler apdu_set_unrecognized_service_handler_handler
@@ -67,7 +66,9 @@ static void Init_Service_Handlers(void)
handler_read_property); handler_read_property);
} }
int main(int argc, char *argv[]) int main(
int argc,
char *argv[])
{ {
char *value_string = NULL; char *value_string = NULL;
bool status = false; bool status = false;
@@ -162,8 +163,7 @@ int main(int argc, char *argv[])
cov_data.listOfValues.priority = BACNET_NO_PRIORITY; cov_data.listOfValues.priority = BACNET_NO_PRIORITY;
/* optional index */ /* optional index */
if (argc > 10) if (argc > 10)
cov_data.listOfValues.propertyArrayIndex = cov_data.listOfValues.propertyArrayIndex = strtol(argv[10], NULL, 0);
strtol(argv[10], NULL, 0);
else else
cov_data.listOfValues.propertyArrayIndex = BACNET_ARRAY_ALL; cov_data.listOfValues.propertyArrayIndex = BACNET_ARRAY_ALL;
bacnet-stack/demo/whohas/main.c
+19 -16
View File
@@ -59,35 +59,38 @@ static char *Target_Object_Name = NULL;
static bool Error_Detected = false; static bool Error_Detected = false;
void MyAbortHandler(BACNET_ADDRESS * src, void MyAbortHandler(
uint8_t invoke_id, uint8_t abort_reason, bool server) BACNET_ADDRESS * src,
uint8_t invoke_id,
uint8_t abort_reason,
bool server)
{ {
/* FIXME: verify src and invoke id */ /* FIXME: verify src and invoke id */
(void) src; (void) src;
(void) invoke_id; (void) invoke_id;
(void) server; (void) server;
printf("BACnet Abort: %s\r\n", printf("BACnet Abort: %s\r\n", bactext_abort_reason_name(abort_reason));
bactext_abort_reason_name(abort_reason));
Error_Detected = true; Error_Detected = true;
} }
void MyRejectHandler(BACNET_ADDRESS * src, void MyRejectHandler(
uint8_t invoke_id, uint8_t reject_reason) BACNET_ADDRESS * src,
uint8_t invoke_id,
uint8_t reject_reason)
{ {
/* FIXME: verify src and invoke id */ /* FIXME: verify src and invoke id */
(void) src; (void) src;
(void) invoke_id; (void) invoke_id;
printf("BACnet Reject: %s\r\n", printf("BACnet Reject: %s\r\n", bactext_reject_reason_name(reject_reason));
bactext_reject_reason_name(reject_reason));
Error_Detected = true; Error_Detected = true;
} }
static void Init_Service_Handlers(void) static void Init_Service_Handlers(
void)
{ {
/* we need to handle who-is /* we need to handle who-is
to support dynamic device binding to us */ to support dynamic device binding to us */
apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_WHO_IS, apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_WHO_IS, handler_who_is);
handler_who_is);
/* set the handler for all the services we don't implement /* set the handler for all the services we don't implement
It is required to send the proper reject message... */ It is required to send the proper reject message... */
apdu_set_unrecognized_service_handler_handler apdu_set_unrecognized_service_handler_handler
@@ -96,14 +99,15 @@ static void Init_Service_Handlers(void)
apdu_set_confirmed_handler(SERVICE_CONFIRMED_READ_PROPERTY, apdu_set_confirmed_handler(SERVICE_CONFIRMED_READ_PROPERTY,
handler_read_property); handler_read_property);
/* handle the reply (request) coming back */ /* handle the reply (request) coming back */
apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_I_HAVE, apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_I_HAVE, handler_i_have);
handler_i_have);
/* handle any errors coming back */ /* handle any errors coming back */
apdu_set_abort_handler(MyAbortHandler); apdu_set_abort_handler(MyAbortHandler);
apdu_set_reject_handler(MyRejectHandler); apdu_set_reject_handler(MyRejectHandler);
} }
int main(int argc, char *argv[]) int main(
int argc,
char *argv[])
{ {
BACNET_ADDRESS src = { 0 }; /* address where message came from */ BACNET_ADDRESS src = { 0 }; /* address where message came from */
uint16_t pdu_len = 0; uint16_t pdu_len = 0;
@@ -157,8 +161,7 @@ int main(int argc, char *argv[])
if (argc < 3) if (argc < 3)
Send_WhoHas_Name(-1, -1, Target_Object_Name); Send_WhoHas_Name(-1, -1, Target_Object_Name);
else else
Send_WhoHas_Object(-1, -1, Send_WhoHas_Object(-1, -1, Target_Object_Type, Target_Object_Instance);
Target_Object_Type, Target_Object_Instance);
/* loop forever */ /* loop forever */
for (;;) { for (;;) {
/* increment timer - exit if timed out */ /* increment timer - exit if timed out */
bacnet-stack/demo/whois/main.c
+20 -15
View File
@@ -55,35 +55,38 @@ static int32_t Target_Object_Instance_Max = BACNET_MAX_INSTANCE;
static bool Error_Detected = false; static bool Error_Detected = false;
void MyAbortHandler(BACNET_ADDRESS * src, void MyAbortHandler(
uint8_t invoke_id, uint8_t abort_reason, bool server) BACNET_ADDRESS * src,
uint8_t invoke_id,
uint8_t abort_reason,
bool server)
{ {
/* FIXME: verify src and invoke id */ /* FIXME: verify src and invoke id */
(void) src; (void) src;
(void) invoke_id; (void) invoke_id;
(void) server; (void) server;
printf("BACnet Abort: %s\r\n", printf("BACnet Abort: %s\r\n", bactext_abort_reason_name(abort_reason));
bactext_abort_reason_name(abort_reason));
Error_Detected = true; Error_Detected = true;
} }
void MyRejectHandler(BACNET_ADDRESS * src, void MyRejectHandler(
uint8_t invoke_id, uint8_t reject_reason) BACNET_ADDRESS * src,
uint8_t invoke_id,
uint8_t reject_reason)
{ {
/* FIXME: verify src and invoke id */ /* FIXME: verify src and invoke id */
(void) src; (void) src;
(void) invoke_id; (void) invoke_id;
printf("BACnet Reject: %s\r\n", printf("BACnet Reject: %s\r\n", bactext_reject_reason_name(reject_reason));
bactext_reject_reason_name(reject_reason));
Error_Detected = true; Error_Detected = true;
} }
static void Init_Service_Handlers(void) static void Init_Service_Handlers(
void)
{ {
/* we need to handle who-is /* we need to handle who-is
to support dynamic device binding to us */ to support dynamic device binding to us */
apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_WHO_IS, apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_WHO_IS, handler_who_is);
handler_who_is);
/* set the handler for all the services we don't implement /* set the handler for all the services we don't implement
It is required to send the proper reject message... */ It is required to send the proper reject message... */
apdu_set_unrecognized_service_handler_handler apdu_set_unrecognized_service_handler_handler
@@ -92,14 +95,14 @@ static void Init_Service_Handlers(void)
apdu_set_confirmed_handler(SERVICE_CONFIRMED_READ_PROPERTY, apdu_set_confirmed_handler(SERVICE_CONFIRMED_READ_PROPERTY,
handler_read_property); handler_read_property);
/* handle the reply (request) coming back */ /* handle the reply (request) coming back */
apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_I_AM, apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_I_AM, handler_i_am_add);
handler_i_am_add);
/* handle any errors coming back */ /* handle any errors coming back */
apdu_set_abort_handler(MyAbortHandler); apdu_set_abort_handler(MyAbortHandler);
apdu_set_reject_handler(MyRejectHandler); apdu_set_reject_handler(MyRejectHandler);
} }
static void print_address_cache(void) static void print_address_cache(
void)
{ {
int i, j; int i, j;
BACNET_ADDRESS address; BACNET_ADDRESS address;
@@ -120,7 +123,9 @@ static void print_address_cache(void)
} }
} }
int main(int argc, char *argv[]) int main(
int argc,
char *argv[])
{ {
BACNET_ADDRESS src = { 0 }; /* address where message came from */ BACNET_ADDRESS src = { 0 }; /* address where message came from */
uint16_t pdu_len = 0; uint16_t pdu_len = 0;
bacnet-stack/demo/writefile/main.c
+29 -24
View File
@@ -61,9 +61,11 @@ static bool End_Of_File_Detected = false;
static bool Error_Detected = false; static bool Error_Detected = false;
static uint8_t Current_Invoke_ID = 0; static uint8_t Current_Invoke_ID = 0;
static void Atomic_Read_File_Error_Handler(BACNET_ADDRESS * src, static void Atomic_Read_File_Error_Handler(
BACNET_ADDRESS * src,
uint8_t invoke_id, uint8_t invoke_id,
BACNET_ERROR_CLASS error_class, BACNET_ERROR_CODE error_code) BACNET_ERROR_CLASS error_class,
BACNET_ERROR_CODE error_code)
{ {
/* FIXME: verify src and invoke id */ /* FIXME: verify src and invoke id */
(void) src; (void) src;
@@ -74,33 +76,38 @@ static void Atomic_Read_File_Error_Handler(BACNET_ADDRESS * src,
Error_Detected = true; Error_Detected = true;
} }
void MyAbortHandler(BACNET_ADDRESS * src, void MyAbortHandler(
uint8_t invoke_id, uint8_t abort_reason, bool server) BACNET_ADDRESS * src,
uint8_t invoke_id,
uint8_t abort_reason,
bool server)
{ {
/* FIXME: verify src and invoke id */ /* FIXME: verify src and invoke id */
(void) src; (void) src;
(void) invoke_id; (void) invoke_id;
(void) server; (void) server;
printf("\r\nBACnet Abort!\r\n"); printf("\r\nBACnet Abort!\r\n");
printf("Abort Reason: %s\r\n", printf("Abort Reason: %s\r\n", bactext_abort_reason_name(abort_reason));
bactext_abort_reason_name(abort_reason));
Error_Detected = true; Error_Detected = true;
} }
void MyRejectHandler(BACNET_ADDRESS * src, void MyRejectHandler(
uint8_t invoke_id, uint8_t reject_reason) BACNET_ADDRESS * src,
uint8_t invoke_id,
uint8_t reject_reason)
{ {
/* FIXME: verify src and invoke id */ /* FIXME: verify src and invoke id */
(void) src; (void) src;
(void) invoke_id; (void) invoke_id;
printf("\r\nBACnet Reject!\r\n"); printf("\r\nBACnet Reject!\r\n");
printf("Reject Reason: %s\r\n", printf("Reject Reason: %s\r\n", bactext_reject_reason_name(reject_reason));
bactext_reject_reason_name(reject_reason));
Error_Detected = true; Error_Detected = true;
} }
static void LocalIAmHandler(uint8_t * service_request, static void LocalIAmHandler(
uint16_t service_len, BACNET_ADDRESS * src) uint8_t * service_request,
uint16_t service_len,
BACNET_ADDRESS * src)
{ {
int len = 0; int len = 0;
uint32_t device_id = 0; uint32_t device_id = 0;
@@ -120,15 +127,14 @@ static void LocalIAmHandler(uint8_t * service_request,
return; return;
} }
static void Init_Service_Handlers(void) static void Init_Service_Handlers(
void)
{ {
/* we need to handle who-is /* we need to handle who-is
to support dynamic device binding to us */ to support dynamic device binding to us */
apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_WHO_IS, apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_WHO_IS, handler_who_is);
handler_who_is);
/* handle i-am to support binding to other devices */ /* handle i-am to support binding to other devices */
apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_I_AM, apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_I_AM, LocalIAmHandler);
LocalIAmHandler);
/* set the handler for all the services we don't implement /* set the handler for all the services we don't implement
It is required to send the proper reject message... */ It is required to send the proper reject message... */
apdu_set_unrecognized_service_handler_handler apdu_set_unrecognized_service_handler_handler
@@ -143,7 +149,9 @@ static void Init_Service_Handlers(void)
apdu_set_reject_handler(MyRejectHandler); apdu_set_reject_handler(MyRejectHandler);
} }
int main(int argc, char *argv[]) int main(
int argc,
char *argv[])
{ {
BACNET_ADDRESS src = { 0 }; /* address where message came from */ BACNET_ADDRESS src = { 0 }; /* address where message came from */
uint16_t pdu_len = 0; uint16_t pdu_len = 0;
@@ -193,8 +201,7 @@ int main(int argc, char *argv[])
timeout_seconds = (Device_APDU_Timeout() / 1000) * timeout_seconds = (Device_APDU_Timeout() / 1000) *
Device_Number_Of_APDU_Retries(); Device_Number_Of_APDU_Retries();
/* try to bind with the device */ /* try to bind with the device */
Send_WhoIs(Target_Device_Object_Instance, Send_WhoIs(Target_Device_Object_Instance, Target_Device_Object_Instance);
Target_Device_Object_Instance);
/* loop forever */ /* loop forever */
for (;;) { for (;;) {
/* increment timer - exit if timed out */ /* increment timer - exit if timed out */
@@ -209,8 +216,7 @@ int main(int argc, char *argv[])
} }
/* at least one second has passed */ /* at least one second has passed */
if (current_seconds != last_seconds) if (current_seconds != last_seconds)
tsm_timer_milliseconds(((current_seconds - tsm_timer_milliseconds(((current_seconds - last_seconds) * 1000));
last_seconds) * 1000));
if (End_Of_File_Detected || Error_Detected) { if (End_Of_File_Detected || Error_Detected) {
printf("\r\n"); printf("\r\n");
break; break;
@@ -258,8 +264,7 @@ int main(int argc, char *argv[])
invoke_id = invoke_id =
Send_Atomic_Write_File_Stream Send_Atomic_Write_File_Stream
(Target_Device_Object_Instance, (Target_Device_Object_Instance,
Target_File_Object_Instance, fileStartPosition, Target_File_Object_Instance, fileStartPosition, &fileData);
&fileData);
Current_Invoke_ID = invoke_id; Current_Invoke_ID = invoke_id;
} else if (tsm_invoke_id_failed(invoke_id)) { } else if (tsm_invoke_id_failed(invoke_id)) {
fprintf(stderr, "\rError: TSM Timeout!\r\n"); fprintf(stderr, "\rError: TSM Timeout!\r\n");
bacnet-stack/demo/writeprop/main.c
+28 -25
View File
@@ -71,9 +71,11 @@ static uint8_t Target_Object_Property_Priority = 0;
static BACNET_ADDRESS Target_Address; static BACNET_ADDRESS Target_Address;
static bool Error_Detected = false; static bool Error_Detected = false;
static void MyErrorHandler(BACNET_ADDRESS * src, static void MyErrorHandler(
BACNET_ADDRESS * src,
uint8_t invoke_id, uint8_t invoke_id,
BACNET_ERROR_CLASS error_class, BACNET_ERROR_CODE error_code) BACNET_ERROR_CLASS error_class,
BACNET_ERROR_CODE error_code)
{ {
/* FIXME: verify src and invoke id */ /* FIXME: verify src and invoke id */
(void) src; (void) src;
@@ -84,32 +86,36 @@ static void MyErrorHandler(BACNET_ADDRESS * src,
Error_Detected = true; Error_Detected = true;
} }
void MyAbortHandler(BACNET_ADDRESS * src, void MyAbortHandler(
uint8_t invoke_id, uint8_t abort_reason, bool server) BACNET_ADDRESS * src,
uint8_t invoke_id,
uint8_t abort_reason,
bool server)
{ {
/* FIXME: verify src and invoke id */ /* FIXME: verify src and invoke id */
(void) src; (void) src;
(void) invoke_id; (void) invoke_id;
(void) server; (void) server;
printf("\r\nBACnet Abort!\r\n"); printf("\r\nBACnet Abort!\r\n");
printf("Abort Reason: %s\r\n", printf("Abort Reason: %s\r\n", bactext_abort_reason_name(abort_reason));
bactext_abort_reason_name(abort_reason));
Error_Detected = true; Error_Detected = true;
} }
void MyRejectHandler(BACNET_ADDRESS * src, void MyRejectHandler(
uint8_t invoke_id, uint8_t reject_reason) BACNET_ADDRESS * src,
uint8_t invoke_id,
uint8_t reject_reason)
{ {
/* FIXME: verify src and invoke id */ /* FIXME: verify src and invoke id */
(void) src; (void) src;
(void) invoke_id; (void) invoke_id;
printf("\r\nBACnet Reject!\r\n"); printf("\r\nBACnet Reject!\r\n");
printf("Reject Reason: %s\r\n", printf("Reject Reason: %s\r\n", bactext_reject_reason_name(reject_reason));
bactext_reject_reason_name(reject_reason));
Error_Detected = true; Error_Detected = true;
} }
void MyWritePropertySimpleAckHandler(BACNET_ADDRESS * src, void MyWritePropertySimpleAckHandler(
BACNET_ADDRESS * src,
uint8_t invoke_id) uint8_t invoke_id)
{ {
(void) src; (void) src;
@@ -117,15 +123,14 @@ void MyWritePropertySimpleAckHandler(BACNET_ADDRESS * src,
printf("\r\nWriteProperty Acknowledged!\r\n"); printf("\r\nWriteProperty Acknowledged!\r\n");
} }
static void Init_Service_Handlers(void) static void Init_Service_Handlers(
void)
{ {
/* we need to handle who-is /* we need to handle who-is
to support dynamic device binding to us */ to support dynamic device binding to us */
apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_WHO_IS, apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_WHO_IS, handler_who_is);
handler_who_is);
/* handle i-am to support binding to other devices */ /* handle i-am to support binding to other devices */
apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_I_AM, apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_I_AM, handler_i_am_bind);
handler_i_am_bind);
/* set the handler for all the services we don't implement /* set the handler for all the services we don't implement
It is required to send the proper reject message... */ It is required to send the proper reject message... */
apdu_set_unrecognized_service_handler_handler apdu_set_unrecognized_service_handler_handler
@@ -137,13 +142,14 @@ static void Init_Service_Handlers(void)
apdu_set_confirmed_simple_ack_handler(SERVICE_CONFIRMED_WRITE_PROPERTY, apdu_set_confirmed_simple_ack_handler(SERVICE_CONFIRMED_WRITE_PROPERTY,
MyWritePropertySimpleAckHandler); MyWritePropertySimpleAckHandler);
/* handle any errors coming back */ /* handle any errors coming back */
apdu_set_error_handler(SERVICE_CONFIRMED_WRITE_PROPERTY, apdu_set_error_handler(SERVICE_CONFIRMED_WRITE_PROPERTY, MyErrorHandler);
MyErrorHandler);
apdu_set_abort_handler(MyAbortHandler); apdu_set_abort_handler(MyAbortHandler);
apdu_set_reject_handler(MyRejectHandler); apdu_set_reject_handler(MyRejectHandler);
} }
int main(int argc, char *argv[]) int main(
int argc,
char *argv[])
{ {
BACNET_ADDRESS src = { 0 }; /* address where message came from */ BACNET_ADDRESS src = { 0 }; /* address where message came from */
uint16_t pdu_len = 0; uint16_t pdu_len = 0;
@@ -234,8 +240,7 @@ int main(int argc, char *argv[])
"%s 123 1 0 85 4 100\r\n" "%s 123 1 0 85 4 100\r\n"
"You could also send a relinquish command:\r\n" "You could also send a relinquish command:\r\n"
"%s 123 1 0 85 0 0\r\n", "%s 123 1 0 85 0 0\r\n",
filename_remove_path(argv[0]), filename_remove_path(argv[0]), filename_remove_path(argv[0]));
filename_remove_path(argv[0]));
} }
return 0; return 0;
} }
@@ -317,8 +322,7 @@ int main(int argc, char *argv[])
timeout_seconds = (Device_APDU_Timeout() / 1000) * timeout_seconds = (Device_APDU_Timeout() / 1000) *
Device_Number_Of_APDU_Retries(); Device_Number_Of_APDU_Retries();
/* try to bind with the device */ /* try to bind with the device */
Send_WhoIs(Target_Device_Object_Instance, Send_WhoIs(Target_Device_Object_Instance, Target_Device_Object_Instance);
Target_Device_Object_Instance);
/* loop forever */ /* loop forever */
for (;;) { for (;;) {
/* increment timer - exit if timed out */ /* increment timer - exit if timed out */
@@ -333,8 +337,7 @@ int main(int argc, char *argv[])
} }
/* at least one second has passed */ /* at least one second has passed */
if (current_seconds != last_seconds) if (current_seconds != last_seconds)
tsm_timer_milliseconds(((current_seconds - tsm_timer_milliseconds(((current_seconds - last_seconds) * 1000));
last_seconds) * 1000));
if (Error_Detected) if (Error_Detected)
break; break;
/* wait until the device is bound, or timeout and quit */ /* wait until the device is bound, or timeout and quit */
bacnet-stack/include/abort.h
+17 -7
View File
@@ -41,19 +41,29 @@
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
int abort_encode_apdu(uint8_t * apdu, int abort_encode_apdu(
uint8_t invoke_id, uint8_t abort_reason, bool server); uint8_t * apdu,
uint8_t invoke_id,
uint8_t abort_reason,
bool server);
int abort_decode_service_request(uint8_t * apdu, int abort_decode_service_request(
unsigned apdu_len, uint8_t * invoke_id, uint8_t * abort_reason); uint8_t * apdu,
unsigned apdu_len,
uint8_t * invoke_id,
uint8_t * abort_reason);
#ifdef TEST #ifdef TEST
#include "ctest.h" #include "ctest.h"
int abort_decode_apdu(uint8_t * apdu, int abort_decode_apdu(
unsigned apdu_len, uint8_t * invoke_id, uint8_t * abort_reason, uint8_t * apdu,
unsigned apdu_len,
uint8_t * invoke_id,
uint8_t * abort_reason,
bool * server); bool * server);
void testAbort(Test * pTest); void testAbort(
Test * pTest);
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
bacnet-stack/include/address.h
+33 -16
View File
@@ -43,31 +43,48 @@
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
void address_init(void); void address_init(
void);
void address_add(uint32_t device_id, void address_add(
unsigned max_apdu, BACNET_ADDRESS * src); uint32_t device_id,
unsigned max_apdu,
BACNET_ADDRESS * src);
void address_remove_device(uint32_t device_id); void address_remove_device(
uint32_t device_id);
bool address_get_by_device(uint32_t device_id, bool address_get_by_device(
unsigned *max_apdu, BACNET_ADDRESS * src); uint32_t device_id,
unsigned *max_apdu,
BACNET_ADDRESS * src);
bool address_get_by_index(unsigned index, bool address_get_by_index(
uint32_t * device_id, unsigned *max_apdu, BACNET_ADDRESS * src); unsigned index,
uint32_t * device_id,
unsigned *max_apdu,
BACNET_ADDRESS * src);
bool address_get_device_id(BACNET_ADDRESS * src, bool address_get_device_id(
uint32_t *device_id); BACNET_ADDRESS * src,
uint32_t * device_id);
unsigned address_count(void); unsigned address_count(
void);
bool address_match(BACNET_ADDRESS * dest, BACNET_ADDRESS * src); bool address_match(
BACNET_ADDRESS * dest,
BACNET_ADDRESS * src);
bool address_bind_request(uint32_t device_id, bool address_bind_request(
unsigned *max_apdu, BACNET_ADDRESS * src); uint32_t device_id,
unsigned *max_apdu,
BACNET_ADDRESS * src);
void address_add_binding(uint32_t device_id, void address_add_binding(
unsigned max_apdu, BACNET_ADDRESS * src); uint32_t device_id,
unsigned max_apdu,
BACNET_ADDRESS * src);
#ifdef __cplusplus #ifdef __cplusplus
} }
bacnet-stack/include/ai.h
+14 -7
View File
@@ -36,20 +36,27 @@ extern "C" {
const int **pRequired, const int **pRequired,
const int **pOptional, const int **pOptional,
const int **pProprietary); const int **pProprietary);
bool Analog_Input_Valid_Instance(uint32_t object_instance); bool Analog_Input_Valid_Instance(
unsigned Analog_Input_Count(void); uint32_t object_instance);
uint32_t Analog_Input_Index_To_Instance(unsigned index); unsigned Analog_Input_Count(
char *Analog_Input_Name(uint32_t object_instance); void);
uint32_t Analog_Input_Index_To_Instance(
unsigned index);
char *Analog_Input_Name(
uint32_t object_instance);
int Analog_Input_Encode_Property_APDU(uint8_t * apdu, int Analog_Input_Encode_Property_APDU(
uint8_t * apdu,
uint32_t object_instance, uint32_t object_instance,
BACNET_PROPERTY_ID property, BACNET_PROPERTY_ID property,
int32_t array_index, int32_t array_index,
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code); BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code);
#ifdef TEST #ifdef TEST
#include "ctest.h" #include "ctest.h"
void testAnalogInput(Test * pTest); void testAnalogInput(
Test * pTest);
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
bacnet-stack/include/ao.h
+28 -15
View File
@@ -39,31 +39,44 @@ extern "C" {
const int **pRequired, const int **pRequired,
const int **pOptional, const int **pOptional,
const int **pProprietary); const int **pProprietary);
bool Analog_Output_Valid_Instance(uint32_t object_instance); bool Analog_Output_Valid_Instance(
unsigned Analog_Output_Count(void); uint32_t object_instance);
uint32_t Analog_Output_Index_To_Instance(unsigned index); unsigned Analog_Output_Count(
char *Analog_Output_Name(uint32_t object_instance); void);
float Analog_Output_Present_Value(uint32_t object_instance); uint32_t Analog_Output_Index_To_Instance(
unsigned Analog_Output_Present_Value_Priority(uint32_t unsigned index);
object_instance); char *Analog_Output_Name(
bool Analog_Output_Present_Value_Set(uint32_t object_instance, uint32_t object_instance);
float value, unsigned priority); float Analog_Output_Present_Value(
bool Analog_Output_Present_Value_Relinquish(uint32_t object_instance, uint32_t object_instance);
unsigned Analog_Output_Present_Value_Priority(
uint32_t object_instance);
bool Analog_Output_Present_Value_Set(
uint32_t object_instance,
float value,
unsigned priority);
bool Analog_Output_Present_Value_Relinquish(
uint32_t object_instance,
int priority); int priority);
int Analog_Output_Encode_Property_APDU(uint8_t * apdu, int Analog_Output_Encode_Property_APDU(
uint8_t * apdu,
uint32_t object_instance, uint32_t object_instance,
BACNET_PROPERTY_ID property, BACNET_PROPERTY_ID property,
int32_t array_index, int32_t array_index,
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code); BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code);
bool Analog_Output_Write_Property(BACNET_WRITE_PROPERTY_DATA * wp_data, bool Analog_Output_Write_Property(
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code); BACNET_WRITE_PROPERTY_DATA * wp_data,
BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code);
#ifdef TEST #ifdef TEST
#include "ctest.h" #include "ctest.h"
void testAnalogOutput(Test * pTest); void testAnalogOutput(
Test * pTest);
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
bacnet-stack/include/apdu.h
+58 -29
View File
@@ -68,8 +68,11 @@ extern "C" {
/* Unconfirmed_Event_Notification, Unconfirmed_Private_Transfer, */ /* Unconfirmed_Event_Notification, Unconfirmed_Private_Transfer, */
/* Unconfirmed_Text_Message, Time_Synchronization, Who_Has, */ /* Unconfirmed_Text_Message, Time_Synchronization, Who_Has, */
/* UTC_Time_Synchronization */ /* UTC_Time_Synchronization */
typedef void (*unconfirmed_function) (uint8_t * service_request, typedef void (
uint16_t len, BACNET_ADDRESS * src); *unconfirmed_function) (
uint8_t * service_request,
uint16_t len,
BACNET_ADDRESS * src);
/* generic confirmed function handler */ /* generic confirmed function handler */
/* Suitable to handle the following services: */ /* Suitable to handle the following services: */
@@ -87,68 +90,94 @@ extern "C" {
/* Confirmed_Text_Message, Reinitialize_Device, */ /* Confirmed_Text_Message, Reinitialize_Device, */
/* VT_Open, VT_Close, VT_Data_Handler, */ /* VT_Open, VT_Close, VT_Data_Handler, */
/* Authenticate, Request_Key */ /* Authenticate, Request_Key */
typedef void (*confirmed_function) (uint8_t * service_request, typedef void (
*confirmed_function) (
uint8_t * service_request,
uint16_t service_len, uint16_t service_len,
BACNET_ADDRESS * src, BACNET_ADDRESS * src,
BACNET_CONFIRMED_SERVICE_DATA * service_data); BACNET_CONFIRMED_SERVICE_DATA * service_data);
/* generic confirmed simple ack function handler */ /* generic confirmed simple ack function handler */
typedef void (*confirmed_simple_ack_function) (BACNET_ADDRESS * src, typedef void (
*confirmed_simple_ack_function) (
BACNET_ADDRESS * src,
uint8_t invoke_id); uint8_t invoke_id);
/* generic confirmed ack function handler */ /* generic confirmed ack function handler */
typedef void (*confirmed_ack_function) (uint8_t * service_request, typedef void (
*confirmed_ack_function) (
uint8_t * service_request,
uint16_t service_len, uint16_t service_len,
BACNET_ADDRESS * src, BACNET_ADDRESS * src,
BACNET_CONFIRMED_SERVICE_ACK_DATA * service_data); BACNET_CONFIRMED_SERVICE_ACK_DATA * service_data);
/* generic error reply function */ /* generic error reply function */
typedef void (*error_function) (BACNET_ADDRESS * src, typedef void (
*error_function) (
BACNET_ADDRESS * src,
uint8_t invoke_id, uint8_t invoke_id,
BACNET_ERROR_CLASS error_class, BACNET_ERROR_CODE error_code); BACNET_ERROR_CLASS error_class,
BACNET_ERROR_CODE error_code);
/* generic abort reply function */ /* generic abort reply function */
typedef void (*abort_function) (BACNET_ADDRESS * src, typedef void (
uint8_t invoke_id, uint8_t abort_reason, bool server); *abort_function) (
BACNET_ADDRESS * src,
uint8_t invoke_id,
uint8_t abort_reason,
bool server);
/* generic reject reply function */ /* generic reject reply function */
typedef void (*reject_function) (BACNET_ADDRESS * src, typedef void (
uint8_t invoke_id, uint8_t reject_reason); *reject_function) (
BACNET_ADDRESS * src,
uint8_t invoke_id,
uint8_t reject_reason);
void apdu_set_confirmed_ack_handler(BACNET_CONFIRMED_SERVICE void apdu_set_confirmed_ack_handler(
service_choice, confirmed_ack_function pFunction); BACNET_CONFIRMED_SERVICE service_choice,
confirmed_ack_function pFunction);
void apdu_set_confirmed_simple_ack_handler(BACNET_CONFIRMED_SERVICE void apdu_set_confirmed_simple_ack_handler(
service_choice, confirmed_simple_ack_function pFunction); BACNET_CONFIRMED_SERVICE service_choice,
confirmed_simple_ack_function pFunction);
/* configure reject for confirmed services that are not supported */ /* configure reject for confirmed services that are not supported */
void apdu_set_unrecognized_service_handler_handler(confirmed_function void apdu_set_unrecognized_service_handler_handler(
pFunction); confirmed_function pFunction);
void apdu_set_confirmed_handler(BACNET_CONFIRMED_SERVICE void apdu_set_confirmed_handler(
service_choice, confirmed_function pFunction); BACNET_CONFIRMED_SERVICE service_choice,
confirmed_function pFunction);
void apdu_set_unconfirmed_handler(BACNET_UNCONFIRMED_SERVICE void apdu_set_unconfirmed_handler(
service_choice, unconfirmed_function pFunction); BACNET_UNCONFIRMED_SERVICE service_choice,
unconfirmed_function pFunction);
/* returns true if the service is supported by a handler */ /* returns true if the service is supported by a handler */
bool apdu_service_supported(BACNET_SERVICES_SUPPORTED bool apdu_service_supported(
service_supported); BACNET_SERVICES_SUPPORTED service_supported);
void apdu_set_error_handler(BACNET_CONFIRMED_SERVICE service_choice, void apdu_set_error_handler(
BACNET_CONFIRMED_SERVICE service_choice,
error_function pFunction); error_function pFunction);
void apdu_set_abort_handler(abort_function pFunction); void apdu_set_abort_handler(
abort_function pFunction);
void apdu_set_reject_handler(reject_function pFunction); void apdu_set_reject_handler(
reject_function pFunction);
uint16_t apdu_decode_confirmed_service_request(uint8_t * apdu, /* APDU data */ uint16_t apdu_decode_confirmed_service_request(
uint8_t * apdu, /* APDU data */
uint16_t apdu_len, uint16_t apdu_len,
BACNET_CONFIRMED_SERVICE_DATA * service_data, BACNET_CONFIRMED_SERVICE_DATA * service_data,
uint8_t * service_choice, uint8_t * service_choice,
uint8_t ** service_request, uint16_t * service_request_len); uint8_t ** service_request,
uint16_t * service_request_len);
void apdu_handler(BACNET_ADDRESS * src, /* source address */ void apdu_handler(
BACNET_ADDRESS * src, /* source address */
uint8_t * apdu, /* APDU data */ uint8_t * apdu, /* APDU data */
uint16_t pdu_len); /* for confirmed messages */ uint16_t pdu_len); /* for confirmed messages */
bacnet-stack/include/arcnet.h
+14 -7
View File
@@ -48,26 +48,33 @@
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
bool arcnet_valid(void); bool arcnet_valid(
void arcnet_cleanup(void); void);
bool arcnet_init(char *interface_name); void arcnet_cleanup(
void);
bool arcnet_init(
char *interface_name);
/* function to send a packet out the 802.2 socket */ /* function to send a packet out the 802.2 socket */
/* returns zero on success, non-zero on failure */ /* returns zero on success, non-zero on failure */
int arcnet_send_pdu(BACNET_ADDRESS * dest, /* destination address */ int arcnet_send_pdu(
BACNET_ADDRESS * dest, /* destination address */
BACNET_NPDU_DATA * npdu_data, /* network information */ BACNET_NPDU_DATA * npdu_data, /* network information */
uint8_t * pdu, /* any data to be sent - may be null */ uint8_t * pdu, /* any data to be sent - may be null */
unsigned pdu_len); /* number of bytes of data */ unsigned pdu_len); /* number of bytes of data */
/* receives an framed packet */ /* receives an framed packet */
/* returns the number of octets in the PDU, or zero on failure */ /* returns the number of octets in the PDU, or zero on failure */
uint16_t arcnet_receive(BACNET_ADDRESS * src, /* source address */ uint16_t arcnet_receive(
BACNET_ADDRESS * src, /* source address */
uint8_t * pdu, /* PDU data */ uint8_t * pdu, /* PDU data */
uint16_t max_pdu, /* amount of space available in the PDU */ uint16_t max_pdu, /* amount of space available in the PDU */
unsigned timeout); /* milliseconds to wait for a packet */ unsigned timeout); /* milliseconds to wait for a packet */
void arcnet_get_my_address(BACNET_ADDRESS * my_address); void arcnet_get_my_address(
void arcnet_get_broadcast_address(BACNET_ADDRESS * dest); /* destination address */ BACNET_ADDRESS * my_address);
void arcnet_get_broadcast_address(
BACNET_ADDRESS * dest); /* destination address */
#ifdef __cplusplus #ifdef __cplusplus
} }
bacnet-stack/include/arf.h
+30 -16
View File
@@ -64,36 +64,50 @@ extern "C" {
/* Atomic Read File */ /* Atomic Read File */
/* encode service */ /* encode service */
int arf_encode_apdu(uint8_t * apdu, int arf_encode_apdu(
uint8_t invoke_id, BACNET_ATOMIC_READ_FILE_DATA * data); uint8_t * apdu,
uint8_t invoke_id,
BACNET_ATOMIC_READ_FILE_DATA * data);
/* decode the service request only */ /* decode the service request only */
int arf_decode_service_request(uint8_t * apdu, int arf_decode_service_request(
unsigned apdu_len, BACNET_ATOMIC_READ_FILE_DATA * data); uint8_t * apdu,
int arf_decode_apdu(uint8_t * apdu,
unsigned apdu_len, unsigned apdu_len,
uint8_t * invoke_id, BACNET_ATOMIC_READ_FILE_DATA * data); BACNET_ATOMIC_READ_FILE_DATA * data);
int arf_decode_apdu(
uint8_t * apdu,
unsigned apdu_len,
uint8_t * invoke_id,
BACNET_ATOMIC_READ_FILE_DATA * data);
/* Atomic Read File Ack */ /* Atomic Read File Ack */
/* encode service */ /* encode service */
int arf_ack_encode_apdu(uint8_t * apdu, int arf_ack_encode_apdu(
uint8_t invoke_id, BACNET_ATOMIC_READ_FILE_DATA * data); uint8_t * apdu,
uint8_t invoke_id,
BACNET_ATOMIC_READ_FILE_DATA * data);
/* decode the service request only */ /* decode the service request only */
int arf_ack_decode_service_request(uint8_t * apdu, int arf_ack_decode_service_request(
unsigned apdu_len, BACNET_ATOMIC_READ_FILE_DATA * data); uint8_t * apdu,
int arf_ack_decode_apdu(uint8_t * apdu,
unsigned apdu_len, unsigned apdu_len,
uint8_t * invoke_id, BACNET_ATOMIC_READ_FILE_DATA * data); BACNET_ATOMIC_READ_FILE_DATA * data);
int arf_ack_decode_apdu(
uint8_t * apdu,
unsigned apdu_len,
uint8_t * invoke_id,
BACNET_ATOMIC_READ_FILE_DATA * data);
#ifdef TEST #ifdef TEST
#include "ctest.h" #include "ctest.h"
void test_AtomicReadFile(Test * pTest); void test_AtomicReadFile(
void test_AtomicReadFileAck(Test * pTest); Test * pTest);
void test_AtomicReadFileAck(
Test * pTest);
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
bacnet-stack/include/av.h
+18 -9
View File
@@ -38,23 +38,32 @@ extern "C" {
const int **pRequired, const int **pRequired,
const int **pOptional, const int **pOptional,
const int **pProprietary); const int **pProprietary);
bool Analog_Value_Valid_Instance(uint32_t object_instance); bool Analog_Value_Valid_Instance(
unsigned Analog_Value_Count(void); uint32_t object_instance);
uint32_t Analog_Value_Index_To_Instance(unsigned index); unsigned Analog_Value_Count(
char *Analog_Value_Name(uint32_t object_instance); void);
uint32_t Analog_Value_Index_To_Instance(
unsigned index);
char *Analog_Value_Name(
uint32_t object_instance);
int Analog_Value_Encode_Property_APDU(uint8_t * apdu, int Analog_Value_Encode_Property_APDU(
uint8_t * apdu,
uint32_t object_instance, uint32_t object_instance,
BACNET_PROPERTY_ID property, BACNET_PROPERTY_ID property,
int32_t array_index, int32_t array_index,
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code); BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code);
bool Analog_Value_Write_Property(BACNET_WRITE_PROPERTY_DATA * wp_data, bool Analog_Value_Write_Property(
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code); BACNET_WRITE_PROPERTY_DATA * wp_data,
BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code);
#ifdef TEST #ifdef TEST
#include "ctest.h" #include "ctest.h"
void testAnalog_Value(Test * pTest); void testAnalog_Value(
Test * pTest);
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
bacnet-stack/include/awf.h
+30 -16
View File
@@ -60,35 +60,49 @@ extern "C" {
/* Atomic Write File */ /* Atomic Write File */
/* encode service */ /* encode service */
int awf_encode_apdu(uint8_t * apdu, int awf_encode_apdu(
uint8_t invoke_id, BACNET_ATOMIC_WRITE_FILE_DATA * data); uint8_t * apdu,
uint8_t invoke_id,
BACNET_ATOMIC_WRITE_FILE_DATA * data);
/* decode the service request only */ /* decode the service request only */
int awf_decode_service_request(uint8_t * apdu, int awf_decode_service_request(
unsigned apdu_len, BACNET_ATOMIC_WRITE_FILE_DATA * data); uint8_t * apdu,
int awf_decode_apdu(uint8_t * apdu,
unsigned apdu_len, unsigned apdu_len,
uint8_t * invoke_id, BACNET_ATOMIC_WRITE_FILE_DATA * data); BACNET_ATOMIC_WRITE_FILE_DATA * data);
int awf_decode_apdu(
uint8_t * apdu,
unsigned apdu_len,
uint8_t * invoke_id,
BACNET_ATOMIC_WRITE_FILE_DATA * data);
/* Atomic Write File Ack */ /* Atomic Write File Ack */
/* encode service */ /* encode service */
int awf_ack_encode_apdu(uint8_t * apdu, int awf_ack_encode_apdu(
uint8_t invoke_id, BACNET_ATOMIC_WRITE_FILE_DATA * data); uint8_t * apdu,
uint8_t invoke_id,
BACNET_ATOMIC_WRITE_FILE_DATA * data);
/* decode the service request only */ /* decode the service request only */
int awf_ack_decode_service_request(uint8_t * apdu, int awf_ack_decode_service_request(
unsigned apdu_len, BACNET_ATOMIC_WRITE_FILE_DATA * data); uint8_t * apdu,
int awf_ack_decode_apdu(uint8_t * apdu,
unsigned apdu_len, unsigned apdu_len,
uint8_t * invoke_id, BACNET_ATOMIC_WRITE_FILE_DATA * data); BACNET_ATOMIC_WRITE_FILE_DATA * data);
int awf_ack_decode_apdu(
uint8_t * apdu,
unsigned apdu_len,
uint8_t * invoke_id,
BACNET_ATOMIC_WRITE_FILE_DATA * data);
#ifdef TEST #ifdef TEST
#include "ctest.h" #include "ctest.h"
void test_AtomicWriteFile(Test * pTest); void test_AtomicWriteFile(
void test_AtomicWriteFileAck(Test * pTest); Test * pTest);
void test_AtomicWriteFileAck(
Test * pTest);
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
bacnet-stack/include/bacaddr.h
+6 -2
View File
@@ -43,8 +43,12 @@
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
void bacnet_address_copy(BACNET_ADDRESS * dest, BACNET_ADDRESS * src); void bacnet_address_copy(
bool bacnet_address_same(BACNET_ADDRESS * dest, BACNET_ADDRESS * src); BACNET_ADDRESS * dest,
BACNET_ADDRESS * src);
bool bacnet_address_same(
BACNET_ADDRESS * dest,
BACNET_ADDRESS * src);
#ifdef __cplusplus #ifdef __cplusplus
} }
bacnet-stack/include/bacapp.h
+40 -21
View File
@@ -92,37 +92,50 @@ typedef struct BACnet_Application_Data_Value {
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
int bacapp_encode_data(uint8_t * apdu, int bacapp_encode_data(
uint8_t * apdu,
BACNET_APPLICATION_DATA_VALUE * value); BACNET_APPLICATION_DATA_VALUE * value);
int bacapp_decode_application_data(uint8_t * apdu, int bacapp_decode_application_data(
int max_apdu_len, BACNET_APPLICATION_DATA_VALUE * value); uint8_t * apdu,
int max_apdu_len,
int bacapp_encode_application_data(uint8_t * apdu,
BACNET_APPLICATION_DATA_VALUE * value); BACNET_APPLICATION_DATA_VALUE * value);
int bacapp_decode_context_data(uint8_t * apdu, int bacapp_encode_application_data(
int max_apdu_len, BACNET_APPLICATION_DATA_VALUE * value, uint8_t * apdu,
BACNET_PROPERTY_ID property); BACNET_APPLICATION_DATA_VALUE * value);
int bacapp_encode_context_data(uint8_t * apdu, int bacapp_decode_context_data(
uint8_t * apdu,
int max_apdu_len,
BACNET_APPLICATION_DATA_VALUE * value, BACNET_APPLICATION_DATA_VALUE * value,
BACNET_PROPERTY_ID property); BACNET_PROPERTY_ID property);
int bacapp_encode_context_data_value(uint8_t * apdu, int bacapp_encode_context_data(
uint8_t context_tag_number, BACNET_APPLICATION_DATA_VALUE * value); uint8_t * apdu,
BACNET_APPLICATION_DATA_VALUE * value,
BACNET_PROPERTY_ID property);
BACNET_APPLICATION_TAG bacapp_context_tag_type(BACNET_PROPERTY_ID int bacapp_encode_context_data_value(
property, uint8_t tag_number); uint8_t * apdu,
uint8_t context_tag_number,
BACNET_APPLICATION_DATA_VALUE * value);
bool bacapp_copy(BACNET_APPLICATION_DATA_VALUE * dest_value, BACNET_APPLICATION_TAG bacapp_context_tag_type(
BACNET_PROPERTY_ID property,
uint8_t tag_number);
bool bacapp_copy(
BACNET_APPLICATION_DATA_VALUE * dest_value,
BACNET_APPLICATION_DATA_VALUE * src_value); BACNET_APPLICATION_DATA_VALUE * src_value);
/* returns the length of data between an opening tag and a closing tag. /* returns the length of data between an opening tag and a closing tag.
Expects that the first octet contain the opening tag. Expects that the first octet contain the opening tag.
Include a value property identifier for context specific data Include a value property identifier for context specific data
such as the value received in a WriteProperty request */ such as the value received in a WriteProperty request */
int bacapp_data_len(uint8_t * apdu, int max_apdu_len, int bacapp_data_len(
uint8_t * apdu,
int max_apdu_len,
BACNET_PROPERTY_ID property); BACNET_PROPERTY_ID property);
#if PRINT_ENABLED #if PRINT_ENABLED
@@ -134,9 +147,12 @@ extern "C" {
#endif #endif
#ifdef BACAPP_PRINT_ENABLED #ifdef BACAPP_PRINT_ENABLED
bool bacapp_parse_application_data(BACNET_APPLICATION_TAG tag_number, bool bacapp_parse_application_data(
const char *argv, BACNET_APPLICATION_DATA_VALUE * value); BACNET_APPLICATION_TAG tag_number,
bool bacapp_print_value(FILE * stream, const char *argv,
BACNET_APPLICATION_DATA_VALUE * value);
bool bacapp_print_value(
FILE * stream,
BACNET_APPLICATION_DATA_VALUE * value, BACNET_APPLICATION_DATA_VALUE * value,
BACNET_PROPERTY_ID property); BACNET_PROPERTY_ID property);
#else #else
@@ -147,11 +163,14 @@ extern "C" {
#ifdef TEST #ifdef TEST
#include "ctest.h" #include "ctest.h"
#include "datetime.h" #include "datetime.h"
bool bacapp_same_value(BACNET_APPLICATION_DATA_VALUE * value, bool bacapp_same_value(
BACNET_APPLICATION_DATA_VALUE * value,
BACNET_APPLICATION_DATA_VALUE * test_value); BACNET_APPLICATION_DATA_VALUE * test_value);
void testBACnetApplicationDataLength(Test * pTest); void testBACnetApplicationDataLength(
void testBACnetApplicationData(Test * pTest); Test * pTest);
void testBACnetApplicationData(
Test * pTest);
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
bacnet-stack/include/bacdcode.h
+172 -62
View File
@@ -49,129 +49,225 @@ extern "C" {
/* from clause 20.2.1 General Rules for Encoding BACnet Tags */ /* from clause 20.2.1 General Rules for Encoding BACnet Tags */
/* returns the number of apdu bytes consumed */ /* returns the number of apdu bytes consumed */
int encode_tag(uint8_t * apdu, uint8_t tag_number, int encode_tag(
bool context_specific, uint32_t len_value_type); uint8_t * apdu,
uint8_t tag_number,
bool context_specific,
uint32_t len_value_type);
/* from clause 20.2.1.3.2 Constructed Data */ /* from clause 20.2.1.3.2 Constructed Data */
/* returns the number of apdu bytes consumed */ /* returns the number of apdu bytes consumed */
int encode_opening_tag(uint8_t * apdu, uint8_t tag_number); int encode_opening_tag(
int encode_closing_tag(uint8_t * apdu, uint8_t tag_number); uint8_t * apdu,
int decode_tag_number(uint8_t * apdu, uint8_t * tag_number); uint8_t tag_number);
int decode_tag_number_and_value(uint8_t * apdu, uint8_t * tag_number, int encode_closing_tag(
uint8_t * apdu,
uint8_t tag_number);
int decode_tag_number(
uint8_t * apdu,
uint8_t * tag_number);
int decode_tag_number_and_value(
uint8_t * apdu,
uint8_t * tag_number,
uint32_t * value); uint32_t * value);
/* returns true if the tag is context specific */ /* returns true if the tag is context specific */
bool decode_is_context_specific(uint8_t * apdu); bool decode_is_context_specific(
uint8_t * apdu);
/* returns true if the tag is an opening tag and matches */ /* returns true if the tag is an opening tag and matches */
bool decode_is_opening_tag_number(uint8_t * apdu, uint8_t tag_number); bool decode_is_opening_tag_number(
uint8_t * apdu,
uint8_t tag_number);
/* returns true if the tag is a closing tag and matches */ /* returns true if the tag is a closing tag and matches */
bool decode_is_closing_tag_number(uint8_t * apdu, uint8_t tag_number); bool decode_is_closing_tag_number(
uint8_t * apdu,
uint8_t tag_number);
/* returns true if the tag is context specific and matches */ /* returns true if the tag is context specific and matches */
bool decode_is_context_tag(uint8_t * apdu, uint8_t tag_number); bool decode_is_context_tag(
uint8_t * apdu,
uint8_t tag_number);
/* returns true if the tag is an opening tag */ /* returns true if the tag is an opening tag */
bool decode_is_opening_tag(uint8_t * apdu); bool decode_is_opening_tag(
uint8_t * apdu);
/* returns true if the tag is a closing tag */ /* returns true if the tag is a closing tag */
bool decode_is_closing_tag(uint8_t * apdu); bool decode_is_closing_tag(
uint8_t * apdu);
/* from clause 20.2.2 Encoding of a Null Value */ /* from clause 20.2.2 Encoding of a Null Value */
int encode_application_null(uint8_t * apdu); int encode_application_null(
int encode_context_null(uint8_t * apdu, int tag_number); uint8_t * apdu);
int encode_context_null(
uint8_t * apdu,
int tag_number);
/* from clause 20.2.3 Encoding of a Boolean Value */ /* from clause 20.2.3 Encoding of a Boolean Value */
int encode_application_boolean(uint8_t * apdu, bool boolean_value); int encode_application_boolean(
bool decode_boolean(uint32_t len_value); uint8_t * apdu,
int encode_context_boolean(uint8_t * apdu, int tag_number,
bool boolean_value); bool boolean_value);
bool decode_context_boolean(uint8_t * apdu); bool decode_boolean(
uint32_t len_value);
int encode_context_boolean(
uint8_t * apdu,
int tag_number,
bool boolean_value);
bool decode_context_boolean(
uint8_t * apdu);
/* from clause 20.2.10 Encoding of a Bit String Value */ /* from clause 20.2.10 Encoding of a Bit String Value */
/* returns the number of apdu bytes consumed */ /* returns the number of apdu bytes consumed */
int decode_bitstring(uint8_t * apdu, uint32_t len_value, int decode_bitstring(
uint8_t * apdu,
uint32_t len_value,
BACNET_BIT_STRING * bit_string); BACNET_BIT_STRING * bit_string);
/* returns the number of apdu bytes consumed */ /* returns the number of apdu bytes consumed */
int encode_bitstring(uint8_t * apdu, BACNET_BIT_STRING * bit_string); int encode_bitstring(
int encode_application_bitstring(uint8_t * apdu, uint8_t * apdu,
BACNET_BIT_STRING * bit_string); BACNET_BIT_STRING * bit_string);
int encode_context_bitstring(uint8_t * apdu, int tag_number, int encode_application_bitstring(
uint8_t * apdu,
BACNET_BIT_STRING * bit_string);
int encode_context_bitstring(
uint8_t * apdu,
int tag_number,
BACNET_BIT_STRING * bit_string); BACNET_BIT_STRING * bit_string);
/* from clause 20.2.6 Encoding of a Real Number Value */ /* from clause 20.2.6 Encoding of a Real Number Value */
/* and 20.2.1 General Rules for Encoding BACnet Tags */ /* and 20.2.1 General Rules for Encoding BACnet Tags */
/* returns the number of apdu bytes consumed */ /* returns the number of apdu bytes consumed */
int encode_application_real(uint8_t * apdu, float value); int encode_application_real(
int encode_context_real(uint8_t * apdu, int tag_number, float value); uint8_t * apdu,
float value);
int encode_context_real(
uint8_t * apdu,
int tag_number,
float value);
/* from clause 20.2.14 Encoding of an Object Identifier Value */ /* from clause 20.2.14 Encoding of an Object Identifier Value */
/* and 20.2.1 General Rules for Encoding BACnet Tags */ /* and 20.2.1 General Rules for Encoding BACnet Tags */
/* returns the number of apdu bytes consumed */ /* returns the number of apdu bytes consumed */
int decode_object_id(uint8_t * apdu, int *object_type, int decode_object_id(
uint8_t * apdu,
int *object_type,
uint32_t * instance); uint32_t * instance);
int encode_bacnet_object_id(uint8_t * apdu, int object_type, int encode_bacnet_object_id(
uint8_t * apdu,
int object_type,
uint32_t instance); uint32_t instance);
int encode_context_object_id(uint8_t * apdu, int tag_number, int encode_context_object_id(
int object_type, uint32_t instance); uint8_t * apdu,
int encode_application_object_id(uint8_t * apdu, int object_type, int tag_number,
int object_type,
uint32_t instance);
int encode_application_object_id(
uint8_t * apdu,
int object_type,
uint32_t instance); uint32_t instance);
/* from clause 20.2.8 Encoding of an Octet String Value */ /* from clause 20.2.8 Encoding of an Octet String Value */
/* and 20.2.1 General Rules for Encoding BACnet Tags */ /* and 20.2.1 General Rules for Encoding BACnet Tags */
/* returns the number of apdu bytes consumed */ /* returns the number of apdu bytes consumed */
int encode_octet_string(uint8_t * apdu, int encode_octet_string(
uint8_t * apdu,
BACNET_OCTET_STRING * octet_string); BACNET_OCTET_STRING * octet_string);
int encode_application_octet_string(uint8_t * apdu, int encode_application_octet_string(
uint8_t * apdu,
BACNET_OCTET_STRING * octet_string); BACNET_OCTET_STRING * octet_string);
int encode_context_octet_string(uint8_t * apdu, int encode_context_octet_string(
int tag_number, BACNET_OCTET_STRING * octet_string); uint8_t * apdu,
int decode_octet_string(uint8_t * apdu, uint32_t len_value, int tag_number,
BACNET_OCTET_STRING * octet_string);
int decode_octet_string(
uint8_t * apdu,
uint32_t len_value,
BACNET_OCTET_STRING * octet_string); BACNET_OCTET_STRING * octet_string);
/* from clause 20.2.9 Encoding of a Character String Value */ /* from clause 20.2.9 Encoding of a Character String Value */
/* and 20.2.1 General Rules for Encoding BACnet Tags */ /* and 20.2.1 General Rules for Encoding BACnet Tags */
/* returns the number of apdu bytes consumed */ /* returns the number of apdu bytes consumed */
int encode_bacnet_character_string(uint8_t * apdu, int encode_bacnet_character_string(
uint8_t * apdu,
BACNET_CHARACTER_STRING * char_string); BACNET_CHARACTER_STRING * char_string);
int encode_application_character_string(uint8_t * apdu, int encode_application_character_string(
uint8_t * apdu,
BACNET_CHARACTER_STRING * char_string); BACNET_CHARACTER_STRING * char_string);
int encode_context_character_string(uint8_t * apdu, int tag_number, int encode_context_character_string(
uint8_t * apdu,
int tag_number,
BACNET_CHARACTER_STRING * char_string); BACNET_CHARACTER_STRING * char_string);
int decode_character_string(uint8_t * apdu, uint32_t len_value, int decode_character_string(
uint8_t * apdu,
uint32_t len_value,
BACNET_CHARACTER_STRING * char_string); BACNET_CHARACTER_STRING * char_string);
/* from clause 20.2.4 Encoding of an Unsigned Integer Value */ /* from clause 20.2.4 Encoding of an Unsigned Integer Value */
/* and 20.2.1 General Rules for Encoding BACnet Tags */ /* and 20.2.1 General Rules for Encoding BACnet Tags */
/* returns the number of apdu bytes consumed */ /* returns the number of apdu bytes consumed */
int encode_bacnet_unsigned(uint8_t * apdu, uint32_t value); int encode_bacnet_unsigned(
int encode_context_unsigned(uint8_t * apdu, int tag_number, uint8_t * apdu,
uint32_t value); uint32_t value);
int encode_application_unsigned(uint8_t * apdu, uint32_t value); int encode_context_unsigned(
int decode_unsigned(uint8_t * apdu, uint32_t len_value, uint8_t * apdu,
int tag_number,
uint32_t value);
int encode_application_unsigned(
uint8_t * apdu,
uint32_t value);
int decode_unsigned(
uint8_t * apdu,
uint32_t len_value,
uint32_t * value); uint32_t * value);
/* from clause 20.2.5 Encoding of a Signed Integer Value */ /* from clause 20.2.5 Encoding of a Signed Integer Value */
/* and 20.2.1 General Rules for Encoding BACnet Tags */ /* and 20.2.1 General Rules for Encoding BACnet Tags */
/* returns the number of apdu bytes consumed */ /* returns the number of apdu bytes consumed */
int encode_bacnet_signed(uint8_t * apdu, int32_t value); int encode_bacnet_signed(
int encode_application_signed(uint8_t * apdu, int32_t value); uint8_t * apdu,
int encode_context_signed(uint8_t * apdu, int tag_number,
int32_t value); int32_t value);
int decode_signed(uint8_t * apdu, uint32_t len_value, int32_t * value); int encode_application_signed(
uint8_t * apdu,
int32_t value);
int encode_context_signed(
uint8_t * apdu,
int tag_number,
int32_t value);
int decode_signed(
uint8_t * apdu,
uint32_t len_value,
int32_t * value);
/* from clause 20.2.11 Encoding of an Enumerated Value */ /* from clause 20.2.11 Encoding of an Enumerated Value */
/* and 20.2.1 General Rules for Encoding BACnet Tags */ /* and 20.2.1 General Rules for Encoding BACnet Tags */
/* returns the number of apdu bytes consumed */ /* returns the number of apdu bytes consumed */
int decode_enumerated(uint8_t * apdu, uint32_t len_value, int *value); int decode_enumerated(
int encode_bacnet_enumerated(uint8_t * apdu, int value); uint8_t * apdu,
int encode_application_enumerated(uint8_t * apdu, int value); uint32_t len_value,
int encode_context_enumerated(uint8_t * apdu, int tag_number, int *value);
int encode_bacnet_enumerated(
uint8_t * apdu,
int value);
int encode_application_enumerated(
uint8_t * apdu,
int value);
int encode_context_enumerated(
uint8_t * apdu,
int tag_number,
int value); int value);
/* from clause 20.2.13 Encoding of a Time Value */ /* from clause 20.2.13 Encoding of a Time Value */
/* and 20.2.1 General Rules for Encoding BACnet Tags */ /* and 20.2.1 General Rules for Encoding BACnet Tags */
/* returns the number of apdu bytes consumed */ /* returns the number of apdu bytes consumed */
int encode_bacnet_time(uint8_t * apdu, BACNET_TIME * btime); int encode_bacnet_time(
int encode_application_time(uint8_t * apdu, BACNET_TIME * btime); uint8_t * apdu,
int decode_bacnet_time(uint8_t * apdu, BACNET_TIME * btime); BACNET_TIME * btime);
int encode_context_time(uint8_t * apdu, int tag_number, int encode_application_time(
uint8_t * apdu,
BACNET_TIME * btime);
int decode_bacnet_time(
uint8_t * apdu,
BACNET_TIME * btime);
int encode_context_time(
uint8_t * apdu,
int tag_number,
BACNET_TIME * btime); BACNET_TIME * btime);
/* BACnet Date */ /* BACnet Date */
@@ -183,21 +279,35 @@ extern "C" {
/* from clause 20.2.12 Encoding of a Date Value */ /* from clause 20.2.12 Encoding of a Date Value */
/* and 20.2.1 General Rules for Encoding BACnet Tags */ /* and 20.2.1 General Rules for Encoding BACnet Tags */
/* returns the number of apdu bytes consumed */ /* returns the number of apdu bytes consumed */
int encode_bacnet_date(uint8_t * apdu, BACNET_DATE * bdate); int encode_bacnet_date(
int encode_application_date(uint8_t * apdu, BACNET_DATE * bdate); uint8_t * apdu,
int encode_context_date(uint8_t * apdu, int tag_number, BACNET_DATE * bdate);
int encode_application_date(
uint8_t * apdu,
BACNET_DATE * bdate);
int encode_context_date(
uint8_t * apdu,
int tag_number,
BACNET_DATE * bdate);
int decode_date(
uint8_t * apdu,
BACNET_DATE * bdate); BACNET_DATE * bdate);
int decode_date(uint8_t * apdu, BACNET_DATE * bdate);
/* from clause 20.1.2.4 max-segments-accepted */ /* from clause 20.1.2.4 max-segments-accepted */
/* and clause 20.1.2.5 max-APDU-length-accepted */ /* and clause 20.1.2.5 max-APDU-length-accepted */
/* returns the encoded octet */ /* returns the encoded octet */
uint8_t encode_max_segs_max_apdu(int max_segs, int max_apdu); uint8_t encode_max_segs_max_apdu(
int decode_max_segs(uint8_t octet); int max_segs,
int decode_max_apdu(uint8_t octet); int max_apdu);
int decode_max_segs(
uint8_t octet);
int decode_max_apdu(
uint8_t octet);
/* returns the number of apdu bytes consumed */ /* returns the number of apdu bytes consumed */
int encode_simple_ack(uint8_t * apdu, uint8_t invoke_id, int encode_simple_ack(
uint8_t * apdu,
uint8_t invoke_id,
uint8_t service_choice); uint8_t service_choice);
#ifdef __cplusplus #ifdef __cplusplus
bacnet-stack/include/bacerror.h
+18 -9
View File
@@ -42,30 +42,39 @@
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
int bacerror_encode_apdu(uint8_t * apdu, int bacerror_encode_apdu(
uint8_t * apdu,
uint8_t invoke_id, uint8_t invoke_id,
BACNET_CONFIRMED_SERVICE service, BACNET_CONFIRMED_SERVICE service,
BACNET_ERROR_CLASS error_class, BACNET_ERROR_CODE error_code); BACNET_ERROR_CLASS error_class,
BACNET_ERROR_CODE error_code);
int bacerror_decode_service_request(uint8_t * apdu, int bacerror_decode_service_request(
uint8_t * apdu,
unsigned apdu_len, unsigned apdu_len,
uint8_t * invoke_id, uint8_t * invoke_id,
BACNET_CONFIRMED_SERVICE * service, BACNET_CONFIRMED_SERVICE * service,
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code); BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code);
int bacerror_decode_error_class_and_code(uint8_t * apdu, int bacerror_decode_error_class_and_code(
uint8_t * apdu,
unsigned apdu_len, unsigned apdu_len,
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code); BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code);
#ifdef TEST #ifdef TEST
#include "ctest.h" #include "ctest.h"
int bacerror_decode_apdu(uint8_t * apdu, int bacerror_decode_apdu(
uint8_t * apdu,
unsigned apdu_len, unsigned apdu_len,
uint8_t * invoke_id, uint8_t * invoke_id,
BACNET_CONFIRMED_SERVICE * service, BACNET_CONFIRMED_SERVICE * service,
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code); BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code);
void testBACError(Test * pTest); void testBACError(
Test * pTest);
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
bacnet-stack/include/bacfile.h
+24 -12
View File
@@ -50,32 +50,44 @@ extern "C" {
const int **pRequired, const int **pRequired,
const int **pOptional, const int **pOptional,
const int **pProprietary); const int **pProprietary);
char *bacfile_name(uint32_t instance); char *bacfile_name(
bool bacfile_valid_instance(uint32_t object_instance); uint32_t instance);
uint32_t bacfile_count(void); bool bacfile_valid_instance(
uint32_t bacfile_index_to_instance(unsigned find_index); uint32_t object_instance);
uint32_t bacfile_instance(char *filename); uint32_t bacfile_count(
void);
uint32_t bacfile_index_to_instance(
unsigned find_index);
uint32_t bacfile_instance(
char *filename);
/* this is one way to match up the invoke ID with */ /* this is one way to match up the invoke ID with */
/* the file ID from the AtomicReadFile request. */ /* the file ID from the AtomicReadFile request. */
/* Another way would be to store the */ /* Another way would be to store the */
/* invokeID and file instance in a list or table */ /* invokeID and file instance in a list or table */
/* when the request was sent */ /* when the request was sent */
uint32_t bacfile_instance_from_tsm(uint8_t invokeID); uint32_t bacfile_instance_from_tsm(
uint8_t invokeID);
/* handler ACK helper */ /* handler ACK helper */
bool bacfile_read_data(BACNET_ATOMIC_READ_FILE_DATA * data); bool bacfile_read_data(
bool bacfile_write_stream_data(BACNET_ATOMIC_WRITE_FILE_DATA * data); BACNET_ATOMIC_READ_FILE_DATA * data);
bool bacfile_write_stream_data(
BACNET_ATOMIC_WRITE_FILE_DATA * data);
/* handling for read property service */ /* handling for read property service */
int bacfile_encode_property_apdu(uint8_t * apdu, int bacfile_encode_property_apdu(
uint8_t * apdu,
uint32_t object_instance, uint32_t object_instance,
BACNET_PROPERTY_ID property, BACNET_PROPERTY_ID property,
int32_t array_index, int32_t array_index,
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code); BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code);
/* handling for write property service */ /* handling for write property service */
bool bacfile_write_property(BACNET_WRITE_PROPERTY_DATA * wp_data, bool bacfile_write_property(
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code); BACNET_WRITE_PROPERTY_DATA * wp_data,
BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code);
#ifdef __cplusplus #ifdef __cplusplus
} }
bacnet-stack/include/bacint.h
+42 -16
View File
@@ -43,26 +43,52 @@ extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
/* unsigned value encoding and decoding */ /* unsigned value encoding and decoding */
int encode_unsigned16(uint8_t * apdu, uint16_t value); int encode_unsigned16(
int decode_unsigned16(uint8_t * apdu, uint16_t * value); uint8_t * apdu,
int encode_unsigned24(uint8_t * apdu, uint32_t value); uint16_t value);
int decode_unsigned24(uint8_t * apdu, uint32_t * value); int decode_unsigned16(
int encode_unsigned32(uint8_t * apdu, uint32_t value); uint8_t * apdu,
int decode_unsigned32(uint8_t * apdu, uint32_t * value); uint16_t * value);
int encode_unsigned24(
uint8_t * apdu,
uint32_t value);
int decode_unsigned24(
uint8_t * apdu,
uint32_t * value);
int encode_unsigned32(
uint8_t * apdu,
uint32_t value);
int decode_unsigned32(
uint8_t * apdu,
uint32_t * value);
/* signed value encoding and decoding */ /* signed value encoding and decoding */
int encode_signed8(uint8_t * apdu, int8_t value); int encode_signed8(
int decode_signed8(uint8_t * apdu, int32_t * value); uint8_t * apdu,
int encode_signed16(uint8_t * apdu, int16_t value); int8_t value);
int decode_signed16(uint8_t * apdu, int32_t * value); int decode_signed8(
int encode_signed24(uint8_t * apdu, int32_t value); uint8_t * apdu,
int decode_signed24(uint8_t * apdu, int32_t * value); int32_t * value);
int encode_signed32(uint8_t * apdu, int32_t value); int encode_signed16(
int decode_signed32(uint8_t * apdu, int32_t * value); uint8_t * apdu,
int16_t value);
int decode_signed16(
uint8_t * apdu,
int32_t * value);
int encode_signed24(
uint8_t * apdu,
int32_t value);
int decode_signed24(
uint8_t * apdu,
int32_t * value);
int encode_signed32(
uint8_t * apdu,
int32_t value);
int decode_signed32(
uint8_t * apdu,
int32_t * value);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif #endif
bacnet-stack/include/bacprop.h
+7 -3
View File
@@ -47,10 +47,14 @@ typedef struct {
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
signed bacprop_tag_by_index_default(PROP_TAG_DATA * data_list, signed bacprop_tag_by_index_default(
signed index, signed default_ret); PROP_TAG_DATA * data_list,
signed index,
signed default_ret);
signed bacprop_property_tag(BACNET_OBJECT_TYPE type, signed prop); signed bacprop_property_tag(
BACNET_OBJECT_TYPE type,
signed prop);
#ifdef __cplusplus #ifdef __cplusplus
} }
bacnet-stack/include/bacreal.h
+8 -5
View File
@@ -42,18 +42,21 @@
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
int decode_real(uint8_t * apdu, float *real_value); int decode_real(
int encode_bacnet_real(float value, uint8_t * apdu); uint8_t * apdu,
float *real_value);
int encode_bacnet_real(
float value,
uint8_t * apdu);
#ifdef TEST #ifdef TEST
#include "ctest.h" #include "ctest.h"
void testBACreal(Test * pTest); void testBACreal(
Test * pTest);
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif #endif
bacnet-stack/include/bacstr.h
+71 -35
View File
@@ -67,21 +67,34 @@ typedef struct BACnet_Octet_String {
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
void bitstring_init(BACNET_BIT_STRING * bit_string); void bitstring_init(
void bitstring_set_bit(BACNET_BIT_STRING * bit_string, uint8_t bit_number, BACNET_BIT_STRING * bit_string);
void bitstring_set_bit(
BACNET_BIT_STRING * bit_string,
uint8_t bit_number,
bool value); bool value);
bool bitstring_bit(BACNET_BIT_STRING * bit_string, uint8_t bit_number); bool bitstring_bit(
uint8_t bitstring_bits_used(BACNET_BIT_STRING * bit_string); BACNET_BIT_STRING * bit_string,
uint8_t bit_number);
uint8_t bitstring_bits_used(
BACNET_BIT_STRING * bit_string);
/* returns the number of bytes that a bit string is using */ /* returns the number of bytes that a bit string is using */
int bitstring_bytes_used(BACNET_BIT_STRING * bit_string); int bitstring_bytes_used(
uint8_t bitstring_bits_capacity(BACNET_BIT_STRING * bit_string); BACNET_BIT_STRING * bit_string);
uint8_t bitstring_bits_capacity(
BACNET_BIT_STRING * bit_string);
/* used for encoding and decoding from the APDU */ /* used for encoding and decoding from the APDU */
uint8_t bitstring_octet(BACNET_BIT_STRING * bit_string, uint8_t bitstring_octet(
BACNET_BIT_STRING * bit_string,
uint8_t octet_index); uint8_t octet_index);
bool bitstring_set_octet(BACNET_BIT_STRING * bit_string, uint8_t index, bool bitstring_set_octet(
BACNET_BIT_STRING * bit_string,
uint8_t index,
uint8_t octet); uint8_t octet);
bool bitstring_set_bits_used(BACNET_BIT_STRING * bit_string, bool bitstring_set_bits_used(
uint8_t bytes_used, uint8_t unused_bits); BACNET_BIT_STRING * bit_string,
uint8_t bytes_used,
uint8_t unused_bits);
bool bitstring_copy( bool bitstring_copy(
BACNET_BIT_STRING * dest, BACNET_BIT_STRING * dest,
BACNET_BIT_STRING * src); BACNET_BIT_STRING * src);
@@ -89,55 +102,78 @@ extern "C" {
/* returns false if the string exceeds capacity /* returns false if the string exceeds capacity
initialize by using length=0 */ initialize by using length=0 */
bool characterstring_init(BACNET_CHARACTER_STRING * char_string, bool characterstring_init(
uint8_t encoding, char *value, size_t length); BACNET_CHARACTER_STRING * char_string,
uint8_t encoding,
char *value,
size_t length);
/* used for ANSI C-Strings */ /* used for ANSI C-Strings */
bool characterstring_init_ansi(BACNET_CHARACTER_STRING * char_string, bool characterstring_init_ansi(
BACNET_CHARACTER_STRING * char_string,
char *value); char *value);
bool characterstring_copy(BACNET_CHARACTER_STRING * dest, bool characterstring_copy(
BACNET_CHARACTER_STRING * dest,
BACNET_CHARACTER_STRING * src); BACNET_CHARACTER_STRING * src);
/* returns true if the strings are the same length, encoding, value */ /* returns true if the strings are the same length, encoding, value */
bool characterstring_same(BACNET_CHARACTER_STRING * dest, bool characterstring_same(
BACNET_CHARACTER_STRING * dest,
BACNET_CHARACTER_STRING * src); BACNET_CHARACTER_STRING * src);
bool characterstring_ansi_same(BACNET_CHARACTER_STRING * dest, bool characterstring_ansi_same(
BACNET_CHARACTER_STRING * dest,
const char *src); const char *src);
/* returns false if the string exceeds capacity */ /* returns false if the string exceeds capacity */
bool characterstring_append(BACNET_CHARACTER_STRING * char_string, bool characterstring_append(
char *value, size_t length); BACNET_CHARACTER_STRING * char_string,
char *value,
size_t length);
/* This function sets a new length without changing the value. /* This function sets a new length without changing the value.
If length exceeds capacity, no modification happens and If length exceeds capacity, no modification happens and
function returns false. */ function returns false. */
bool characterstring_truncate(BACNET_CHARACTER_STRING * char_string, bool characterstring_truncate(
BACNET_CHARACTER_STRING * char_string,
size_t length); size_t length);
bool characterstring_set_encoding(BACNET_CHARACTER_STRING * bool characterstring_set_encoding(
char_string, uint8_t encoding); BACNET_CHARACTER_STRING * char_string,
uint8_t encoding);
/* Returns the value */ /* Returns the value */
char *characterstring_value(BACNET_CHARACTER_STRING * char_string); char *characterstring_value(
BACNET_CHARACTER_STRING * char_string);
/* returns the length */ /* returns the length */
size_t characterstring_length(BACNET_CHARACTER_STRING * char_string); size_t characterstring_length(
uint8_t characterstring_encoding(BACNET_CHARACTER_STRING * BACNET_CHARACTER_STRING * char_string);
char_string); uint8_t characterstring_encoding(
size_t characterstring_capacity(BACNET_CHARACTER_STRING * char_string); BACNET_CHARACTER_STRING * char_string);
size_t characterstring_capacity(
BACNET_CHARACTER_STRING * char_string);
/* returns false if the string exceeds capacity /* returns false if the string exceeds capacity
initialize by using length=0 */ initialize by using length=0 */
bool octetstring_init(BACNET_OCTET_STRING * octet_string, bool octetstring_init(
uint8_t * value, size_t length); BACNET_OCTET_STRING * octet_string,
bool octetstring_copy(BACNET_OCTET_STRING * dest, uint8_t * value,
size_t length);
bool octetstring_copy(
BACNET_OCTET_STRING * dest,
BACNET_OCTET_STRING * src); BACNET_OCTET_STRING * src);
/* returns false if the string exceeds capacity */ /* returns false if the string exceeds capacity */
bool octetstring_append(BACNET_OCTET_STRING * octet_string, bool octetstring_append(
uint8_t * value, size_t length); BACNET_OCTET_STRING * octet_string,
uint8_t * value,
size_t length);
/* This function sets a new length without changing the value. /* This function sets a new length without changing the value.
If length exceeds capacity, no modification happens and If length exceeds capacity, no modification happens and
function returns false. */ function returns false. */
bool octetstring_truncate(BACNET_OCTET_STRING * octet_string, bool octetstring_truncate(
BACNET_OCTET_STRING * octet_string,
size_t length); size_t length);
/* Returns the value */ /* Returns the value */
uint8_t *octetstring_value(BACNET_OCTET_STRING * octet_string); uint8_t *octetstring_value(
BACNET_OCTET_STRING * octet_string);
/* Returns the length.*/ /* Returns the length.*/
size_t octetstring_length(BACNET_OCTET_STRING * octet_string); size_t octetstring_length(
size_t octetstring_capacity(BACNET_OCTET_STRING * octet_string); BACNET_OCTET_STRING * octet_string);
size_t octetstring_capacity(
BACNET_OCTET_STRING * octet_string);
#ifdef __cplusplus #ifdef __cplusplus
} }
bacnet-stack/include/bactext.h
+38 -19
View File
@@ -53,25 +53,44 @@
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
const char *bactext_confirmed_service_name(int index); const char *bactext_confirmed_service_name(
const char *bactext_unconfirmed_service_name(int index); int index);
const char *bactext_application_tag_name(int index); const char *bactext_unconfirmed_service_name(
const char *bactext_object_type_name(int index); int index);
const char *bactext_property_name(int index); const char *bactext_application_tag_name(
const char *bactext_engineering_unit_name(int index); int index);
const char *bactext_reject_reason_name(int index); const char *bactext_object_type_name(
const char *bactext_abort_reason_name(int index); int index);
const char *bactext_error_class_name(int index); const char *bactext_property_name(
const char *bactext_error_code_name(int index); int index);
unsigned bactext_property_id(const char *name); const char *bactext_engineering_unit_name(
const char *bactext_month_name(int index); int index);
const char *bactext_week_of_month_name(int index); const char *bactext_reject_reason_name(
const char *bactext_day_of_week_name(int index); int index);
const char *bactext_event_state_name(int index); const char *bactext_abort_reason_name(
const char *bactext_binary_present_value_name(int index); int index);
const char *bactext_reliability_name(int index); const char *bactext_error_class_name(
const char *bactext_device_status_name(int index); int index);
const char *bactext_segmentation_name(int index); const char *bactext_error_code_name(
int index);
unsigned bactext_property_id(
const char *name);
const char *bactext_month_name(
int index);
const char *bactext_week_of_month_name(
int index);
const char *bactext_day_of_week_name(
int index);
const char *bactext_event_state_name(
int index);
const char *bactext_binary_present_value_name(
int index);
const char *bactext_reliability_name(
int index);
const char *bactext_device_status_name(
int index);
const char *bactext_segmentation_name(
int index);
#ifdef __cplusplus #ifdef __cplusplus
bacnet-stack/include/bi.h
+14 -7
View File
@@ -37,20 +37,27 @@ extern "C" {
const int **pRequired, const int **pRequired,
const int **pOptional, const int **pOptional,
const int **pProprietary); const int **pProprietary);
bool Binary_Input_Valid_Instance(uint32_t object_instance); bool Binary_Input_Valid_Instance(
unsigned Binary_Input_Count(void); uint32_t object_instance);
uint32_t Binary_Input_Index_To_Instance(unsigned index); unsigned Binary_Input_Count(
char *Binary_Input_Name(uint32_t object_instance); void);
uint32_t Binary_Input_Index_To_Instance(
unsigned index);
char *Binary_Input_Name(
uint32_t object_instance);
int Binary_Input_Encode_Property_APDU(uint8_t * apdu, int Binary_Input_Encode_Property_APDU(
uint8_t * apdu,
uint32_t object_instance, uint32_t object_instance,
BACNET_PROPERTY_ID property, BACNET_PROPERTY_ID property,
int32_t array_index, int32_t array_index,
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code); BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code);
#ifdef TEST #ifdef TEST
#include "ctest.h" #include "ctest.h"
void testBinaryInput(Test * pTest); void testBinaryInput(
Test * pTest);
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
bacnet-stack/include/bigend.h
+2 -1
View File
@@ -21,7 +21,8 @@ extern "C" {
/* x[2] = 0x03 */ /* x[2] = 0x03 */
/* x[3] = 0x04 */ /* x[3] = 0x04 */
int big_endian(void); int big_endian(
void);
#ifdef __cplusplus #ifdef __cplusplus
} }
bacnet-stack/include/bip.h
+30 -15
View File
@@ -56,44 +56,59 @@ extern "C" {
/* note: define init and cleanup in your ports section */ /* note: define init and cleanup in your ports section */
/* on Linux, ifname is eth0, ath0, arc0, and others. /* on Linux, ifname is eth0, ath0, arc0, and others.
on Windows, ifname is the dotted ip address of the interface */ on Windows, ifname is the dotted ip address of the interface */
bool bip_init(char *ifname); bool bip_init(
char *ifname);
/* normal functions... */ /* normal functions... */
void bip_cleanup(void); void bip_cleanup(
void bip_set_socket(int sock_fd); void);
int bip_socket(void); void bip_set_socket(
bool bip_valid(void); int sock_fd);
void bip_get_broadcast_address(BACNET_ADDRESS * dest); /* destination address */ int bip_socket(
void bip_get_my_address(BACNET_ADDRESS * my_address); void);
bool bip_valid(
void);
void bip_get_broadcast_address(
BACNET_ADDRESS * dest); /* destination address */
void bip_get_my_address(
BACNET_ADDRESS * my_address);
/* function to send a packet out the BACnet/IP socket */ /* function to send a packet out the BACnet/IP socket */
/* returns zero on success, non-zero on failure */ /* returns zero on success, non-zero on failure */
int bip_send_pdu(BACNET_ADDRESS * dest, /* destination address */ int bip_send_pdu(
BACNET_ADDRESS * dest, /* destination address */
BACNET_NPDU_DATA * npdu_data, /* network information */ BACNET_NPDU_DATA * npdu_data, /* network information */
uint8_t * pdu, /* any data to be sent - may be null */ uint8_t * pdu, /* any data to be sent - may be null */
unsigned pdu_len); /* number of bytes of data */ unsigned pdu_len); /* number of bytes of data */
/* receives a BACnet/IP packet */ /* receives a BACnet/IP packet */
/* returns the number of octets in the PDU, or zero on failure */ /* returns the number of octets in the PDU, or zero on failure */
uint16_t bip_receive(BACNET_ADDRESS * src, /* source address */ uint16_t bip_receive(
BACNET_ADDRESS * src, /* source address */
uint8_t * pdu, /* PDU data */ uint8_t * pdu, /* PDU data */
uint16_t max_pdu, /* amount of space available in the PDU */ uint16_t max_pdu, /* amount of space available in the PDU */
unsigned timeout); /* milliseconds to wait for a packet */ unsigned timeout); /* milliseconds to wait for a packet */
/* use host byte order for setting */ /* use host byte order for setting */
void bip_set_port(uint16_t port); void bip_set_port(
uint16_t port);
/* returns host byte order */ /* returns host byte order */
uint16_t bip_get_port(void); uint16_t bip_get_port(
void);
/* use network byte order for setting */ /* use network byte order for setting */
void bip_set_addr(uint32_t net_address); void bip_set_addr(
uint32_t net_address);
/* returns host byte order */ /* returns host byte order */
uint32_t bip_get_addr(void); uint32_t bip_get_addr(
void);
/* use network byte order for setting */ /* use network byte order for setting */
void bip_set_broadcast_addr(uint32_t net_address); void bip_set_broadcast_addr(
uint32_t net_address);
/* returns host byte order */ /* returns host byte order */
uint32_t bip_get_broadcast_addr(void); uint32_t bip_get_broadcast_addr(
void);
#ifdef __cplusplus #ifdef __cplusplus
} }
bacnet-stack/include/bo.h
+18 -9
View File
@@ -39,23 +39,32 @@ extern "C" {
const int **pRequired, const int **pRequired,
const int **pOptional, const int **pOptional,
const int **pProprietary); const int **pProprietary);
bool Binary_Output_Valid_Instance(uint32_t object_instance); bool Binary_Output_Valid_Instance(
unsigned Binary_Output_Count(void); uint32_t object_instance);
uint32_t Binary_Output_Index_To_Instance(unsigned index); unsigned Binary_Output_Count(
char *Binary_Output_Name(uint32_t object_instance); void);
uint32_t Binary_Output_Index_To_Instance(
unsigned index);
char *Binary_Output_Name(
uint32_t object_instance);
int Binary_Output_Encode_Property_APDU(uint8_t * apdu, int Binary_Output_Encode_Property_APDU(
uint8_t * apdu,
uint32_t object_instance, uint32_t object_instance,
BACNET_PROPERTY_ID property, BACNET_PROPERTY_ID property,
int32_t array_index, int32_t array_index,
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code); BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code);
bool Binary_Output_Write_Property(BACNET_WRITE_PROPERTY_DATA * wp_data, bool Binary_Output_Write_Property(
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code); BACNET_WRITE_PROPERTY_DATA * wp_data,
BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code);
#ifdef TEST #ifdef TEST
#include "ctest.h" #include "ctest.h"
void testBinaryOutput(Test * pTest); void testBinaryOutput(
Test * pTest);
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
bacnet-stack/include/bv.h
+18 -9
View File
@@ -39,23 +39,32 @@ extern "C" {
const int **pRequired, const int **pRequired,
const int **pOptional, const int **pOptional,
const int **pProprietary); const int **pProprietary);
bool Binary_Value_Valid_Instance(uint32_t object_instance); bool Binary_Value_Valid_Instance(
unsigned Binary_Value_Count(void); uint32_t object_instance);
uint32_t Binary_Value_Index_To_Instance(unsigned index); unsigned Binary_Value_Count(
char *Binary_Value_Name(uint32_t object_instance); void);
uint32_t Binary_Value_Index_To_Instance(
unsigned index);
char *Binary_Value_Name(
uint32_t object_instance);
int Binary_Value_Encode_Property_APDU(uint8_t * apdu, int Binary_Value_Encode_Property_APDU(
uint8_t * apdu,
uint32_t object_instance, uint32_t object_instance,
BACNET_PROPERTY_ID property, BACNET_PROPERTY_ID property,
int32_t array_index, int32_t array_index,
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code); BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code);
bool Binary_Value_Write_Property(BACNET_WRITE_PROPERTY_DATA * wp_data, bool Binary_Value_Write_Property(
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code); BACNET_WRITE_PROPERTY_DATA * wp_data,
BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code);
#ifdef TEST #ifdef TEST
#include "ctest.h" #include "ctest.h"
void testBinary_Value(Test * pTest); void testBinary_Value(
Test * pTest);
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
bacnet-stack/include/bvlc.h
+2 -2
View File
@@ -51,7 +51,8 @@ extern "C" {
uint16_t max_npdu, /* amount of space available in the NPDU */ uint16_t max_npdu, /* amount of space available in the NPDU */
unsigned timeout); /* number of milliseconds to wait for a packet */ unsigned timeout); /* number of milliseconds to wait for a packet */
int bvlc_send_pdu(BACNET_ADDRESS * dest, /* destination address */ int bvlc_send_pdu(
BACNET_ADDRESS * dest, /* destination address */
BACNET_NPDU_DATA * npdu_data, /* network information */ BACNET_NPDU_DATA * npdu_data, /* network information */
uint8_t * pdu, /* any data to be sent - may be null */ uint8_t * pdu, /* any data to be sent - may be null */
unsigned pdu_len); unsigned pdu_len);
@@ -60,4 +61,3 @@ extern "C" {
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* */ #endif /* */
bacnet-stack/include/client.h
+50 -25
View File
@@ -38,50 +38,75 @@ extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
/* unconfirmed requests */ /* unconfirmed requests */
void Send_WhoIs(int32_t low_limit, int32_t high_limit); void Send_WhoIs(
int32_t low_limit,
int32_t high_limit);
void Send_WhoHas_Object(int32_t low_limit, void Send_WhoHas_Object(
int32_t low_limit,
int32_t high_limit, int32_t high_limit,
BACNET_OBJECT_TYPE object_type, uint32_t object_instance);
void Send_WhoHas_Name(int32_t low_limit,
int32_t high_limit, char *object_name);
void Send_I_Have(uint32_t device_id,
BACNET_OBJECT_TYPE object_type, BACNET_OBJECT_TYPE object_type,
uint32_t object_instance, char *object_name); uint32_t object_instance);
/* returns the invoke ID for confirmed request, or 0 if failed */ void Send_WhoHas_Name(
uint8_t Send_Read_Property_Request(uint32_t device_id, /* destination device */ int32_t low_limit,
int32_t high_limit,
char *object_name);
void Send_I_Have(
uint32_t device_id,
BACNET_OBJECT_TYPE object_type, BACNET_OBJECT_TYPE object_type,
uint32_t object_instance, uint32_t object_instance,
BACNET_PROPERTY_ID object_property, int32_t array_index); char *object_name);
/* returns the invoke ID for confirmed request, or 0 if failed */ /* returns the invoke ID for confirmed request, or 0 if failed */
uint8_t Send_Write_Property_Request(uint32_t device_id, /* destination device */ uint8_t Send_Read_Property_Request(
uint32_t device_id, /* destination device */
BACNET_OBJECT_TYPE object_type,
uint32_t object_instance,
BACNET_PROPERTY_ID object_property,
int32_t array_index);
/* returns the invoke ID for confirmed request, or 0 if failed */
uint8_t Send_Write_Property_Request(
uint32_t device_id, /* destination device */
BACNET_OBJECT_TYPE object_type, BACNET_OBJECT_TYPE object_type,
uint32_t object_instance, uint32_t object_instance,
BACNET_PROPERTY_ID object_property, BACNET_PROPERTY_ID object_property,
BACNET_APPLICATION_DATA_VALUE * object_value, BACNET_APPLICATION_DATA_VALUE * object_value,
uint8_t priority, int32_t array_index); uint8_t priority,
int32_t array_index);
/* returns the invoke ID for confirmed request, or 0 if failed */ /* returns the invoke ID for confirmed request, or 0 if failed */
uint8_t Send_Reinitialize_Device_Request(uint32_t device_id, uint8_t Send_Reinitialize_Device_Request(
BACNET_REINITIALIZED_STATE state, char *password); uint32_t device_id,
BACNET_REINITIALIZED_STATE state,
char *password);
/* returns the invoke ID for confirmed request, or 0 if failed */ /* returns the invoke ID for confirmed request, or 0 if failed */
uint8_t Send_Device_Communication_Control_Request(uint32_t device_id, uint16_t timeDuration, /* 0=optional */ uint8_t Send_Device_Communication_Control_Request(
BACNET_COMMUNICATION_ENABLE_DISABLE state, char *password); /* NULL=optional */ uint32_t device_id,
uint16_t timeDuration, /* 0=optional */
BACNET_COMMUNICATION_ENABLE_DISABLE state,
char *password); /* NULL=optional */
void Send_TimeSync(BACNET_DATE * bdate, BACNET_TIME * btime); void Send_TimeSync(
void Send_TimeSyncUTC(BACNET_DATE * bdate, BACNET_TIME * btime); BACNET_DATE * bdate,
BACNET_TIME * btime);
void Send_TimeSyncUTC(
BACNET_DATE * bdate,
BACNET_TIME * btime);
uint8_t Send_Atomic_Read_File_Stream(uint32_t device_id, uint8_t Send_Atomic_Read_File_Stream(
uint32_t file_instance, int fileStartPosition, uint32_t device_id,
unsigned requestedOctetCount);
uint8_t Send_Atomic_Write_File_Stream(uint32_t device_id,
uint32_t file_instance, uint32_t file_instance,
int fileStartPosition, BACNET_OCTET_STRING * fileData); int fileStartPosition,
unsigned requestedOctetCount);
uint8_t Send_Atomic_Write_File_Stream(
uint32_t device_id,
uint32_t file_instance,
int fileStartPosition,
BACNET_OCTET_STRING * fileData);
#ifdef __cplusplus #ifdef __cplusplus
bacnet-stack/include/config.h
+23 -23
View File
@@ -7,29 +7,29 @@
/* declare a single physical layer using your compiler define. /* declare a single physical layer using your compiler define.
see datalink.h for possible defines. */ see datalink.h for possible defines. */
#if !(defined(BACDL_ETHERNET) || defined(BACDL_ARCNET) || defined(BACDL_MSTP) || defined(BACDL_BIP) || defined(BACDL_TEST)) #if !(defined(BACDL_ETHERNET) || defined(BACDL_ARCNET) || defined(BACDL_MSTP) || defined(BACDL_BIP) || defined(BACDL_TEST))
#define BACDL_BIP #define BACDL_BIP
#endif #endif
/* optional debug info for BACnet/IP datalink layers */ /* optional debug info for BACnet/IP datalink layers */
#if defined(BACDL_BIP) #if defined(BACDL_BIP)
#if !defined(USE_INADDR) #if !defined(USE_INADDR)
#define USE_INADDR 1 #define USE_INADDR 1
#endif #endif
#endif #endif
/* Define your processor architecture as /* Define your processor architecture as
Big Endian (PowerPC,68K,Sparc) or Little Endian (Intel,AVR) Big Endian (PowerPC,68K,Sparc) or Little Endian (Intel,AVR)
ARM and MIPS can be either - what is your setup? */ ARM and MIPS can be either - what is your setup? */
#if !defined(BIG_ENDIAN) #if !defined(BIG_ENDIAN)
#define BIG_ENDIAN 0 #define BIG_ENDIAN 0
#endif #endif
/* Define your Vendor Identifier assigned by ASHRAE */ /* Define your Vendor Identifier assigned by ASHRAE */
#if !defined(BACNET_VENDOR_ID) #if !defined(BACNET_VENDOR_ID)
#define BACNET_VENDOR_ID 260 #define BACNET_VENDOR_ID 260
#endif #endif
#if !defined(BACNET_VENDOR_NAME) #if !defined(BACNET_VENDOR_NAME)
#define BACNET_VENDOR_NAME "BACnet Stack at SourceForge" #define BACNET_VENDOR_NAME "BACnet Stack at SourceForge"
#endif #endif
/* Max number of bytes in an APDU. */ /* Max number of bytes in an APDU. */
@@ -39,7 +39,7 @@
/* Lon=206, MS/TP=480, ARCNET=480, Ethernet=1476, BACnet/IP=64K */ /* Lon=206, MS/TP=480, ARCNET=480, Ethernet=1476, BACnet/IP=64K */
#if !defined(MAX_APDU) #if !defined(MAX_APDU)
/* #define MAX_APDU 50 */ /* #define MAX_APDU 50 */
#define MAX_APDU 480 #define MAX_APDU 480
/* #define MAX_APDU 1476 */ /* #define MAX_APDU 1476 */
#endif #endif
@@ -49,7 +49,7 @@
/* Configure from 1..255 for number of outstanding confirmed */ /* Configure from 1..255 for number of outstanding confirmed */
/* requests available. */ /* requests available. */
#if !defined(MAX_TSM_TRANSACTIONS) #if !defined(MAX_TSM_TRANSACTIONS)
#define MAX_TSM_TRANSACTIONS 255 #define MAX_TSM_TRANSACTIONS 255
#endif #endif
/* The address cache is used for binding to BACnet devices */ /* The address cache is used for binding to BACnet devices */
/* The number of entries corresponds to the number of */ /* The number of entries corresponds to the number of */
@@ -57,30 +57,30 @@
/* If your device is a simple server and does not need to bind, */ /* If your device is a simple server and does not need to bind, */
/* then you don't need to use this. */ /* then you don't need to use this. */
#if !defined(MAX_ADDRESS_CACHE) #if !defined(MAX_ADDRESS_CACHE)
#define MAX_ADDRESS_CACHE 255 #define MAX_ADDRESS_CACHE 255
#endif #endif
/* some modules have debugging enabled using PRINT_ENABLED */ /* some modules have debugging enabled using PRINT_ENABLED */
#if !defined(PRINT_ENABLED) #if !defined(PRINT_ENABLED)
#define PRINT_ENABLED 0 #define PRINT_ENABLED 0
#endif #endif
/* BACAPP decodes WriteProperty service requests /* BACAPP decodes WriteProperty service requests
Choose the datatypes that your application supports */ Choose the datatypes that your application supports */
#if defined (BACAPP_ALL) #if defined (BACAPP_ALL)
#define BACAPP_NULL #define BACAPP_NULL
#define BACAPP_BOOLEAN #define BACAPP_BOOLEAN
#define BACAPP_UNSIGNED #define BACAPP_UNSIGNED
#define BACAPP_SIGNED #define BACAPP_SIGNED
#define BACAPP_REAL #define BACAPP_REAL
/* FIXME: not implemented #define BACAPP_DOUBLE */ /* FIXME: not implemented #define BACAPP_DOUBLE */
#define BACAPP_OCTET_STRING #define BACAPP_OCTET_STRING
#define BACAPP_CHARACTER_STRING #define BACAPP_CHARACTER_STRING
#define BACAPP_BIT_STRING #define BACAPP_BIT_STRING
#define BACAPP_ENUMERATED #define BACAPP_ENUMERATED
#define BACAPP_DATE #define BACAPP_DATE
#define BACAPP_TIME #define BACAPP_TIME
#define BACAPP_OBJECT_ID #define BACAPP_OBJECT_ID
#endif #endif
#endif #endif
bacnet-stack/include/cov.h
+45 -21
View File
@@ -77,41 +77,65 @@ typedef struct BACnet_Subscribe_COV_Data {
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
int ucov_notify_encode_apdu(uint8_t * apdu, BACNET_COV_DATA * data); int ucov_notify_encode_apdu(
uint8_t * apdu,
BACNET_COV_DATA * data);
int ucov_notify_decode_apdu(uint8_t * apdu, int ucov_notify_decode_apdu(
unsigned apdu_len, BACNET_COV_DATA * data); uint8_t * apdu,
unsigned apdu_len,
BACNET_COV_DATA * data);
int ucov_notify_send(uint8_t * buffer, BACNET_COV_DATA * data); int ucov_notify_send(
uint8_t * buffer,
BACNET_COV_DATA * data);
int ccov_notify_encode_apdu(uint8_t * apdu, int ccov_notify_encode_apdu(
uint8_t invoke_id, BACNET_COV_DATA * data); uint8_t * apdu,
uint8_t invoke_id,
BACNET_COV_DATA * data);
int ccov_notify_decode_apdu(uint8_t * apdu, int ccov_notify_decode_apdu(
unsigned apdu_len, uint8_t * invoke_id, BACNET_COV_DATA * data); uint8_t * apdu,
unsigned apdu_len,
uint8_t * invoke_id,
BACNET_COV_DATA * data);
/* common for both confirmed and unconfirmed */ /* common for both confirmed and unconfirmed */
int cov_notify_decode_service_request(uint8_t * apdu, int cov_notify_decode_service_request(
unsigned apdu_len, BACNET_COV_DATA * data); uint8_t * apdu,
unsigned apdu_len,
BACNET_COV_DATA * data);
int cov_subscribe_property_decode_service_request(uint8_t * apdu, int cov_subscribe_property_decode_service_request(
unsigned apdu_len, BACNET_SUBSCRIBE_COV_DATA * data); uint8_t * apdu,
unsigned apdu_len,
BACNET_SUBSCRIBE_COV_DATA * data);
int cov_subscribe_property_encode_adpu(uint8_t * apdu, int cov_subscribe_property_encode_adpu(
uint8_t invoke_id, BACNET_SUBSCRIBE_COV_DATA * data); uint8_t * apdu,
uint8_t invoke_id,
BACNET_SUBSCRIBE_COV_DATA * data);
int cov_subscribe_decode_service_request(uint8_t * apdu, int cov_subscribe_decode_service_request(
unsigned apdu_len, BACNET_SUBSCRIBE_COV_DATA * data); uint8_t * apdu,
unsigned apdu_len,
BACNET_SUBSCRIBE_COV_DATA * data);
int cov_subscribe_encode_adpu(uint8_t * apdu, int cov_subscribe_encode_adpu(
uint8_t invoke_id, BACNET_SUBSCRIBE_COV_DATA * data); uint8_t * apdu,
uint8_t invoke_id,
BACNET_SUBSCRIBE_COV_DATA * data);
#ifdef TEST #ifdef TEST
#include "ctest.h" #include "ctest.h"
void testCOVNotify(Test * pTest); void testCOVNotify(
void testCOVSubscribeProperty(Test * pTest); Test * pTest);
void testCOVSubscribe(Test * pTest); void testCOVSubscribeProperty(
Test * pTest);
void testCOVSubscribe(
Test * pTest);
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
bacnet-stack/include/crc.h
+6 -2
View File
@@ -42,8 +42,12 @@
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
uint8_t CRC_Calc_Header(uint8_t dataValue, uint8_t crcValue); uint8_t CRC_Calc_Header(
uint16_t CRC_Calc_Data(uint8_t dataValue, uint16_t crcValue); uint8_t dataValue,
uint8_t crcValue);
uint16_t CRC_Calc_Data(
uint8_t dataValue,
uint16_t crcValue);
#ifdef __cplusplus #ifdef __cplusplus
} }
bacnet-stack/include/datalink.h
+23 -13
View File
@@ -69,16 +69,16 @@
#elif defined(BACDL_BIP) #elif defined(BACDL_BIP)
#include "bip.h" #include "bip.h"
#ifdef BBMD_ENABLED #ifdef BBMD_ENABLED
#include "bvlc.h" #include "bvlc.h"
#endif #endif
#define datalink_init bip_init #define datalink_init bip_init
#ifdef BBMD_ENABLED #ifdef BBMD_ENABLED
#define datalink_send_pdu bvlc_send_pdu #define datalink_send_pdu bvlc_send_pdu
#define datalink_receive bvlc_receive #define datalink_receive bvlc_receive
#else #else
#define datalink_send_pdu bip_send_pdu #define datalink_send_pdu bip_send_pdu
#define datalink_receive bip_receive #define datalink_receive bip_receive
#endif #endif
#define datalink_cleanup bip_cleanup #define datalink_cleanup bip_cleanup
#define datalink_get_broadcast_address bip_get_broadcast_address #define datalink_get_broadcast_address bip_get_broadcast_address
@@ -87,14 +87,24 @@
#else #else
#include "npdu.h" #include "npdu.h"
extern int datalink_send_pdu(BACNET_ADDRESS * dest, extern int datalink_send_pdu(
BACNET_NPDU_DATA * npdu_data, uint8_t * pdu, unsigned pdu_len); BACNET_ADDRESS * dest,
extern uint16_t datalink_receive(BACNET_ADDRESS * src, BACNET_NPDU_DATA * npdu_data,
uint8_t * pdu, uint16_t max_pdu, unsigned timeout); uint8_t * pdu,
extern void datalink_cleanup(void); unsigned pdu_len);
extern void datalink_get_broadcast_address(BACNET_ADDRESS * dest); extern uint16_t datalink_receive(
extern void datalink_get_my_address(BACNET_ADDRESS * my_address); BACNET_ADDRESS * src,
extern void datalink_set_interface(char *ifname); uint8_t * pdu,
uint16_t max_pdu,
unsigned timeout);
extern void datalink_cleanup(
void);
extern void datalink_get_broadcast_address(
BACNET_ADDRESS * dest);
extern void datalink_get_my_address(
BACNET_ADDRESS * my_address);
extern void datalink_set_interface(
char *ifname);
#endif #endif
bacnet-stack/include/datetime.h
+50 -20
View File
@@ -73,40 +73,70 @@ extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
/* utility initialization functions */ /* utility initialization functions */
void datetime_set_date(BACNET_DATE * bdate, void datetime_set_date(
uint16_t year, uint8_t month, uint8_t day); BACNET_DATE * bdate,
void datetime_set_time(BACNET_TIME * btime, uint16_t year,
uint8_t hour, uint8_t minute, uint8_t seconds, uint8_t hundredths); uint8_t month,
void datetime_set(BACNET_DATE_TIME * bdatetime, uint8_t day);
BACNET_DATE * bdate, BACNET_TIME * btime); void datetime_set_time(
void datetime_set_values(BACNET_DATE_TIME * bdatetime, BACNET_TIME * btime,
uint16_t year, uint8_t month, uint8_t day, uint8_t hour,
uint8_t hour, uint8_t minute, uint8_t seconds, uint8_t hundredths); uint8_t minute,
uint8_t seconds,
uint8_t hundredths);
void datetime_set(
BACNET_DATE_TIME * bdatetime,
BACNET_DATE * bdate,
BACNET_TIME * btime);
void datetime_set_values(
BACNET_DATE_TIME * bdatetime,
uint16_t year,
uint8_t month,
uint8_t day,
uint8_t hour,
uint8_t minute,
uint8_t seconds,
uint8_t hundredths);
/* utility comparison functions: /* utility comparison functions:
if the date/times are the same, return is 0 if the date/times are the same, return is 0
if date1 is before date2, returns negative if date1 is before date2, returns negative
if date1 is after date2, returns positive */ if date1 is after date2, returns positive */
int datetime_compare_date(BACNET_DATE * date1, BACNET_DATE * date2); int datetime_compare_date(
int datetime_compare_time(BACNET_TIME * time1, BACNET_TIME * time2); BACNET_DATE * date1,
int datetime_compare(BACNET_DATE_TIME * datetime1, BACNET_DATE * date2);
int datetime_compare_time(
BACNET_TIME * time1,
BACNET_TIME * time2);
int datetime_compare(
BACNET_DATE_TIME * datetime1,
BACNET_DATE_TIME * datetime2); BACNET_DATE_TIME * datetime2);
/* utility copy functions */ /* utility copy functions */
void datetime_copy_date(BACNET_DATE * date1, BACNET_DATE * date2); void datetime_copy_date(
void datetime_copy_time(BACNET_TIME * time1, BACNET_TIME * time2); BACNET_DATE * date1,
void datetime_copy(BACNET_DATE_TIME * datetime1, BACNET_DATE * date2);
void datetime_copy_time(
BACNET_TIME * time1,
BACNET_TIME * time2);
void datetime_copy(
BACNET_DATE_TIME * datetime1,
BACNET_DATE_TIME * datetime2); BACNET_DATE_TIME * datetime2);
/* utility add function */ /* utility add function */
void datetime_add_minutes(BACNET_DATE_TIME * bdatetime, void datetime_add_minutes(
BACNET_DATE_TIME * bdatetime,
uint32_t minutes); uint32_t minutes);
/* date and time wildcards */ /* date and time wildcards */
bool datetime_wildcard(BACNET_DATE_TIME * bdatetime); bool datetime_wildcard(
void datetime_wildcard_set(BACNET_DATE_TIME * bdatetime); BACNET_DATE_TIME * bdatetime);
void datetime_date_wildcard_set(BACNET_DATE * bdate); void datetime_wildcard_set(
void datetime_time_wildcard_set(BACNET_TIME * btime); BACNET_DATE_TIME * bdatetime);
void datetime_date_wildcard_set(
BACNET_DATE * bdate);
void datetime_time_wildcard_set(
BACNET_TIME * btime);
#ifdef __cplusplus #ifdef __cplusplus
} }
bacnet-stack/include/dcc.h
+27 -13
View File
@@ -44,25 +44,37 @@ extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
/* return the status */ /* return the status */
BACNET_COMMUNICATION_ENABLE_DISABLE dcc_enable_status(void); BACNET_COMMUNICATION_ENABLE_DISABLE dcc_enable_status(
bool dcc_communication_enabled(void); void);
bool dcc_communication_disabled(void); bool dcc_communication_enabled(
bool dcc_communication_initiation_disabled(void); void);
bool dcc_communication_disabled(
void);
bool dcc_communication_initiation_disabled(
void);
/* return the time */ /* return the time */
uint32_t dcc_duration_seconds(void); uint32_t dcc_duration_seconds(
void);
/* called every second or so. If more than one second, /* called every second or so. If more than one second,
then seconds should be the number of seconds to tick away */ then seconds should be the number of seconds to tick away */
void dcc_timer_seconds(uint32_t seconds); void dcc_timer_seconds(
uint32_t seconds);
/* setup the communication values */ /* setup the communication values */
bool dcc_set_status_duration(BACNET_COMMUNICATION_ENABLE_DISABLE bool dcc_set_status_duration(
status, uint16_t minutes); BACNET_COMMUNICATION_ENABLE_DISABLE status,
uint16_t minutes);
/* encode service */ /* encode service */
int dcc_encode_apdu(uint8_t * apdu, uint8_t invoke_id, uint16_t timeDuration, /* 0=optional */ int dcc_encode_apdu(
BACNET_COMMUNICATION_ENABLE_DISABLE enable_disable, BACNET_CHARACTER_STRING * password); /* NULL=optional */ uint8_t * apdu,
uint8_t invoke_id,
uint16_t timeDuration, /* 0=optional */
BACNET_COMMUNICATION_ENABLE_DISABLE enable_disable,
BACNET_CHARACTER_STRING * password); /* NULL=optional */
/* decode the service request only */ /* decode the service request only */
int dcc_decode_service_request(uint8_t * apdu, int dcc_decode_service_request(
uint8_t * apdu,
unsigned apdu_len, unsigned apdu_len,
uint16_t * timeDuration, uint16_t * timeDuration,
BACNET_COMMUNICATION_ENABLE_DISABLE * enable_disable, BACNET_COMMUNICATION_ENABLE_DISABLE * enable_disable,
@@ -70,14 +82,16 @@ extern "C" {
#ifdef TEST #ifdef TEST
#include "ctest.h" #include "ctest.h"
int dcc_decode_apdu(uint8_t * apdu, int dcc_decode_apdu(
uint8_t * apdu,
unsigned apdu_len, unsigned apdu_len,
uint8_t * invoke_id, uint8_t * invoke_id,
uint16_t * timeDuration, uint16_t * timeDuration,
BACNET_COMMUNICATION_ENABLE_DISABLE * enable_disable, BACNET_COMMUNICATION_ENABLE_DISABLE * enable_disable,
BACNET_CHARACTER_STRING * password); BACNET_CHARACTER_STRING * password);
void test_DeviceCommunicationControl(Test * pTest); void test_DeviceCommunicationControl(
Test * pTest);
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
bacnet-stack/include/device.h
+77 -38
View File
@@ -49,62 +49,101 @@ extern "C" {
const int **pOptional, const int **pOptional,
const int **pProprietary); const int **pProprietary);
uint32_t Device_Object_Instance_Number(void); uint32_t Device_Object_Instance_Number(
bool Device_Set_Object_Instance_Number(uint32_t object_id); void);
bool Device_Valid_Object_Instance_Number(uint32_t object_id); bool Device_Set_Object_Instance_Number(
unsigned Device_Object_List_Count(void); uint32_t object_id);
bool Device_Object_List_Identifier(unsigned array_index, bool Device_Valid_Object_Instance_Number(
int *object_type, uint32_t * instance); uint32_t object_id);
unsigned Device_Object_List_Count(
void);
bool Device_Object_List_Identifier(
unsigned array_index,
int *object_type,
uint32_t * instance);
BACNET_DEVICE_STATUS Device_System_Status(void); BACNET_DEVICE_STATUS Device_System_Status(
void Device_Set_System_Status(BACNET_DEVICE_STATUS status); void);
void Device_Set_System_Status(
BACNET_DEVICE_STATUS status);
const char *Device_Vendor_Name(void); const char *Device_Vendor_Name(
void);
uint16_t Device_Vendor_Identifier(void); uint16_t Device_Vendor_Identifier(
void);
const char *Device_Model_Name(void); const char *Device_Model_Name(
bool Device_Set_Model_Name(const char *name, size_t length); void);
bool Device_Set_Model_Name(
const char *Device_Firmware_Revision(void); const char *name,
const char *Device_Application_Software_Version(void);
bool Device_Set_Application_Software_Version(const char *name,
size_t length); size_t length);
const char *Device_Description(void); const char *Device_Firmware_Revision(
bool Device_Set_Description(const char *name, size_t length); void);
const char *Device_Location(void); const char *Device_Application_Software_Version(
bool Device_Set_Location(const char *name, size_t length); void);
bool Device_Set_Application_Software_Version(
const char *name,
size_t length);
const char *Device_Description(
void);
bool Device_Set_Description(
const char *name,
size_t length);
const char *Device_Location(
void);
bool Device_Set_Location(
const char *name,
size_t length);
/* some stack-centric constant values - no set methods */ /* some stack-centric constant values - no set methods */
uint8_t Device_Protocol_Version(void); uint8_t Device_Protocol_Version(
uint8_t Device_Protocol_Revision(void); void);
uint16_t Device_Max_APDU_Length_Accepted(void); uint8_t Device_Protocol_Revision(
BACNET_SEGMENTATION Device_Segmentation_Supported(void); void);
uint16_t Device_Max_APDU_Length_Accepted(
void);
BACNET_SEGMENTATION Device_Segmentation_Supported(
void);
uint16_t Device_APDU_Timeout(void); uint16_t Device_APDU_Timeout(
void Device_Set_APDU_Timeout(uint16_t timeout); void);
void Device_Set_APDU_Timeout(
uint16_t timeout);
uint8_t Device_Number_Of_APDU_Retries(void); uint8_t Device_Number_Of_APDU_Retries(
void Device_Set_Number_Of_APDU_Retries(uint8_t retries); void);
void Device_Set_Number_Of_APDU_Retries(
uint8_t retries);
uint8_t Device_Database_Revision(void); uint8_t Device_Database_Revision(
void Device_Set_Database_Revision(uint8_t revision); void);
void Device_Set_Database_Revision(
uint8_t revision);
bool Device_Valid_Object_Name(const char *object_name, bool Device_Valid_Object_Name(
int *object_type, uint32_t * object_instance); const char *object_name,
char *Device_Valid_Object_Id(int object_type, int *object_type,
uint32_t * object_instance);
char *Device_Valid_Object_Id(
int object_type,
uint32_t object_instance); uint32_t object_instance);
int Device_Encode_Property_APDU(uint8_t * apdu, int Device_Encode_Property_APDU(
uint8_t * apdu,
BACNET_PROPERTY_ID property, BACNET_PROPERTY_ID property,
int32_t array_index, int32_t array_index,
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code); BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code);
bool Device_Write_Property(BACNET_WRITE_PROPERTY_DATA * wp_data, bool Device_Write_Property(
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code); BACNET_WRITE_PROPERTY_DATA * wp_data,
BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code);
#ifdef __cplusplus #ifdef __cplusplus
} }
bacnet-stack/include/dlmstp.h
+28 -14
View File
@@ -57,17 +57,21 @@ typedef struct dlmstp_packet {
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
bool dlmstp_init(char *ifname); bool dlmstp_init(
void dlmstp_cleanup(void); char *ifname);
void dlmstp_cleanup(
void);
/* returns number of bytes sent on success, negative on failure */ /* returns number of bytes sent on success, negative on failure */
int dlmstp_send_pdu(BACNET_ADDRESS * dest, /* destination address */ int dlmstp_send_pdu(
BACNET_ADDRESS * dest, /* destination address */
BACNET_NPDU_DATA * npdu_data, /* network information */ BACNET_NPDU_DATA * npdu_data, /* network information */
uint8_t * pdu, /* any data to be sent - may be null */ uint8_t * pdu, /* any data to be sent - may be null */
unsigned pdu_len); /* number of bytes of data */ unsigned pdu_len); /* number of bytes of data */
/* returns the number of octets in the PDU, or zero on failure */ /* returns the number of octets in the PDU, or zero on failure */
uint16_t dlmstp_receive(BACNET_ADDRESS * src, /* source address */ uint16_t dlmstp_receive(
BACNET_ADDRESS * src, /* source address */
uint8_t * pdu, /* PDU data */ uint8_t * pdu, /* PDU data */
uint16_t max_pdu, /* amount of space available in the PDU */ uint16_t max_pdu, /* amount of space available in the PDU */
unsigned timeout); /* milliseconds to wait for a packet */ unsigned timeout); /* milliseconds to wait for a packet */
@@ -79,27 +83,37 @@ extern "C" {
/* nodes. This may be used to allocate more or less of the available link */ /* nodes. This may be used to allocate more or less of the available link */
/* bandwidth to particular nodes. If Max_Info_Frames is not writable in a */ /* bandwidth to particular nodes. If Max_Info_Frames is not writable in a */
/* node, its value shall be 1. */ /* node, its value shall be 1. */
void dlmstp_set_max_info_frames(uint8_t max_info_frames); void dlmstp_set_max_info_frames(
uint8_t dlmstp_max_info_frames(void); uint8_t max_info_frames);
uint8_t dlmstp_max_info_frames(
void);
/* This parameter represents the value of the Max_Master property of the */ /* This parameter represents the value of the Max_Master property of the */
/* node's Device object. The value of Max_Master specifies the highest */ /* node's Device object. The value of Max_Master specifies the highest */
/* allowable address for master nodes. The value of Max_Master shall be */ /* allowable address for master nodes. The value of Max_Master shall be */
/* less than or equal to 127. If Max_Master is not writable in a node, */ /* less than or equal to 127. If Max_Master is not writable in a node, */
/* its value shall be 127. */ /* its value shall be 127. */
void dlmstp_set_max_master(uint8_t max_master); void dlmstp_set_max_master(
uint8_t dlmstp_max_master(void); uint8_t max_master);
uint8_t dlmstp_max_master(
void);
/* MAC address 0-127 */ /* MAC address 0-127 */
void dlmstp_set_mac_address(uint8_t my_address); void dlmstp_set_mac_address(
uint8_t dlmstp_mac_address(void); uint8_t my_address);
uint8_t dlmstp_mac_address(
void);
void dlmstp_get_my_address(BACNET_ADDRESS * my_address); void dlmstp_get_my_address(
void dlmstp_get_broadcast_address(BACNET_ADDRESS * dest); /* destination address */ BACNET_ADDRESS * my_address);
void dlmstp_get_broadcast_address(
BACNET_ADDRESS * dest); /* destination address */
/* RS485 Baud Rate 9600, 19200, 38400, 57600, 115200 */ /* RS485 Baud Rate 9600, 19200, 38400, 57600, 115200 */
void dlmstp_set_baud_rate(uint32_t baud); void dlmstp_set_baud_rate(
uint32_t dlmstp_baud_rate(void); uint32_t baud);
uint32_t dlmstp_baud_rate(
void);
#ifdef __cplusplus #ifdef __cplusplus
} }
bacnet-stack/include/ethernet.h
+16 -8
View File
@@ -48,27 +48,35 @@
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
bool ethernet_valid(void); bool ethernet_valid(
void ethernet_cleanup(void); void);
bool ethernet_init(char *interface_name); void ethernet_cleanup(
void);
bool ethernet_init(
char *interface_name);
/* function to send a packet out the 802.2 socket */ /* function to send a packet out the 802.2 socket */
/* returns number of bytes sent on success, negative on failure */ /* returns number of bytes sent on success, negative on failure */
int ethernet_send_pdu(BACNET_ADDRESS * dest, /* destination address */ int ethernet_send_pdu(
BACNET_ADDRESS * dest, /* destination address */
BACNET_NPDU_DATA * npdu_data, /* network information */ BACNET_NPDU_DATA * npdu_data, /* network information */
uint8_t * pdu, /* any data to be sent - may be null */ uint8_t * pdu, /* any data to be sent - may be null */
unsigned pdu_len); /* number of bytes of data */ unsigned pdu_len); /* number of bytes of data */
/* receives an 802.2 framed packet */ /* receives an 802.2 framed packet */
/* returns the number of octets in the PDU, or zero on failure */ /* returns the number of octets in the PDU, or zero on failure */
uint16_t ethernet_receive(BACNET_ADDRESS * src, /* source address */ uint16_t ethernet_receive(
BACNET_ADDRESS * src, /* source address */
uint8_t * pdu, /* PDU data */ uint8_t * pdu, /* PDU data */
uint16_t max_pdu, /* amount of space available in the PDU */ uint16_t max_pdu, /* amount of space available in the PDU */
unsigned timeout); /* milliseconds to wait for a packet */ unsigned timeout); /* milliseconds to wait for a packet */
void ethernet_set_my_address(BACNET_ADDRESS * my_address); void ethernet_set_my_address(
void ethernet_get_my_address(BACNET_ADDRESS * my_address); BACNET_ADDRESS * my_address);
void ethernet_get_broadcast_address(BACNET_ADDRESS * dest); /* destination address */ void ethernet_get_my_address(
BACNET_ADDRESS * my_address);
void ethernet_get_broadcast_address(
BACNET_ADDRESS * dest); /* destination address */
#ifdef __cplusplus #ifdef __cplusplus
} }
bacnet-stack/include/filename.h
+2 -1
View File
@@ -38,7 +38,8 @@
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
char *filename_remove_path(const char *filename_in); char *filename_remove_path(
const char *filename_in);
#ifdef __cplusplus #ifdef __cplusplus
} }
bacnet-stack/include/handlers.h
+50 -26
View File
@@ -36,70 +36,94 @@
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
void handler_unrecognized_service(uint8_t * service_request, void handler_unrecognized_service(
uint8_t * service_request,
uint16_t service_len, uint16_t service_len,
BACNET_ADDRESS * dest, BACNET_ADDRESS * dest,
BACNET_CONFIRMED_SERVICE_DATA * service_data); BACNET_CONFIRMED_SERVICE_DATA * service_data);
void handler_who_is(uint8_t * service_request, void handler_who_is(
uint16_t service_len, BACNET_ADDRESS * src); uint8_t * service_request,
uint16_t service_len,
BACNET_ADDRESS * src);
void handler_who_has(uint8_t * service_request, void handler_who_has(
uint16_t service_len, BACNET_ADDRESS * src); uint8_t * service_request,
uint16_t service_len,
BACNET_ADDRESS * src);
void handler_i_am_add(uint8_t * service_request, void handler_i_am_add(
uint16_t service_len, BACNET_ADDRESS * src); uint8_t * service_request,
uint16_t service_len,
BACNET_ADDRESS * src);
void handler_i_am_bind(uint8_t * service_request, void handler_i_am_bind(
uint16_t service_len, BACNET_ADDRESS * src); uint8_t * service_request,
uint16_t service_len,
BACNET_ADDRESS * src);
void handler_read_property(uint8_t * service_request, void handler_read_property(
uint8_t * service_request,
uint16_t service_len, uint16_t service_len,
BACNET_ADDRESS * src, BACNET_ADDRESS * src,
BACNET_CONFIRMED_SERVICE_DATA * service_data); BACNET_CONFIRMED_SERVICE_DATA * service_data);
void handler_read_property_ack(uint8_t * service_request, void handler_read_property_ack(
uint8_t * service_request,
uint16_t service_len, uint16_t service_len,
BACNET_ADDRESS * src, BACNET_ADDRESS * src,
BACNET_CONFIRMED_SERVICE_ACK_DATA * service_data); BACNET_CONFIRMED_SERVICE_ACK_DATA * service_data);
void handler_write_property(uint8_t * service_request, void handler_write_property(
uint8_t * service_request,
uint16_t service_len, uint16_t service_len,
BACNET_ADDRESS * src, BACNET_ADDRESS * src,
BACNET_CONFIRMED_SERVICE_DATA * service_data); BACNET_CONFIRMED_SERVICE_DATA * service_data);
void handler_atomic_read_file(uint8_t * service_request, void handler_atomic_read_file(
uint8_t * service_request,
uint16_t service_len, uint16_t service_len,
BACNET_ADDRESS * src, BACNET_ADDRESS * src,
BACNET_CONFIRMED_SERVICE_DATA * service_data); BACNET_CONFIRMED_SERVICE_DATA * service_data);
void handler_atomic_read_file_ack(uint8_t * service_request, void handler_atomic_read_file_ack(
uint8_t * service_request,
uint16_t service_len, uint16_t service_len,
BACNET_ADDRESS * src, BACNET_ADDRESS * src,
BACNET_CONFIRMED_SERVICE_ACK_DATA * service_data); BACNET_CONFIRMED_SERVICE_ACK_DATA * service_data);
void handler_atomic_write_file(uint8_t * service_request, void handler_atomic_write_file(
uint16_t service_len, uint8_t * service_request,
BACNET_ADDRESS * src, BACNET_CONFIRMED_SERVICE_DATA * service_data);
void handler_reinitialize_device(uint8_t * service_request,
uint16_t service_len, uint16_t service_len,
BACNET_ADDRESS * src, BACNET_ADDRESS * src,
BACNET_CONFIRMED_SERVICE_DATA * service_data); BACNET_CONFIRMED_SERVICE_DATA * service_data);
void handler_device_communication_control(uint8_t * service_request, void handler_reinitialize_device(
uint8_t * service_request,
uint16_t service_len, uint16_t service_len,
BACNET_ADDRESS * src, BACNET_ADDRESS * src,
BACNET_CONFIRMED_SERVICE_DATA * service_data); BACNET_CONFIRMED_SERVICE_DATA * service_data);
void handler_i_have(uint8_t * service_request, void handler_device_communication_control(
uint16_t service_len, BACNET_ADDRESS * src); uint8_t * service_request,
uint16_t service_len,
BACNET_ADDRESS * src,
BACNET_CONFIRMED_SERVICE_DATA * service_data);
void handler_timesync(uint8_t * service_request, void handler_i_have(
uint16_t service_len, BACNET_ADDRESS * src); uint8_t * service_request,
uint16_t service_len,
BACNET_ADDRESS * src);
void handler_timesync_utc(uint8_t * service_request, void handler_timesync(
uint16_t service_len, BACNET_ADDRESS * src); uint8_t * service_request,
uint16_t service_len,
BACNET_ADDRESS * src);
void handler_timesync_utc(
uint8_t * service_request,
uint16_t service_len,
BACNET_ADDRESS * src);
void handler_read_property_multiple( void handler_read_property_multiple(
uint8_t * service_request, uint8_t * service_request,
bacnet-stack/include/iam.h
+21 -10
View File
@@ -44,28 +44,39 @@
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
int iam_encode_apdu(uint8_t * apdu, int iam_encode_apdu(
uint8_t * apdu,
uint32_t device_id, uint32_t device_id,
unsigned max_apdu, int segmentation, uint16_t vendor_id); unsigned max_apdu,
int segmentation,
uint16_t vendor_id);
int iam_decode_service_request(uint8_t * apdu, int iam_decode_service_request(
uint8_t * apdu,
uint32_t * pDevice_id, uint32_t * pDevice_id,
unsigned *pMax_apdu, int *pSegmentation, uint16_t * pVendor_id); unsigned *pMax_apdu,
int *pSegmentation,
uint16_t * pVendor_id);
int iam_encode_pdu( int iam_encode_pdu(
uint8_t * buffer, uint8_t * buffer,
BACNET_ADDRESS *dest, BACNET_ADDRESS * dest,
BACNET_NPDU_DATA *npdu_data); BACNET_NPDU_DATA * npdu_data);
int iam_send(uint8_t * buffer); int iam_send(
uint8_t * buffer);
#ifdef TEST #ifdef TEST
#include "ctest.h" #include "ctest.h"
int iam_decode_apdu(uint8_t * apdu, int iam_decode_apdu(
uint8_t * apdu,
uint32_t * pDevice_id, uint32_t * pDevice_id,
unsigned *pMax_apdu, int *pSegmentation, uint16_t * pVendor_id); unsigned *pMax_apdu,
int *pSegmentation,
uint16_t * pVendor_id);
void testIAm(Test * pTest); void testIAm(
Test * pTest);
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
bacnet-stack/include/ihave.h
+13 -6
View File
@@ -48,17 +48,24 @@ typedef struct BACnet_I_Have_Data {
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
int ihave_encode_apdu(uint8_t * apdu, BACNET_I_HAVE_DATA * data); int ihave_encode_apdu(
uint8_t * apdu,
BACNET_I_HAVE_DATA * data);
int ihave_decode_service_request(uint8_t * apdu, int ihave_decode_service_request(
unsigned apdu_len, BACNET_I_HAVE_DATA * data); uint8_t * apdu,
unsigned apdu_len,
BACNET_I_HAVE_DATA * data);
int ihave_decode_apdu(uint8_t * apdu, int ihave_decode_apdu(
unsigned apdu_len, BACNET_I_HAVE_DATA * data); uint8_t * apdu,
unsigned apdu_len,
BACNET_I_HAVE_DATA * data);
#ifdef TEST #ifdef TEST
#include "ctest.h" #include "ctest.h"
void testIHave(Test * pTest); void testIHave(
Test * pTest);
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
bacnet-stack/include/indtext.h
+31 -15
View File
@@ -53,40 +53,56 @@ extern "C" {
If the string is not found, false is returned If the string is not found, false is returned
If the string is found, true is returned and the found_index contains If the string is found, true is returned and the found_index contains
the first index where the string was found. */ the first index where the string was found. */
bool indtext_by_string(INDTEXT_DATA * data_list, bool indtext_by_string(
const char *search_name, unsigned *found_index); INDTEXT_DATA * data_list,
const char *search_name,
unsigned *found_index);
/* case insensitive version */ /* case insensitive version */
bool indtext_by_istring(INDTEXT_DATA * data_list, bool indtext_by_istring(
const char *search_name, unsigned *found_index); INDTEXT_DATA * data_list,
const char *search_name,
unsigned *found_index);
/* Searches for a matching string and returns the index to the string /* Searches for a matching string and returns the index to the string
or the default_index if the string is not found. */ or the default_index if the string is not found. */
unsigned indtext_by_string_default(INDTEXT_DATA * data_list, unsigned indtext_by_string_default(
const char *search_name, unsigned default_index); INDTEXT_DATA * data_list,
const char *search_name,
unsigned default_index);
/* case insensitive version */ /* case insensitive version */
unsigned indtext_by_istring_default(INDTEXT_DATA * data_list, unsigned indtext_by_istring_default(
const char *search_name, unsigned default_index); INDTEXT_DATA * data_list,
const char *search_name,
unsigned default_index);
/* for a given index, return the matching string, /* for a given index, return the matching string,
or NULL if not found */ or NULL if not found */
const char *indtext_by_index(INDTEXT_DATA * data_list, unsigned index); const char *indtext_by_index(
INDTEXT_DATA * data_list,
unsigned index);
/* for a given index, return the matching string, /* for a given index, return the matching string,
or default_name if not found */ or default_name if not found */
const char *indtext_by_index_default(INDTEXT_DATA * data_list, const char *indtext_by_index_default(
unsigned index, const char *default_name); INDTEXT_DATA * data_list,
unsigned index,
const char *default_name);
/* for a given index, return the matching string, /* for a given index, return the matching string,
or default_name if not found. or default_name if not found.
if the index is before the split, if the index is before the split,
the before_split_default_name is used */ the before_split_default_name is used */
const char *indtext_by_index_split_default(INDTEXT_DATA * data_list, const char *indtext_by_index_split_default(
INDTEXT_DATA * data_list,
int index, int index,
int split_index, int split_index,
const char *before_split_default_name, const char *default_name); const char *before_split_default_name,
const char *default_name);
/* returns the number of elements in the list */ /* returns the number of elements in the list */
unsigned indtext_count(INDTEXT_DATA * data_list); unsigned indtext_count(
INDTEXT_DATA * data_list);
#ifdef TEST #ifdef TEST
#include "ctest.h" #include "ctest.h"
void testIndexText(Test * pTest); void testIndexText(
Test * pTest);
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
bacnet-stack/include/keylist.h
+30 -11
View File
@@ -54,40 +54,59 @@ typedef struct Keylist {
typedef KEYLIST_TYPE *OS_Keylist; typedef KEYLIST_TYPE *OS_Keylist;
/* returns head of the list or NULL on failure. */ /* returns head of the list or NULL on failure. */
OS_Keylist Keylist_Create(void); OS_Keylist Keylist_Create(
void);
/* delete specified list */ /* delete specified list */
/* note: you should pop all the nodes off the list first. */ /* note: you should pop all the nodes off the list first. */
void Keylist_Delete(OS_Keylist list); void Keylist_Delete(
OS_Keylist list);
/* inserts a node into its sorted position */ /* inserts a node into its sorted position */
/* returns the index where it was added */ /* returns the index where it was added */
int Keylist_Data_Add(OS_Keylist list, KEY key, void *data); int Keylist_Data_Add(
OS_Keylist list,
KEY key,
void *data);
/* deletes a node specified by its key */ /* deletes a node specified by its key */
/* returns the data from the node */ /* returns the data from the node */
void *Keylist_Data_Delete(OS_Keylist list, KEY key); void *Keylist_Data_Delete(
OS_Keylist list,
KEY key);
/* deletes a node specified by its index */ /* deletes a node specified by its index */
/* returns the data from the node */ /* returns the data from the node */
void *Keylist_Data_Delete_By_Index(OS_Keylist list, int index); void *Keylist_Data_Delete_By_Index(
OS_Keylist list,
int index);
/* returns the data from last node, and removes it from the list */ /* returns the data from last node, and removes it from the list */
void *Keylist_Data_Pop(OS_Keylist list); void *Keylist_Data_Pop(
OS_Keylist list);
/* returns the data from the node specified by key */ /* returns the data from the node specified by key */
void *Keylist_Data(OS_Keylist list, KEY key); void *Keylist_Data(
OS_Keylist list,
KEY key);
/* returns the data specified by key */ /* returns the data specified by key */
void *Keylist_Data_Index(OS_Keylist list, int index); void *Keylist_Data_Index(
OS_Keylist list,
int index);
/* return the key at the given index */ /* return the key at the given index */
KEY Keylist_Key(OS_Keylist list, int index); KEY Keylist_Key(
OS_Keylist list,
int index);
/* returns the next empty key from the list */ /* returns the next empty key from the list */
KEY Keylist_Next_Empty_Key(OS_Keylist list, KEY key); KEY Keylist_Next_Empty_Key(
OS_Keylist list,
KEY key);
/* returns the number of items in the list */ /* returns the number of items in the list */
int Keylist_Count(OS_Keylist list); int Keylist_Count(
OS_Keylist list);
#endif #endif
bacnet-stack/include/lc.h
+20 -10
View File
@@ -39,25 +39,35 @@ extern "C" {
const int **pRequired, const int **pRequired,
const int **pOptional, const int **pOptional,
const int **pProprietary); const int **pProprietary);
void Load_Control_State_Machine_Handler(void); void Load_Control_State_Machine_Handler(
void);
bool Load_Control_Valid_Instance(uint32_t object_instance); bool Load_Control_Valid_Instance(
unsigned Load_Control_Count(void); uint32_t object_instance);
uint32_t Load_Control_Index_To_Instance(unsigned index); unsigned Load_Control_Count(
char *Load_Control_Name(uint32_t object_instance); void);
uint32_t Load_Control_Index_To_Instance(
unsigned index);
char *Load_Control_Name(
uint32_t object_instance);
int Load_Control_Encode_Property_APDU(uint8_t * apdu, int Load_Control_Encode_Property_APDU(
uint8_t * apdu,
uint32_t object_instance, uint32_t object_instance,
BACNET_PROPERTY_ID property, BACNET_PROPERTY_ID property,
int32_t array_index, int32_t array_index,
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code); BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code);
bool Load_Control_Write_Property(BACNET_WRITE_PROPERTY_DATA * wp_data, bool Load_Control_Write_Property(
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code); BACNET_WRITE_PROPERTY_DATA * wp_data,
BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code);
#ifdef TEST #ifdef TEST
#include "ctest.h" #include "ctest.h"
void testLoadControl(Test * pTest); void testLoadControl(
Test * pTest);
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
bacnet-stack/include/lo.h
+28 -15
View File
@@ -35,32 +35,45 @@
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
bool Analog_Output_Valid_Instance(uint32_t object_instance); bool Analog_Output_Valid_Instance(
unsigned Lighting_Output_Count(void); uint32_t object_instance);
uint32_t Lighting_Output_Index_To_Instance(unsigned index); unsigned Lighting_Output_Count(
char *Lighting_Output_Name(uint32_t object_instance); void);
float Lighting_Output_Present_Value(uint32_t object_instance); uint32_t Lighting_Output_Index_To_Instance(
unsigned Lighting_Output_Present_Value_Priority(uint32_t unsigned index);
object_instance); char *Lighting_Output_Name(
bool Lighting_Output_Present_Value_Set(uint32_t object_instance, uint32_t object_instance);
float value, unsigned priority); float Lighting_Output_Present_Value(
bool Lighting_Output_Present_Value_Relinquish(uint32_t object_instance, uint32_t object_instance);
unsigned Lighting_Output_Present_Value_Priority(
uint32_t object_instance);
bool Lighting_Output_Present_Value_Set(
uint32_t object_instance,
float value,
unsigned priority);
bool Lighting_Output_Present_Value_Relinquish(
uint32_t object_instance,
int priority); int priority);
/* ReadProperty service support */ /* ReadProperty service support */
int Lighting_Output_Encode_Property_APDU(uint8_t * apdu, int Lighting_Output_Encode_Property_APDU(
uint8_t * apdu,
uint32_t object_instance, uint32_t object_instance,
BACNET_PROPERTY_ID property, BACNET_PROPERTY_ID property,
int32_t array_index, int32_t array_index,
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code); BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code);
/* WriteProperty service support */ /* WriteProperty service support */
bool Lighting_Output_Write_Property(BACNET_WRITE_PROPERTY_DATA * wp_data, bool Lighting_Output_Write_Property(
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code); BACNET_WRITE_PROPERTY_DATA * wp_data,
BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code);
#ifdef TEST #ifdef TEST
#include "ctest.h" #include "ctest.h"
void testLightingOutput(Test * pTest); void testLightingOutput(
Test * pTest);
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
bacnet-stack/include/lsp.h
+17 -9
View File
@@ -39,24 +39,32 @@ extern "C" {
const int **pRequired, const int **pRequired,
const int **pOptional, const int **pOptional,
const int **pProprietary); const int **pProprietary);
bool Life_Safety_Point_Valid_Instance(uint32_t object_instance); bool Life_Safety_Point_Valid_Instance(
unsigned Life_Safety_Point_Count(void); uint32_t object_instance);
uint32_t Life_Safety_Point_Index_To_Instance(unsigned index); unsigned Life_Safety_Point_Count(
char *Life_Safety_Point_Name(uint32_t object_instance); void);
uint32_t Life_Safety_Point_Index_To_Instance(
unsigned index);
char *Life_Safety_Point_Name(
uint32_t object_instance);
int Life_Safety_Point_Encode_Property_APDU(uint8_t * apdu, int Life_Safety_Point_Encode_Property_APDU(
uint8_t * apdu,
uint32_t object_instance, uint32_t object_instance,
BACNET_PROPERTY_ID property, BACNET_PROPERTY_ID property,
int32_t array_index, int32_t array_index,
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code); BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code);
bool Life_Safety_Point_Write_Property(BACNET_WRITE_PROPERTY_DATA * bool Life_Safety_Point_Write_Property(
wp_data, BACNET_ERROR_CLASS * error_class, BACNET_WRITE_PROPERTY_DATA * wp_data,
BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code); BACNET_ERROR_CODE * error_code);
#ifdef TEST #ifdef TEST
#include "ctest.h" #include "ctest.h"
void testLifeSafetyPoint(Test * pTest); void testLifeSafetyPoint(
Test * pTest);
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
bacnet-stack/include/mso.h
+17 -9
View File
@@ -39,24 +39,32 @@ extern "C" {
const int **pRequired, const int **pRequired,
const int **pOptional, const int **pOptional,
const int **pProprietary); const int **pProprietary);
bool Multistate_Output_Valid_Instance(uint32_t object_instance); bool Multistate_Output_Valid_Instance(
unsigned Multistate_Output_Count(void); uint32_t object_instance);
uint32_t Multistate_Output_Index_To_Instance(unsigned index); unsigned Multistate_Output_Count(
char *Multistate_Output_Name(uint32_t object_instance); void);
uint32_t Multistate_Output_Index_To_Instance(
unsigned index);
char *Multistate_Output_Name(
uint32_t object_instance);
int Multistate_Output_Encode_Property_APDU(uint8_t * apdu, int Multistate_Output_Encode_Property_APDU(
uint8_t * apdu,
uint32_t object_instance, uint32_t object_instance,
BACNET_PROPERTY_ID property, BACNET_PROPERTY_ID property,
int32_t array_index, int32_t array_index,
BACNET_ERROR_CLASS * error_class, BACNET_ERROR_CODE * error_code); BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code);
bool Multistate_Output_Write_Property(BACNET_WRITE_PROPERTY_DATA * bool Multistate_Output_Write_Property(
wp_data, BACNET_ERROR_CLASS * error_class, BACNET_WRITE_PROPERTY_DATA * wp_data,
BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code); BACNET_ERROR_CODE * error_code);
#ifdef TEST #ifdef TEST
#include "ctest.h" #include "ctest.h"
void testMultistateOutput(Test * pTest); void testMultistateOutput(
Test * pTest);
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
bacnet-stack/include/mstp.h
+14 -6
View File
@@ -194,8 +194,12 @@ struct mstp_port_struct_t {
/* denote intervals between N-1 and N */ /* denote intervals between N-1 and N */
/* Note: done here as functions - put into timer task or ISR /* Note: done here as functions - put into timer task or ISR
so that you can be atomic on 8 bit microcontrollers */ so that you can be atomic on 8 bit microcontrollers */
uint16_t (*SilenceTimer)(void); uint16_t(
void (*SilenceTimerReset)(void); *SilenceTimer) (
void);
void (
*SilenceTimerReset) (
void);
/* A timer used to measure and generate Reply Postponed frames. It is */ /* A timer used to measure and generate Reply Postponed frames. It is */
/* incremented by a timer process and is cleared by the Master Node State */ /* incremented by a timer process and is cleared by the Master Node State */
@@ -258,14 +262,18 @@ struct mstp_port_struct_t {
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
void MSTP_Init(volatile struct mstp_port_struct_t *mstp_port); void MSTP_Init(
void MSTP_Receive_Frame_FSM(volatile struct mstp_port_struct_t volatile struct mstp_port_struct_t *mstp_port);
void MSTP_Receive_Frame_FSM(
volatile struct mstp_port_struct_t
*mstp_port); *mstp_port);
bool MSTP_Master_Node_FSM(volatile struct mstp_port_struct_t bool MSTP_Master_Node_FSM(
volatile struct mstp_port_struct_t
*mstp_port); *mstp_port);
/* returns true if line is active */ /* returns true if line is active */
bool MSTP_Line_Active(volatile struct mstp_port_struct_t *mstp_port); bool MSTP_Line_Active(
volatile struct mstp_port_struct_t *mstp_port);
uint16_t MSTP_Create_Frame( uint16_t MSTP_Create_Frame(
uint8_t * buffer, /* where frame is loaded */ uint8_t * buffer, /* where frame is loaded */
bacnet-stack/include/mstptext.h
+6 -4
View File
@@ -39,12 +39,14 @@
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
const char *mstptext_receive_state(int index); const char *mstptext_receive_state(
const char *mstptext_master_state(int index); int index);
const char *mstptext_frame_type(int index); const char *mstptext_master_state(
int index);
const char *mstptext_frame_type(
int index);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif #endif
bacnet-stack/include/npdu.h
+20 -9
View File
@@ -56,22 +56,33 @@ typedef struct bacnet_npdu_data_t {
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
uint8_t npdu_encode_max_seg_max_apdu(int max_segs, int max_apdu); uint8_t npdu_encode_max_seg_max_apdu(
int max_segs,
int max_apdu);
int npdu_encode_pdu(uint8_t * npdu, int npdu_encode_pdu(
uint8_t * npdu,
BACNET_ADDRESS * dest, BACNET_ADDRESS * dest,
BACNET_ADDRESS * src, BACNET_NPDU_DATA * npdu_data); BACNET_ADDRESS * src,
BACNET_NPDU_DATA * npdu_data);
void npdu_encode_npdu_data(BACNET_NPDU_DATA * npdu, void npdu_encode_npdu_data(
bool data_expecting_reply, BACNET_MESSAGE_PRIORITY priority); BACNET_NPDU_DATA * npdu,
bool data_expecting_reply,
BACNET_MESSAGE_PRIORITY priority);
void npdu_copy_data(BACNET_NPDU_DATA * dest, BACNET_NPDU_DATA * src); void npdu_copy_data(
BACNET_NPDU_DATA * dest,
BACNET_NPDU_DATA * src);
int npdu_decode(uint8_t * npdu, int npdu_decode(
uint8_t * npdu,
BACNET_ADDRESS * dest, BACNET_ADDRESS * dest,
BACNET_ADDRESS * src, BACNET_NPDU_DATA * npdu_data); BACNET_ADDRESS * src,
BACNET_NPDU_DATA * npdu_data);
void npdu_handler(BACNET_ADDRESS * src, /* source address */ void npdu_handler(
BACNET_ADDRESS * src, /* source address */
uint8_t * pdu, /* PDU data */ uint8_t * pdu, /* PDU data */
uint16_t pdu_len); /* length PDU */ uint16_t pdu_len); /* length PDU */
bacnet-stack/include/rd.h
+8 -4
View File
@@ -42,26 +42,30 @@ extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
/* encode service */ /* encode service */
int rd_encode_apdu(uint8_t * apdu, int rd_encode_apdu(
uint8_t * apdu,
uint8_t invoke_id, uint8_t invoke_id,
BACNET_REINITIALIZED_STATE state, BACNET_REINITIALIZED_STATE state,
BACNET_CHARACTER_STRING * password); BACNET_CHARACTER_STRING * password);
/* decode the service request only */ /* decode the service request only */
int rd_decode_service_request(uint8_t * apdu, int rd_decode_service_request(
uint8_t * apdu,
unsigned apdu_len, unsigned apdu_len,
BACNET_REINITIALIZED_STATE * state, BACNET_REINITIALIZED_STATE * state,
BACNET_CHARACTER_STRING * password); BACNET_CHARACTER_STRING * password);
#ifdef TEST #ifdef TEST
#include "ctest.h" #include "ctest.h"
int rd_decode_apdu(uint8_t * apdu, int rd_decode_apdu(
uint8_t * apdu,
unsigned apdu_len, unsigned apdu_len,
uint8_t * invoke_id, uint8_t * invoke_id,
BACNET_REINITIALIZED_STATE * state, BACNET_REINITIALIZED_STATE * state,
BACNET_CHARACTER_STRING * password); BACNET_CHARACTER_STRING * password);
void test_ReinitializeDevice(Test * pTest); void test_ReinitializeDevice(
Test * pTest);
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
bacnet-stack/include/reject.h
+16 -7
View File
@@ -41,17 +41,26 @@
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
int reject_encode_apdu(uint8_t * apdu, int reject_encode_apdu(
uint8_t invoke_id, uint8_t reject_reason); uint8_t * apdu,
uint8_t invoke_id,
uint8_t reject_reason);
int reject_decode_service_request(uint8_t * apdu, int reject_decode_service_request(
unsigned apdu_len, uint8_t * invoke_id, uint8_t * reject_reason); uint8_t * apdu,
unsigned apdu_len,
uint8_t * invoke_id,
uint8_t * reject_reason);
#ifdef TEST #ifdef TEST
int reject_decode_apdu(uint8_t * apdu, int reject_decode_apdu(
unsigned apdu_len, uint8_t * invoke_id, uint8_t * reject_reason); uint8_t * apdu,
unsigned apdu_len,
uint8_t * invoke_id,
uint8_t * reject_reason);
void testReject(Test * pTest); void testReject(
Test * pTest);
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
bacnet-stack/include/ringbuf.h
+10 -5
View File
@@ -55,12 +55,17 @@ typedef struct ring_buffer_t RING_BUFFER;
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
bool Ringbuf_Empty(RING_BUFFER const *b); bool Ringbuf_Empty(
char *Ringbuf_Get_Front(RING_BUFFER const *b); RING_BUFFER const *b);
char *Ringbuf_Pop_Front(RING_BUFFER * b); char *Ringbuf_Get_Front(
bool Ringbuf_Put(RING_BUFFER * b, /* ring buffer structure */ RING_BUFFER const *b);
char *Ringbuf_Pop_Front(
RING_BUFFER * b);
bool Ringbuf_Put(
RING_BUFFER * b, /* ring buffer structure */
char *data_element); /* one element to add to the ring */ char *data_element); /* one element to add to the ring */
void Ringbuf_Init(RING_BUFFER * b, /* ring buffer structure */ void Ringbuf_Init(
RING_BUFFER * b, /* ring buffer structure */
char *data, /* data block or array of data */ char *data, /* data block or array of data */
unsigned element_size, /* size of one element in the data block */ unsigned element_size, /* size of one element in the data block */
unsigned element_count); /* number of elements in the data block */ unsigned element_count); /* number of elements in the data block */

Some files were not shown because too many files have changed in this diff Show More