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

Fixed Lighting Output object STOP lighting command so that it sets the present-value. (#1101)

Browse Source
This commit is contained in:
Steve Karg
2025-09-18 17:03:08 -05:00
committed by GitHub
parent 6061c36ac2
commit 203cb102e7
2 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+2
View File
@@ -117,6 +117,8 @@ The git repositories are hosted at the following sites:
### Fixed
* Fixed Lighting Output object STOP lighting command so that it sets
the present-value. (#1101)
* Fixed the lighting command RAMP TO ramp rate to always clamp within
0.1 and 100.0 to avoid endless rate of 0.0. (#1100)
* Fixed Lighting Output step operations mixup. (#1099)
src/bacnet/basic/object/lo.c
+24 -3
View File
@@ -1224,6 +1224,16 @@ bool Lighting_Output_Description_Set(
/**
* @brief Set the lighting command if the priority is active
* @details Stops any FADE_TO or RAMP_TO command in progress
* at the specified priority and writes the current value of
* Tracking_Value to that slot in the priority array and sets
* In_Progress to IDLE.
* Cancels any WARN_RELINQUISH or WARN_OFF command in progress
* at the specified priority and cancels the blink-warn egress
* timer. The value in the priority array at the specified
* priority remains unchanged.
* If there is no fade, ramp, or warn command currently executing
* at the specified priority, then this operation is ignored.
* @param object [in] BACnet object instance
* @param priority [in] BACnet priority array value 1..16
*/
@@ -1231,14 +1241,25 @@ static void
Lighting_Command_Stop(struct object_data *pObject, unsigned priority)
{
unsigned current_priority;
float value;
if (!pObject) {
return;
}
current_priority = Present_Value_Priority(pObject);
if (priority <= current_priority) {
/* we have priority - configure the Lighting Command */
lighting_command_stop(&pObject->Lighting_Command);
if (priority == current_priority) {
if ((pObject->Lighting_Command.In_Progress ==
BACNET_LIGHTING_FADE_ACTIVE) ||
(pObject->Lighting_Command.In_Progress ==
BACNET_LIGHTING_RAMP_ACTIVE) ||
(pObject->Lighting_Command.Blink.Duration > 0)) {
/* fade, ramp, or warn command is currently
executing at the specified priority */
value = pObject->Lighting_Command.Tracking_Value;
Present_Value_Set(pObject, value, priority);
/* configure the Lighting Command */
lighting_command_stop(&pObject->Lighting_Command);
}
}
}