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

Fixed Lighting Output object lighting command decoding and ramp operations

Browse Source
This commit is contained in:
Steve Karg
2024-08-07 11:07:23 -05:00
parent 350bbe3331
commit 18d4b47b2c
2 changed files with 98 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bacnet/lighting.c
+6 -5
View File
@@ -172,8 +172,9 @@ int lighting_command_decode(
if (len > 0) {
apdu_len += len;
if (unsigned_value <= BACNET_LIGHTS_PROPRIETARY_LAST) {
operation = (BACNET_LIGHTING_OPERATION)enum_value;
if (data) {
data->operation = (BACNET_LIGHTING_OPERATION)enum_value;
data->operation = operation;
}
} else {
return BACNET_STATUS_ERROR;
@@ -493,7 +494,7 @@ int lighting_command_to_ascii(
priority = value->priority;
}
len = snprintf(buf, buf_size, "%u,%f,%lu,%u", value->operation,
(double)target_level, (unsigned long)fade_time,
(double)target_level, (unsigned long)fade_time,
(unsigned)priority);
break;
case BACNET_LIGHTS_RAMP_TO:
@@ -507,7 +508,7 @@ int lighting_command_to_ascii(
priority = value->priority;
}
len = snprintf(buf, buf_size, "%u,%f,%f,%u",
(unsigned)value->operation, (double)target_level,
(unsigned)value->operation, (double)target_level,
(double)ramp_rate, (unsigned)priority);
break;
case BACNET_LIGHTS_STEP_UP:
@@ -521,7 +522,7 @@ int lighting_command_to_ascii(
priority = value->priority;
}
len = snprintf(buf, buf_size, "%u,%f,%u",
(unsigned)value->operation, (double)step_increment,
(unsigned)value->operation, (double)step_increment,
(unsigned)priority);
break;
case BACNET_LIGHTS_WARN:
@@ -945,7 +946,7 @@ bool xy_color_same(BACNET_XY_COLOR *value1, BACNET_XY_COLOR *value2)
int xy_color_to_ascii(const BACNET_XY_COLOR *value, char *buf, size_t buf_size)
{
return snprintf(
buf, buf_size, "(%f,%f)", (double)value->x_coordinate,
buf, buf_size, "(%f,%f)", (double)value->x_coordinate,
(double)value->x_coordinate);
}