From e19cc0be1ec7f0c904f17a3a20135598fe19f3a0 Mon Sep 17 00:00:00 2001 From: Steve Karg Date: Thu, 4 Apr 2024 17:09:51 -0500 Subject: [PATCH] Added API for multistate number-of-states --- src/bacnet/basic/object/ms-input.c | 2 +- src/bacnet/basic/object/ms-input.h | 3 +++ src/bacnet/basic/object/mso.c | 2 +- src/bacnet/basic/object/mso.h | 7 +++---- src/bacnet/basic/object/msv.c | 2 +- src/bacnet/basic/object/msv.h | 3 +++ 6 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/bacnet/basic/object/ms-input.c b/src/bacnet/basic/object/ms-input.c index a5f75b02..d127d9b2 100644 --- a/src/bacnet/basic/object/ms-input.c +++ b/src/bacnet/basic/object/ms-input.c @@ -193,7 +193,7 @@ static const char *state_name_by_index(const char *state_names, unsigned index) * @param object_instance - object-instance number of the object * @return number of states 1..N */ -static uint32_t Multistate_Input_Max_States(uint32_t object_instance) +uint32_t Multistate_Input_Max_States(uint32_t object_instance) { uint32_t count = 0; struct object_data *pObject; diff --git a/src/bacnet/basic/object/ms-input.h b/src/bacnet/basic/object/ms-input.h index 4a87dff0..9ac847f0 100644 --- a/src/bacnet/basic/object/ms-input.h +++ b/src/bacnet/basic/object/ms-input.h @@ -132,6 +132,9 @@ extern "C" { uint32_t instance, uint32_t max_states_requested); BACNET_STACK_EXPORT + uint32_t Multistate_Input_Max_States( + uint32_t instance); + BACNET_STACK_EXPORT char *Multistate_Input_State_Text( uint32_t object_instance, uint32_t state_index); diff --git a/src/bacnet/basic/object/mso.c b/src/bacnet/basic/object/mso.c index b23bfc41..4e043ed7 100644 --- a/src/bacnet/basic/object/mso.c +++ b/src/bacnet/basic/object/mso.c @@ -224,7 +224,7 @@ static const char *state_name_by_index(const char *state_names, unsigned index) * @param object_instance - object-instance number of the object * @return number of states */ -static uint32_t Multistate_Output_Max_States(uint32_t object_instance) +uint32_t Multistate_Output_Max_States(uint32_t object_instance) { uint32_t count = 0; struct object_data *pObject; diff --git a/src/bacnet/basic/object/mso.h b/src/bacnet/basic/object/mso.h index 20044cd1..c1890e81 100644 --- a/src/bacnet/basic/object/mso.h +++ b/src/bacnet/basic/object/mso.h @@ -152,13 +152,12 @@ extern "C" { uint32_t instance, uint32_t max_states_requested); BACNET_STACK_EXPORT + uint32_t Multistate_Output_Max_States( + uint32_t instance); + BACNET_STACK_EXPORT char *Multistate_Output_State_Text( uint32_t object_instance, uint32_t state_index); - BACNET_STACK_EXPORT - bool Multistate_Output_State_Text_List_Set( - uint32_t object_instance, - const char *state_text_list); BACNET_STACK_EXPORT BACNET_RELIABILITY Multistate_Output_Reliability( diff --git a/src/bacnet/basic/object/msv.c b/src/bacnet/basic/object/msv.c index 2bd35369..2b683637 100644 --- a/src/bacnet/basic/object/msv.c +++ b/src/bacnet/basic/object/msv.c @@ -195,7 +195,7 @@ static const char *state_name_by_index(const char *state_names, unsigned index) * @param object_instance - object-instance number of the object * @return number of states 1..N */ -static uint32_t Multistate_Value_Max_States(uint32_t object_instance) +uint32_t Multistate_Value_Max_States(uint32_t object_instance) { uint32_t count = 0; struct object_data *pObject; diff --git a/src/bacnet/basic/object/msv.h b/src/bacnet/basic/object/msv.h index 0c4214fc..05590b7f 100644 --- a/src/bacnet/basic/object/msv.h +++ b/src/bacnet/basic/object/msv.h @@ -123,6 +123,9 @@ extern "C" { uint32_t instance, uint32_t max_states_requested); BACNET_STACK_EXPORT + uint32_t Multistate_Value_Max_States( + uint32_t instance); + BACNET_STACK_EXPORT char *Multistate_Value_State_Text( uint32_t object_instance, uint32_t state_index);