mirror/bacnet-stack
1
0
Fork 0
mirror of https://github.com/stargieg/bacnet-stack synced 2025-10-26 23:35:52 +08:00
Code Issues Releases Wiki Activity

fix replase failures

Browse Source
This commit is contained in:
Patrick Grimm 2014-02-24 21:03:59 +01:00
parent 635176f33b
commit 4a586ffa8d
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
demo/object/bo.c
View File

@ -471,7 +471,7 @@ void Binary_Output_Out_Of_Service_Set(
return;
}
uint8_t Binary_Output_Reliabolity(
uint8_t Binary_Output_Reliability(
uint32_t object_instance)
{
BINARY_OUTPUT_DESCR *CurrentBO;
@ -481,13 +481,13 @@ uint8_t Binary_Output_Reliabolity(
if (Binary_Output_Valid_Instance(object_instance)) {
index = Binary_Output_Instance_To_Index(object_instance);
CurrentBO = &BO_Descr[index];
value = CurrentBO->Reliabolity;
value = CurrentBO->Reliability;
}
return value;
}
void Binary_Output_Reliabolity_Set(
void Binary_Output_Reliability_Set(
uint32_t object_instance,
uint8_t value)
{
@ -497,7 +497,7 @@ void Binary_Output_Reliabolity_Set(
if (Binary_Output_Valid_Instance(object_instance)) {
index = Binary_Output_Instance_To_Index(object_instance);
CurrentBO = &BO_Descr[index];
CurrentBO->Reliabolity = value;
CurrentBO->Reliability = value;
}
return;
@ -1054,7 +1054,7 @@ int Binary_Output_Read_Property(
case PROP_RELIABILITY:
apdu_len = encode_application_enumerated(&apdu[0],
CurrentBO->Reliabolity);
CurrentBO->Reliability);
break;
case PROP_PRIORITY_ARRAY:
@ -1417,7 +1417,7 @@ bool Binary_Output_Write_Property(
WPValidateArgType(&value, BACNET_APPLICATION_TAG_ENUMERATED,
&wp_data->error_class, &wp_data->error_code);
if (status) {
CurrentBO->Reliabolity = value.type.Enumerated;
CurrentBO->Reliability = value.type.Enumerated;
}
break;

10
demo/object/bo.h
View File

@ -17,9 +17,9 @@
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABOLITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
* CLAIM, DAMAGES OR OTHER LIABOLITY, WHETHER IN AN ACTION OF CONTRACT,
* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
@ -54,7 +54,7 @@ extern "C" {
unsigned Event_State:3;
bool Out_Of_Service;
bool Change_Of_Value;
uint8_t Reliabolity;
uint8_t Reliability;
bool Disable;
BACNET_CHARACTER_STRING Inactive_Text;
BACNET_CHARACTER_STRING Active_Text;
@ -159,10 +159,10 @@ struct bo_inst_itr_ctx {
uint32_t object_instance,
bool value);
uint8_t Binary_Output_Reliabolity(
uint8_t Binary_Output_Reliability(
uint32_t object_instance);
void Binary_Output_Reliabolity_Set(
void Binary_Output_Reliability_Set(
uint32_t object_instance,
uint8_t value);

10
demo/object/bv.h
View File

@ -17,9 +17,9 @@
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABVLITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
* CLAIM, DAMAGES OR OTHER LIABVLITY, WHETHER IN AN ACTION OF CONTRACT,
* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
@ -54,7 +54,7 @@ extern "C" {
unsigned Event_State:3;
bool Out_Of_Service;
bool Change_Of_Value;
uint8_t Reliabvlity;
uint8_t Reliability;
bool Disable;
BACNET_CHARACTER_STRING Inactive_Text;
BACNET_CHARACTER_STRING Active_Text;
@ -159,10 +159,10 @@ struct bv_inst_itr_ctx {
uint32_t object_instance,
bool value);
uint8_t Binary_Value_Reliabvlity(
uint8_t Binary_Value_Reliability(
uint32_t object_instance);
void Binary_Value_Reliabvlity_Set(
void Binary_Value_Reliability_Set(
uint32_t object_instance,
uint8_t value);