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

Fixed the lighting output objects current priority comparison during lighting commands by using priority 17 (relinquish default) instead of 0. (#1097)

Browse Source
This commit is contained in:
Steve Karg
2025-09-18 10:57:03 -05:00
committed by GitHub
parent e3ef352f2d
commit a7956e6082
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bacnet/basic/object/blo.c
+6 -3
View File
@@ -296,12 +296,12 @@ static int Binary_Lighting_Output_Priority_Array_Encode(
*
* @param object_instance - object-instance number of the object
*
* @return active priority 1..16, or 0 if no priority is active
* @return active priority 1..16, or 17 if no priority is active
*/
static unsigned Present_Value_Priority(const struct object_data *pObject)
{
unsigned p = 0; /* loop counter */
unsigned priority = 0; /* return value */
unsigned p; /* loop counter */
unsigned priority = BACNET_MAX_PRIORITY + 1; /* return value */
for (p = 0; p < BACNET_MAX_PRIORITY; p++) {
if (BIT_CHECK(pObject->Priority_Active_Bits, p)) {
@@ -385,6 +385,9 @@ unsigned Binary_Lighting_Output_Present_Value_Priority(uint32_t object_instance)
pObject = Keylist_Data(Object_List, object_instance);
if (pObject) {
priority = Present_Value_Priority(pObject);
if (priority > BACNET_MAX_PRIORITY) {
priority = 0;
}
}
return priority;
src/bacnet/basic/object/lo.c
+6 -3
View File
@@ -351,12 +351,12 @@ static int Lighting_Output_Priority_Array_Encode(
*
* @param object_instance - object-instance number of the object
*
* @return active priority 1..16, or 0 if no priority is active
* @return active priority 1..16, or 17 if no priority is active
*/
static unsigned Present_Value_Priority(const struct object_data *pObject)
{
unsigned p = 0; /* loop counter */
unsigned priority = 0; /* return value */
unsigned p; /* loop counter */
unsigned priority = BACNET_MAX_PRIORITY + 1; /* return value */
for (p = 0; p < BACNET_MAX_PRIORITY; p++) {
if (BIT_CHECK(pObject->Priority_Active_Bits, p)) {
@@ -448,6 +448,9 @@ unsigned Lighting_Output_Present_Value_Priority(uint32_t object_instance)
pObject = Keylist_Data(Object_List, object_instance);
if (pObject) {
priority = Present_Value_Priority(pObject);
if (priority > BACNET_MAX_PRIORITY) {
priority = 0;
}
}
return priority;