Ran the fixup script on the file.
This commit is contained in:
@@ -115,15 +115,15 @@ void handler_write_property_multiple(
|
|||||||
len = wpm_decode_object_property(&service_request[decode_len],
|
len = wpm_decode_object_property(&service_request[decode_len],
|
||||||
service_len - decode_len, &wp_data);
|
service_len - decode_len, &wp_data);
|
||||||
if (len > 0)
|
if (len > 0)
|
||||||
{
|
{
|
||||||
decode_len += len;
|
decode_len += len;
|
||||||
#if PRINT_ENABLED
|
#if PRINT_ENABLED
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
"WPM: type=%lu instance=%lu property=%lu priority=%lu index=%ld\n",
|
"WPM: type=%lu instance=%lu property=%lu priority=%lu index=%ld\n",
|
||||||
(unsigned long) wp_data.object_type,
|
(unsigned long) wp_data.object_type,
|
||||||
(unsigned long) wp_data.object_instance,
|
(unsigned long) wp_data.object_instance,
|
||||||
(unsigned long) wp_data.object_property,
|
(unsigned long) wp_data.object_property,
|
||||||
(unsigned long) wp_data.priority, (long) wp_data.array_index);
|
(unsigned long) wp_data.priority, (long) wp_data.array_index);
|
||||||
#endif
|
#endif
|
||||||
if (Device_Write_Property(&wp_data) == false)
|
if (Device_Write_Property(&wp_data) == false)
|
||||||
{
|
{
|
||||||
@@ -182,17 +182,17 @@ void handler_write_property_multiple(
|
|||||||
|
|
||||||
if (error == false) {
|
if (error == false) {
|
||||||
apdu_len = wpm_ack_encode_apdu_init(&Handler_Transmit_Buffer[npdu_len],
|
apdu_len = wpm_ack_encode_apdu_init(&Handler_Transmit_Buffer[npdu_len],
|
||||||
service_data->invoke_id);
|
service_data->invoke_id);
|
||||||
#if PRINT_ENABLED
|
#if PRINT_ENABLED
|
||||||
fprintf(stderr, "WPM: Sending Simple Ack!\n");
|
fprintf(stderr, "WPM: Sending Simple Ack!\n");
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
apdu_len = wpm_error_ack_encode_apdu(&Handler_Transmit_Buffer[npdu_len],
|
apdu_len = wpm_error_ack_encode_apdu(&Handler_Transmit_Buffer[npdu_len],
|
||||||
service_data->invoke_id, &wp_data);
|
service_data->invoke_id, &wp_data);
|
||||||
#if PRINT_ENABLED
|
#if PRINT_ENABLED
|
||||||
fprintf(stderr, "WPM: Sending Error!\n");
|
fprintf(stderr, "WPM: Sending Error!\n");
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
WPM_ABORT:
|
WPM_ABORT:
|
||||||
|
|||||||
+883
-883
File diff suppressed because it is too large
Load Diff
@@ -71,30 +71,30 @@ typedef struct BACnet_Destination {
|
|||||||
uint8_t Transitions;
|
uint8_t Transitions;
|
||||||
bool ConfirmedNotify;
|
bool ConfirmedNotify;
|
||||||
} BACNET_DESTINATION;
|
} BACNET_DESTINATION;
|
||||||
|
|
||||||
|
|
||||||
/* Structure containing configuration for a Notification Class */
|
/* Structure containing configuration for a Notification Class */
|
||||||
typedef struct Notification_Class_info {
|
typedef struct Notification_Class_info {
|
||||||
uint8_t Priority[3]; /* BACnetARRAY[3] of Unsigned */
|
uint8_t Priority[3]; /* BACnetARRAY[3] of Unsigned */
|
||||||
uint8_t Ack_Required; /* BACnetEventTransitionBits */
|
uint8_t Ack_Required; /* BACnetEventTransitionBits */
|
||||||
BACNET_DESTINATION Recipient_List[NC_MAX_RECIPIENTS]; /* List of BACnetDestination */
|
BACNET_DESTINATION Recipient_List[NC_MAX_RECIPIENTS]; /* List of BACnetDestination */
|
||||||
} NOTIFICATION_CLASS_INFO;
|
} NOTIFICATION_CLASS_INFO;
|
||||||
|
|
||||||
|
|
||||||
/* Indicates whether the transaction has been confirmed */
|
/* Indicates whether the transaction has been confirmed */
|
||||||
typedef struct Acked_info {
|
typedef struct Acked_info {
|
||||||
bool bIsAcked; /* true when transitions is acked */
|
bool bIsAcked; /* true when transitions is acked */
|
||||||
BACNET_DATE_TIME Time_Stamp;/* time stamp of when a alarm was generated */
|
BACNET_DATE_TIME Time_Stamp;/* time stamp of when a alarm was generated */
|
||||||
} ACKED_INFO;
|
} ACKED_INFO;
|
||||||
|
|
||||||
|
|
||||||
/* Information needed to send AckNotification */
|
/* Information needed to send AckNotification */
|
||||||
typedef struct Ack_Notification {
|
typedef struct Ack_Notification {
|
||||||
bool bSendAckNotify; /* true if need to send AckNotification */
|
bool bSendAckNotify; /* true if need to send AckNotification */
|
||||||
uint8_t EventState;
|
uint8_t EventState;
|
||||||
} ACK_NOTIFICATION;
|
} ACK_NOTIFICATION;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void Notification_Class_Property_Lists(
|
void Notification_Class_Property_Lists(
|
||||||
const int **pRequired,
|
const int **pRequired,
|
||||||
@@ -117,9 +117,9 @@ typedef struct Ack_Notification {
|
|||||||
BACNET_READ_PROPERTY_DATA * rpdata);
|
BACNET_READ_PROPERTY_DATA * rpdata);
|
||||||
|
|
||||||
bool Notification_Class_Write_Property(
|
bool Notification_Class_Write_Property(
|
||||||
BACNET_WRITE_PROPERTY_DATA * wp_data);
|
BACNET_WRITE_PROPERTY_DATA * wp_data);
|
||||||
|
|
||||||
void Notification_Class_Get_Priorities(
|
void Notification_Class_Get_Priorities(
|
||||||
uint32_t Object_Instance, uint32_t *pPriorityArray);
|
uint32_t Object_Instance, uint32_t *pPriorityArray);
|
||||||
|
|
||||||
void Notification_Class_common_reporting_function(
|
void Notification_Class_common_reporting_function(
|
||||||
|
|||||||
Reference in New Issue
Block a user