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

Since config.h is updated, the demo makefiles needed to be updated with the latest DEFINES. Also changed some of the demo projects built with CodeBlocks.

Browse Source
This commit is contained in:
skarg
2007-08-21 23:00:56 +00:00
parent f74d39558f
commit 6dc7399605
28 changed files with 177 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/readprop/Makefile
+1 -1
View File
@@ -7,7 +7,7 @@ BASEDIR = .
# Note: you can strip out symbols using the strip command
# to get an idea of how big the compile really is.
BACNET_DEFINES=-DBACFILE=1 -DTSM_ENABLED=1 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1
BACNET_DEFINES=-DPRINT_ENABLED=1
#BACDL_DEFINE=-DBACDL_ETHERNET=1
#BACDL_DEFINE=-DBACDL_ARCNET=1
BACDL_DEFINE=-DBACDL_BIP=1
bacnet-stack/demo/readprop/bacrp.cbp
+135 -283
View File
@@ -1,369 +1,221 @@
<?xml version="1.0"?>
<!DOCTYPE CodeBlocks_project_file>
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_project_file>
<FileVersion major="1" minor="1"/>
<FileVersion major="1" minor="6" />
<Project>
<Option title="BACnet Read Property Demo"/>
<Option makefile="Makefile"/>
<Option makefile_is_custom="0"/>
<Option compiler="2"/>
<Option title="BACnet Read Property Demo" />
<Option pch_mode="0" />
<Option compiler="gcc" />
<Build>
<Target title="default">
<Option output="C:\code\bacnet-stack\demo\readprop\bacrp.exe"/>
<Option working_dir="."/>
<Option object_output=".objs"/>
<Option deps_output=".deps"/>
<Option type="1"/>
<Option compiler="2"/>
<Option projectResourceIncludeDirsRelation="1"/>
<Option output="C:\code\bacnet-stack\demo\readprop\bacrp.exe" prefix_auto="0" extension_auto="0" />
<Option type="1" />
<Option compiler="gcc" />
<Option projectResourceIncludeDirsRelation="1" />
<Compiler>
<Add option="-DBACDL_BIP=1;TSM_ENABLED=1"/>
<Add directory="..\handler"/>
<Add directory="..\object"/>
<Add directory="..\..\..\bacnet-stack"/>
<Add directory="..\..\ports\win32"/>
<Add option="-DBACDL_BIP=1;TSM_ENABLED=1" />
<Add directory="..\handler" />
<Add directory="..\object" />
<Add directory="..\..\..\bacnet-stack" />
<Add directory="..\..\ports\win32" />
</Compiler>
<Linker>
<Add library="..\..\..\..\BCC55\Lib\import32.lib"/>
<Add library="..\..\..\..\BCC55\Lib\cw32mt.lib"/>
</Linker>
</Target>
</Build>
<VirtualTargets>
<Add alias="All" targets="default;" />
</VirtualTargets>
<Compiler>
<Add option="-Wall" />
</Compiler>
<Linker>
<Add library="ws2_32" />
</Linker>
<Unit filename="..\..\abort.c">
<Option compilerVar="CC"/>
<Option target="default"/>
</Unit>
<Unit filename="..\..\abort.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\abort.h" />
<Unit filename="..\..\address.c">
<Option compilerVar="CC"/>
<Option target="default"/>
</Unit>
<Unit filename="..\..\address.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\address.h" />
<Unit filename="..\..\apdu.c">
<Option compilerVar="CC"/>
<Option target="default"/>
</Unit>
<Unit filename="..\..\apdu.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\apdu.h" />
<Unit filename="..\..\arf.c">
<Option compilerVar="CC"/>
<Option target="default"/>
</Unit>
<Unit filename="..\..\arf.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\arf.h" />
<Unit filename="..\..\awf.c">
<Option compilerVar="CC"/>
<Option target="default"/>
</Unit>
<Unit filename="..\..\awf.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\awf.h" />
<Unit filename="..\..\bacapp.c">
<Option compilerVar="CC"/>
<Option target="default"/>
</Unit>
<Unit filename="..\..\bacapp.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\bacapp.h" />
<Unit filename="..\..\bacdcode.c">
<Option compilerVar="CC"/>
<Option target="default"/>
</Unit>
<Unit filename="..\..\bacdcode.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
</Unit>
<Unit filename="..\..\bacdef.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
</Unit>
<Unit filename="..\..\bacenum.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\bacdcode.h" />
<Unit filename="..\..\bacdef.h" />
<Unit filename="..\..\bacenum.h" />
<Unit filename="..\..\bacerror.c">
<Option compilerVar="CC"/>
<Option target="default"/>
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\bacerror.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
<Unit filename="..\..\bacerror.h" />
<Unit filename="..\..\bacint.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\bacint.h" />
<Unit filename="..\..\bacstr.c">
<Option compilerVar="CC"/>
<Option target="default"/>
</Unit>
<Unit filename="..\..\bacstr.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\bacstr.h" />
<Unit filename="..\..\bactext.c">
<Option compilerVar="CC"/>
<Option target="default"/>
</Unit>
<Unit filename="..\..\bactext.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\bactext.h" />
<Unit filename="..\..\bigend.c">
<Option compilerVar="CC"/>
<Option target="default"/>
</Unit>
<Unit filename="..\..\bigend.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\bigend.h" />
<Unit filename="..\..\bip.c">
<Option compilerVar="CC"/>
<Option target="default"/>
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\bip.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
<Unit filename="..\..\bip.h" />
<Unit filename="..\..\config.h" />
<Unit filename="..\..\datalink.h" />
<Unit filename="..\..\datetime.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\config.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
</Unit>
<Unit filename="..\..\datalink.c">
<Option compilerVar="CC"/>
<Option target="default"/>
</Unit>
<Unit filename="..\..\datalink.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
</Unit>
<Unit filename="..\handler\client.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
<Unit filename="..\..\datetime.h" />
<Unit filename="..\..\dcc.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\dcc.h" />
<Unit filename="..\handler\client.h" />
<Unit filename="..\handler\h_iam.c">
<Option compilerVar="CC"/>
<Option target="default"/>
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\handler\h_rp.c">
<Option compilerVar="CC"/>
<Option target="default"/>
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\handler\h_rp_a.c">
<Option compilerVar="CC"/>
<Option target="default"/>
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\handler\h_whois.c">
<Option compilerVar="CC"/>
<Option target="default"/>
</Unit>
<Unit filename="..\handler\handlers.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\handler\handlers.h" />
<Unit filename="..\handler\noserv.c">
<Option compilerVar="CC"/>
<Option target="default"/>
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\handler\s_rp.c">
<Option compilerVar="CC"/>
<Option target="default"/>
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\handler\s_whois.c">
<Option compilerVar="CC"/>
<Option target="default"/>
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\handler\txbuf.c">
<Option compilerVar="CC"/>
<Option target="default"/>
</Unit>
<Unit filename="..\handler\txbuf.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\handler\txbuf.h" />
<Unit filename="..\object\ai.c">
<Option compilerVar="CC"/>
<Option target="default"/>
</Unit>
<Unit filename="..\object\ai.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\object\ai.h" />
<Unit filename="..\object\ao.c">
<Option compilerVar="CC"/>
<Option target="default"/>
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\object\ao.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
<Unit filename="..\object\ao.h" />
<Unit filename="..\object\av.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\object\av.h" />
<Unit filename="..\object\bacfile.c">
<Option compilerVar="CC"/>
<Option target="default"/>
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\object\bacfile.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
<Unit filename="..\object\bacfile.h" />
<Unit filename="..\object\bi.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\object\bi.h" />
<Unit filename="..\object\bo.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\object\bo.h" />
<Unit filename="..\object\bv.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\object\bv.h" />
<Unit filename="..\object\device.c">
<Option compilerVar="CC"/>
<Option target="default"/>
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\object\device.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
<Unit filename="..\object\device.h" />
<Unit filename="..\object\lc.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="readprop.c">
<Option compilerVar="CC"/>
<Option target="default"/>
<Unit filename="..\object\lc.h" />
<Unit filename="..\object\lsp.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\object\lsp.h" />
<Unit filename="..\object\mso.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\object\mso.h" />
<Unit filename="main.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\filename.c">
<Option compilerVar="CC"/>
<Option target="default"/>
</Unit>
<Unit filename="..\..\filename.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\filename.h" />
<Unit filename="..\..\iam.c">
<Option compilerVar="CC"/>
<Option target="default"/>
</Unit>
<Unit filename="..\..\iam.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\iam.h" />
<Unit filename="..\..\indtext.c">
<Option compilerVar="CC"/>
<Option target="default"/>
</Unit>
<Unit filename="..\..\indtext.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\indtext.h" />
<Unit filename="..\..\npdu.c">
<Option compilerVar="CC"/>
<Option target="default"/>
</Unit>
<Unit filename="..\..\npdu.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\npdu.h" />
<Unit filename="..\..\ports\win32\bip-init.c">
<Option compilerVar="CC"/>
<Option target="default"/>
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\ports\win32\net.h" />
<Unit filename="..\..\ports\win32\stdbool.h" />
<Unit filename="..\..\ports\win32\stdint.h" />
<Unit filename="..\..\reject.c">
<Option compilerVar="CC"/>
<Option target="default"/>
</Unit>
<Unit filename="..\..\reject.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\reject.h" />
<Unit filename="..\..\rp.c">
<Option compilerVar="CC"/>
<Option target="default"/>
</Unit>
<Unit filename="..\..\rp.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\rp.h" />
<Unit filename="..\..\tsm.c">
<Option compilerVar="CC"/>
<Option target="default"/>
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\tsm.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
<Unit filename="..\..\tsm.h" />
<Unit filename="..\..\version.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\whois.c">
<Option compilerVar="CC"/>
<Option target="default"/>
</Unit>
<Unit filename="..\..\whois.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\whois.h" />
<Unit filename="..\..\wp.c">
<Option compilerVar="CC"/>
<Option target="default"/>
</Unit>
<Unit filename="..\..\wp.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\wp.h" />
<Extensions>
<code_completion />
<envvars />
<debugger />
</Extensions>
</Project>
</CodeBlocks_project_file>
bacnet-stack/demo/readprop/main.c
+11 -7
View File
@@ -28,15 +28,19 @@
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <time.h> /* for time */
#include <errno.h>
#include <time.h> /* for time */
#define PRINT_ENABLED 1
#include "bacdef.h"
#include "config.h"
#include "bactext.h"
#include "bacerror.h"
#include "iam.h"
#include "arf.h"
#include "tsm.h"
#include "address.h"
#include "config.h"
#include "bacdef.h"
#include "npdu.h"
#include "apdu.h"
#include "device.h"
@@ -70,8 +74,8 @@ static void MyErrorHandler(BACNET_ADDRESS * src,
(void) src;
(void) invoke_id;
printf("BACnet Error: %s: %s\r\n",
bactext_error_class_name(error_class),
bactext_error_code_name(error_code));
bactext_error_class_name((int)error_class),
bactext_error_code_name((int)error_code));
Error_Detected = true;
}
@@ -83,7 +87,7 @@ void MyAbortHandler(BACNET_ADDRESS * src,
(void) invoke_id;
(void) server;
printf("BACnet Abort: %s\r\n",
bactext_abort_reason_name(abort_reason));
bactext_abort_reason_name((int)abort_reason));
Error_Detected = true;
}
@@ -94,7 +98,7 @@ void MyRejectHandler(BACNET_ADDRESS * src,
(void) src;
(void) invoke_id;
printf("BACnet Reject: %s\r\n",
bactext_reject_reason_name(reject_reason));
bactext_reject_reason_name((int)reject_reason));
Error_Detected = true;
}
bacnet-stack/demo/readprop/makefile.b32
+1 -1
View File
@@ -15,7 +15,7 @@ PRODUCT = bacrp
PRODUCT_EXE = $(PRODUCT).exe
# Choose the Data Link Layer to Enable
DEFINES = -DBACDL_BIP=1;TSM_ENABLED=1;BIG_ENDIAN=0;PRINT_ENABLED=1
DEFINES = -DBACDL_BIP=1;PRINT_ENABLED=1
SRCS = main.c \
..\..\ports\win32\bip-init.c \