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

Fixed compilation of unit tests.

Browse Source
This commit is contained in:
skarg
2017-01-01 05:42:55 +00:00
parent e317b253f4
commit 134c628041
6 changed files with 51 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/object/channel.c
+7 -7
View File
@@ -310,7 +310,7 @@ static bool Channel_Reference_List_Member_Valid(
if ((pMember) &&
(pMember->objectIdentifier.instance != BACNET_MAX_INSTANCE) &&
(pMember->deviceIndentifier.instance != BACNET_MAX_INSTANCE)) {
(pMember->deviceIdentifier.instance != BACNET_MAX_INSTANCE)) {
status = true;
}
@@ -475,8 +475,8 @@ unsigned Channel_Reference_List_Member_Local_Add(
member.objectIdentifier.instance = instance;
member.propertyIdentifier = propertyIdentifier;
member.arrayIndex = arrayIndex;
member.deviceIndentifier.type = OBJECT_DEVICE;
member.deviceIndentifier.instance = Device_Object_Instance_Number();
member.deviceIdentifier.type = OBJECT_DEVICE;
member.deviceIdentifier.instance = Device_Object_Instance_Number();
return Channel_Reference_List_Member_Element_Add(
object_instance,
@@ -1219,8 +1219,8 @@ static bool Channel_Write_Members(
we would need to update all channels when our device ID
changed. Instead, we'll just screen when members are
set. */
if ((pMember->deviceIndentifier.type == OBJECT_DEVICE) &&
(pMember->deviceIndentifier.instance != BACNET_MAX_INSTANCE) &&
if ((pMember->deviceIdentifier.type == OBJECT_DEVICE) &&
(pMember->deviceIdentifier.instance != BACNET_MAX_INSTANCE) &&
(pMember->objectIdentifier.instance != BACNET_MAX_INSTANCE)) {
wp_data.object_type = pMember->objectIdentifier.type;
wp_data.object_instance = pMember->objectIdentifier.instance;
@@ -1695,9 +1695,9 @@ void Channel_Init(void)
Channel[i].Members[m].objectIdentifier.instance = i+1;
Channel[i].Members[m].propertyIdentifier = PROP_LIGHTING_COMMAND;
Channel[i].Members[m].arrayIndex = BACNET_ARRAY_ALL;
Channel[i].Members[m].deviceIndentifier.type =
Channel[i].Members[m].deviceIdentifier.type =
OBJECT_DEVICE;
Channel[i].Members[m].deviceIndentifier.instance = 0;
Channel[i].Members[m].deviceIdentifier.instance = 0;
}
Channel[i].Number = 0;
for (g = 0; g < CONTROL_GROUPS_MAX; g++) {
bacnet-stack/demo/object/trendlog.c
+3 -3
View File
@@ -229,9 +229,9 @@ void Trend_Log_Init(
LogInfo[iLog].ulRecordCount = TL_MAX_ENTRIES;
LogInfo[iLog].ulTotalRecordCount = 10000;
LogInfo[iLog].Source.deviceIndentifier.instance =
LogInfo[iLog].Source.deviceIdentifier.instance =
Device_Object_Instance_Number();
LogInfo[iLog].Source.deviceIndentifier.type = OBJECT_DEVICE;
LogInfo[iLog].Source.deviceIdentifier.type = OBJECT_DEVICE;
LogInfo[iLog].Source.objectIdentifier.instance = iLog;
LogInfo[iLog].Source.objectIdentifier.type = OBJECT_ANALOG_INPUT;
LogInfo[iLog].Source.arrayIndex = BACNET_ARRAY_ALL;
@@ -713,7 +713,7 @@ bool Trend_Log_Write_Property(
}
// We only support references to objects in ourself for now
if((TempSource.deviceIndentifier.type == OBJECT_DEVICE) && (TempSource.deviceIndentifier.instance != Device_Object_Instance_Number()))
if((TempSource.deviceIdentifier.type == OBJECT_DEVICE) && (TempSource.deviceIdentifier.instance != Device_Object_Instance_Number()))
{
wp_data->error_class = ERROR_CLASS_PROPERTY;
wp_data->error_code = ERROR_CODE_OPTIONAL_FUNCTIONALITY_NOT_SUPPORTED;