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

Fixed BACnetLightingCommand decode options by setting them. (#830)

Browse Source
This commit is contained in:
Steve Karg
2024-10-25 09:06:47 -05:00
committed by GitHub
parent 3eab5490c5
commit 9397cfaafb
1 changed files with 5 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bacnet/lighting.c
+5 -60
View File
@@ -175,6 +175,11 @@ int lighting_command_decode(
operation = (BACNET_LIGHTING_OPERATION)enum_value; operation = (BACNET_LIGHTING_OPERATION)enum_value;
if (data) { if (data) {
data->operation = operation; data->operation = operation;
data->use_target_level = false;
data->use_ramp_rate = false;
data->use_step_increment = false;
data->use_fade_time = false;
data->use_priority = false;
} }
} else { } else {
return BACNET_STATUS_ERROR; return BACNET_STATUS_ERROR;
@@ -198,10 +203,6 @@ int lighting_command_decode(
data->target_level = real_value; data->target_level = real_value;
data->use_target_level = true; data->use_target_level = true;
} }
} else {
if (data) {
data->use_target_level = false;
}
} }
if ((apdu_size - apdu_len) > 0) { if ((apdu_size - apdu_len) > 0) {
/* Tag 4: fade-time - OPTIONAL */ /* Tag 4: fade-time - OPTIONAL */
@@ -216,10 +217,6 @@ int lighting_command_decode(
} else { } else {
return BACNET_STATUS_ERROR; return BACNET_STATUS_ERROR;
} }
} else {
if (data) {
data->use_fade_time = false;
}
} }
if ((apdu_size - apdu_len) > 0) { if ((apdu_size - apdu_len) > 0) {
/* priority [5] Unsigned (1..16) OPTIONAL */ /* priority [5] Unsigned (1..16) OPTIONAL */
@@ -231,14 +228,6 @@ int lighting_command_decode(
data->priority = (uint8_t)unsigned_value; data->priority = (uint8_t)unsigned_value;
data->use_priority = true; data->use_priority = true;
} }
} else {
if (data) {
data->use_priority = false;
}
}
} else {
if (data) {
data->use_priority = false;
} }
} }
break; break;
@@ -255,10 +244,6 @@ int lighting_command_decode(
data->target_level = real_value; data->target_level = real_value;
data->use_target_level = true; data->use_target_level = true;
} }
} else {
if (data) {
data->use_target_level = false;
}
} }
if ((apdu_size - apdu_len) > 0) { if ((apdu_size - apdu_len) > 0) {
/* ramp-rate [2] REAL (0.1..100.0) OPTIONAL */ /* ramp-rate [2] REAL (0.1..100.0) OPTIONAL */
@@ -270,14 +255,6 @@ int lighting_command_decode(
data->ramp_rate = real_value; data->ramp_rate = real_value;
data->use_ramp_rate = true; data->use_ramp_rate = true;
} }
} else {
if (data) {
data->use_ramp_rate = false;
}
}
} else {
if (data) {
data->use_ramp_rate = false;
} }
} }
if ((apdu_size - apdu_len) > 0) { if ((apdu_size - apdu_len) > 0) {
@@ -290,14 +267,6 @@ int lighting_command_decode(
data->priority = (uint8_t)unsigned_value; data->priority = (uint8_t)unsigned_value;
data->use_priority = true; data->use_priority = true;
} }
} else {
if (data) {
data->use_priority = false;
}
}
} else {
if (data) {
data->use_priority = false;
} }
} }
break; break;
@@ -315,14 +284,6 @@ int lighting_command_decode(
data->step_increment = real_value; data->step_increment = real_value;
data->use_step_increment = true; data->use_step_increment = true;
} }
} else {
if (data) {
data->use_step_increment = false;
}
}
} else {
if (data) {
data->use_step_increment = false;
} }
} }
if ((apdu_size - apdu_len) > 0) { if ((apdu_size - apdu_len) > 0) {
@@ -335,14 +296,6 @@ int lighting_command_decode(
data->priority = (uint8_t)unsigned_value; data->priority = (uint8_t)unsigned_value;
data->use_priority = true; data->use_priority = true;
} }
} else {
if (data) {
data->use_priority = false;
}
}
} else {
if (data) {
data->use_priority = false;
} }
} }
break; break;
@@ -360,14 +313,6 @@ int lighting_command_decode(
data->priority = (uint8_t)unsigned_value; data->priority = (uint8_t)unsigned_value;
data->use_priority = true; data->use_priority = true;
} }
} else {
if (data) {
data->use_priority = false;
}
}
} else {
if (data) {
data->use_priority = false;
} }
} }
break; break;