From a8555ef1960861fc80f6279afb822797bb67dda3 Mon Sep 17 00:00:00 2001 From: skarg Date: Tue, 17 Jul 2007 03:02:25 +0000 Subject: [PATCH] Integrating the ReadPropertyMultiple handler - not working yet. --- bacnet-stack/demo/handler/h_rpm.c | 20 ++++++++++++++++---- bacnet-stack/demo/object/device.c | 6 ++++++ bacnet-stack/doc/RPM-Handler.flw | Bin 0 -> 6852 bytes 3 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 bacnet-stack/doc/RPM-Handler.flw diff --git a/bacnet-stack/demo/handler/h_rpm.c b/bacnet-stack/demo/handler/h_rpm.c index 8bdc0da5..de3d7ff7 100644 --- a/bacnet-stack/demo/handler/h_rpm.c +++ b/bacnet-stack/demo/handler/h_rpm.c @@ -96,19 +96,27 @@ void handler_read_property_multiple(uint8_t * service_request, uint16_t service_ /* bad decoding - send an abort */ if (service_len == 0) { - apdu_len = abort_encode_apdu(&Handler_Transmit_Buffer[npdu_len], service_data->invoke_id, ABORT_REASON_OTHER, true); + apdu_len = abort_encode_apdu( + &Handler_Transmit_Buffer[npdu_len], + service_data->invoke_id, + ABORT_REASON_OTHER, true); #if PRINT_ENABLED printf("RPM: Sending Abort!\r\n"); #endif } else if (service_data->segmented_message) { - apdu_len = abort_encode_apdu(&Handler_Transmit_Buffer[npdu_len], service_data->invoke_id, ABORT_REASON_SEGMENTATION_NOT_SUPPORTED, true); + apdu_len = abort_encode_apdu( + &Handler_Transmit_Buffer[npdu_len], + service_data->invoke_id, + ABORT_REASON_SEGMENTATION_NOT_SUPPORTED, true); #if PRINT_ENABLED printf("RPM: Sending Abort!\r\n"); #endif } else { /* decode apdu request & encode apdu reply encode complex ack, invoke id, service choice */ - apdu_len = rpm_ack_encode_apdu_init(&Handler_Transmit_Buffer[npdu_len], service_data->invoke_id); + apdu_len = rpm_ack_encode_apdu_init( + &Handler_Transmit_Buffer[npdu_len], + service_data->invoke_id); do { len = rpm_ack_decode_object_id( @@ -360,7 +368,11 @@ void handler_read_property_multiple(uint8_t * service_request, uint16_t service_ if (!error && property_found) { len = encode_closing_tag(&Temp_Buf[0], 4); if (!copy_apdu_data_buffer(&apdu_len, len, npdu_len)) { - apdu_len = abort_encode_apdu(&Handler_Transmit_Buffer[npdu_len], service_data->invoke_id, ABORT_REASON_SEGMENTATION_NOT_SUPPORTED, true); + apdu_len = abort_encode_apdu( + &Handler_Transmit_Buffer[npdu_len], + service_data->invoke_id, + ABORT_REASON_SEGMENTATION_NOT_SUPPORTED, + true); break; } } else { diff --git a/bacnet-stack/demo/object/device.c b/bacnet-stack/demo/object/device.c index 40f9a914..1803be80 100644 --- a/bacnet-stack/demo/object/device.c +++ b/bacnet-stack/demo/object/device.c @@ -78,6 +78,12 @@ static int Device_Properties_Required[] = static int Device_Properties_Optional[] = { + PROP_DESCRIPTION, + PROP_LOCAL_TIME, + PROP_UTC_OFFSET, + PROP_LOCAL_DATE, + PROP_DAYLIGHT_SAVINGS_STATUS, + PROP_PROTOCOL_CONFORMANCE_CLASS, -1 }; diff --git a/bacnet-stack/doc/RPM-Handler.flw b/bacnet-stack/doc/RPM-Handler.flw new file mode 100644 index 0000000000000000000000000000000000000000..e77902840b3c089a30b6f362333ef05e17b2cc9e GIT binary patch literal 6852 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 literal 0 HcmV?d00001