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

fix compile errors

Browse Source
This commit is contained in:
cneilson
2012-09-12 08:39:36 +00:00
parent 6386dc8cd8
commit 77ad8cf6f4
3 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/epics/main.c
+2 -2
View File
@@ -1134,8 +1134,8 @@ void PrintHeading(
* and show them * and show them
*/ */
if ((value != NULL) && (value->tag == BACNET_APPLICATION_TAG_BIT_STRING)) { if ((value != NULL) && (value->tag == BACNET_APPLICATION_TAG_BIT_STRING)) {
printf("-- services reported by this device\r\n");
int i, len = bitstring_bits_used(&value->type.Bit_String); int i, len = bitstring_bits_used(&value->type.Bit_String);
printf("-- services reported by this device\r\n");
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
if (bitstring_bit(&value->type.Bit_String, (uint8_t) i)) if (bitstring_bit(&value->type.Bit_String, (uint8_t) i))
printf(" %s\r\n", protocol_services_supported_text(i)); printf(" %s\r\n", protocol_services_supported_text(i));
@@ -1181,8 +1181,8 @@ void PrintHeading(
* and show them * and show them
*/ */
if ((value != NULL) && (value->tag == BACNET_APPLICATION_TAG_BIT_STRING)) { if ((value != NULL) && (value->tag == BACNET_APPLICATION_TAG_BIT_STRING)) {
printf("-- objects reported by this device\r\n");
int i, len = bitstring_bits_used(&value->type.Bit_String); int i, len = bitstring_bits_used(&value->type.Bit_String);
printf("-- objects reported by this device\r\n");
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
if (bitstring_bit(&value->type.Bit_String, (uint8_t) i)) if (bitstring_bit(&value->type.Bit_String, (uint8_t) i))
printf(" %s\r\n", bactext_object_type_name(i)); printf(" %s\r\n", bactext_object_type_name(i));
bacnet-stack/demo/object/device.c
+4
View File
@@ -194,6 +194,7 @@ static object_functions_t My_Object_Table[] = {
NULL /* COV */ , NULL /* COV */ ,
NULL /* COV Clear */ , NULL /* COV Clear */ ,
NULL /* Intrinsic Reporting */ }, NULL /* Intrinsic Reporting */ },
#if 0
{OBJECT_CHARACTERSTRING_VALUE, {OBJECT_CHARACTERSTRING_VALUE,
CharacterString_Value_Init, CharacterString_Value_Init,
CharacterString_Value_Count, CharacterString_Value_Count,
@@ -209,6 +210,7 @@ static object_functions_t My_Object_Table[] = {
NULL /* COV */ , NULL /* COV */ ,
NULL /* COV Clear */ , NULL /* COV Clear */ ,
NULL /* Intrinsic Reporting */ }, NULL /* Intrinsic Reporting */ },
#endif
#if defined(INTRINSIC_REPORTING) #if defined(INTRINSIC_REPORTING)
{OBJECT_NOTIFICATION_CLASS, {OBJECT_NOTIFICATION_CLASS,
Notification_Class_Init, Notification_Class_Init,
@@ -286,6 +288,7 @@ static object_functions_t My_Object_Table[] = {
NULL /* COV */ , NULL /* COV */ ,
NULL /* COV Clear */ , NULL /* COV Clear */ ,
NULL /* Intrinsic Reporting */ }, NULL /* Intrinsic Reporting */ },
#if 0
{OBJECT_MULTI_STATE_VALUE, {OBJECT_MULTI_STATE_VALUE,
Multistate_Value_Init, Multistate_Value_Init,
Multistate_Value_Count, Multistate_Value_Count,
@@ -301,6 +304,7 @@ static object_functions_t My_Object_Table[] = {
NULL /* COV */ , NULL /* COV */ ,
NULL /* COV Clear */ , NULL /* COV Clear */ ,
NULL /* Intrinsic Reporting */ }, NULL /* Intrinsic Reporting */ },
#endif
{OBJECT_TRENDLOG, {OBJECT_TRENDLOG,
Trend_Log_Init, Trend_Log_Init,
Trend_Log_Count, Trend_Log_Count,
bacnet-stack/ports/win32/Microsoft Visual Studio 2008/BACnet Object Definitions/BACnet Object Definitions.vcproj
-12
View File
@@ -246,18 +246,6 @@
/> />
</FileConfiguration> </FileConfiguration>
</File> </File>
<File
RelativePath="..\..\..\..\demo\object\gw_device.c"
>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\include"
/>
</FileConfiguration>
</File>
<File <File
RelativePath="..\..\..\..\demo\object\lc.c" RelativePath="..\..\..\..\demo\object\lc.c"
> >