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

fixed bug: Writing of property NotifyType in AnalogValue - ID: 3541355

Browse Source
This commit is contained in:
skarg
2012-07-08 15:27:15 +00:00
parent 7514150f7d
commit d43146c7e3
2 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/object/ai.c
+12 -6
View File
@@ -630,12 +630,18 @@ bool Analog_Input_Write_Property(
&wp_data->error_class, &wp_data->error_code); &wp_data->error_class, &wp_data->error_code);
if (status) { if (status) {
if (value.type.Bit_String.bits_used > NOTIFY_EVENT) { switch ((BACNET_NOTIFY_TYPE)value.type.Enumerated) {
CurrentAI->Event_Enable = value.type.Enumerated; case NOTIFY_EVENT:
} else { CurrentAI->Notify_Type = 1;
wp_data->error_class = ERROR_CLASS_PROPERTY; break;
wp_data->error_code = ERROR_CODE_VALUE_OUT_OF_RANGE; case NOTIFY_ALARM:
status = false; CurrentAI->Notify_Type = 0;
break;
default:
wp_data->error_class = ERROR_CLASS_PROPERTY;
wp_data->error_code = ERROR_CODE_VALUE_OUT_OF_RANGE;
status = false;
break;
} }
} }
break; break;
bacnet-stack/demo/object/av.c
+12 -6
View File
@@ -728,12 +728,18 @@ bool Analog_Value_Write_Property(
&wp_data->error_class, &wp_data->error_code); &wp_data->error_class, &wp_data->error_code);
if (status) { if (status) {
if (value.type.Bit_String.bits_used > NOTIFY_EVENT) { switch ((BACNET_NOTIFY_TYPE)value.type.Enumerated) {
CurrentAV->Event_Enable = value.type.Enumerated; case NOTIFY_EVENT:
} else { CurrentAV->Notify_Type = 1;
wp_data->error_class = ERROR_CLASS_PROPERTY; break;
wp_data->error_code = ERROR_CODE_VALUE_OUT_OF_RANGE; case NOTIFY_ALARM:
status = false; CurrentAV->Notify_Type = 0;
break;
default:
wp_data->error_class = ERROR_CLASS_PROPERTY;
wp_data->error_code = ERROR_CODE_VALUE_OUT_OF_RANGE;
status = false;
break;
} }
} }
break; break;