Updated project files, makefiles, and the demo debug info.

This commit is contained in:
skarg
2008-06-23 00:17:51 +00:00
parent 9b9c6a1381
commit 2338f3b3a3
18 changed files with 36 additions and 20 deletions
+4 -2
View File
@@ -1,10 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_workspace_file>
<Workspace title="Workspace">
<Project filename="..\lib\bacnet.cbp" />
<Project filename="..\lib\bacnet.cbp" active="1" />
<Project filename="server\bacserv.cbp" />
<Project filename="epics\bacepics.cbp" />
<Project filename="readprop\bacrp.cbp" />
<Project filename="whois\bacwi.cbp" active="1" />
<Project filename="whois\bacwi.cbp" />
<Project filename="..\ports\win32\bacnet.cbp" />
<Project filename="..\ports\win32\rs485.cbp" />
</Workspace>
</CodeBlocks_workspace_file>
+1 -1
View File
@@ -217,7 +217,7 @@ static void Init_DataLink(
if (bbmd_address) {
struct in_addr addr;
addr.s_addr = bbmd_address;
printf("WhoIs: Registering with BBMD at %s:%ld for %ld seconds\n",
printf("DeviceCommunicationControl: Registering with BBMD at %s:%ld for %ld seconds\n",
inet_ntoa(addr), bbmd_port, bbmd_timetolive_seconds);
bvlc_register_with_bbmd(bbmd_address, bbmd_port,
bbmd_timetolive_seconds);
+1 -1
View File
@@ -386,7 +386,7 @@ static void Init_DataLink(
if (bbmd_address) {
struct in_addr addr;
addr.s_addr = bbmd_address;
printf("WhoIs: Registering with BBMD at %s:%ld for %ld seconds\n",
printf("EPICS: Registering with BBMD at %s:%ld for %ld seconds\n",
inet_ntoa(addr), bbmd_port, bbmd_timetolive_seconds);
bvlc_register_with_bbmd(bbmd_address, bbmd_port,
bbmd_timetolive_seconds);
+1 -1
View File
@@ -272,7 +272,7 @@ static void Init_DataLink(
if (bbmd_address) {
struct in_addr addr;
addr.s_addr = bbmd_address;
printf("WhoIs: Registering with BBMD at %s:%ld for %ld seconds\n",
printf("AtomicReadFile: Registering with BBMD at %s:%ld for %ld seconds\n",
inet_ntoa(addr), bbmd_port, bbmd_timetolive_seconds);
bvlc_register_with_bbmd(bbmd_address, bbmd_port,
bbmd_timetolive_seconds);
+1 -1
View File
@@ -212,7 +212,7 @@ static void Init_DataLink(
if (bbmd_address) {
struct in_addr addr;
addr.s_addr = bbmd_address;
printf("WhoIs: Registering with BBMD at %s:%ld for %ld seconds\n",
printf("ReinitDevice: Registering with BBMD at %s:%ld for %ld seconds\n",
inet_ntoa(addr), bbmd_port, bbmd_timetolive_seconds);
bvlc_register_with_bbmd(bbmd_address, bbmd_port,
bbmd_timetolive_seconds);
+1 -1
View File
@@ -175,7 +175,7 @@ static void Init_DataLink(
if (bbmd_address) {
struct in_addr addr;
addr.s_addr = bbmd_address;
printf("WhoIs: Registering with BBMD at %s:%ld for %ld seconds\n",
printf("Server: Registering with BBMD at %s:%ld for %ld seconds\n",
inet_ntoa(addr), bbmd_port, bbmd_timetolive_seconds);
bvlc_register_with_bbmd(bbmd_address, bbmd_port,
bbmd_timetolive_seconds);
+1 -1
View File
@@ -181,7 +181,7 @@ static void Init_DataLink(
if (bbmd_address) {
struct in_addr addr;
addr.s_addr = bbmd_address;
printf("WhoIs: Registering with BBMD at %s:%ld for %ld seconds\n",
printf("TimeSync: Registering with BBMD at %s:%ld for %ld seconds\n",
inet_ntoa(addr), bbmd_port, bbmd_timetolive_seconds);
bvlc_register_with_bbmd(bbmd_address, bbmd_port,
bbmd_timetolive_seconds);
+1 -1
View File
@@ -142,7 +142,7 @@ static void Init_DataLink(
if (bbmd_address) {
struct in_addr addr;
addr.s_addr = bbmd_address;
printf("WhoIs: Registering with BBMD at %s:%ld for %ld seconds\n",
printf("UnconfirmedCOV: Registering with BBMD at %s:%ld for %ld seconds\n",
inet_ntoa(addr), bbmd_port, bbmd_timetolive_seconds);
bvlc_register_with_bbmd(bbmd_address, bbmd_port,
bbmd_timetolive_seconds);
+1 -1
View File
@@ -181,7 +181,7 @@ static void Init_DataLink(
if (bbmd_address) {
struct in_addr addr;
addr.s_addr = bbmd_address;
printf("WhoIs: Registering with BBMD at %s:%ld for %ld seconds\n",
printf("WhoHas: Registering with BBMD at %s:%ld for %ld seconds\n",
inet_ntoa(addr), bbmd_port, bbmd_timetolive_seconds);
bvlc_register_with_bbmd(bbmd_address, bbmd_port,
bbmd_timetolive_seconds);
+1 -1
View File
@@ -226,7 +226,7 @@ static void Init_DataLink(
if (bbmd_address) {
struct in_addr addr;
addr.s_addr = bbmd_address;
printf("WhoIs: Registering with BBMD at %s:%ld for %ld seconds\n",
printf("AtomicWriteFile: Registering with BBMD at %s:%ld for %ld seconds\n",
inet_ntoa(addr), bbmd_port, bbmd_timetolive_seconds);
bvlc_register_with_bbmd(bbmd_address, bbmd_port,
bbmd_timetolive_seconds);
+1 -1
View File
@@ -223,7 +223,7 @@ static void Init_DataLink(
if (bbmd_address) {
struct in_addr addr;
addr.s_addr = bbmd_address;
printf("WhoIs: Registering with BBMD at %s:%ld for %ld seconds\n",
printf("WriteProperty: Registering with BBMD at %s:%ld for %ld seconds\n",
inet_ntoa(addr), bbmd_port, bbmd_timetolive_seconds);
bvlc_register_with_bbmd(bbmd_address, bbmd_port,
bbmd_timetolive_seconds);
+1
View File
@@ -42,6 +42,7 @@ CORE_SRC = \
$(BACNET_CORE)/bactext.c \
$(BACNET_CORE)/datetime.c \
$(BACNET_CORE)/indtext.c \
$(BACNET_CORE)/debug.c \
$(BACNET_CORE)/bigend.c \
$(BACNET_CORE)/arf.c \
$(BACNET_CORE)/awf.c \
+3
View File
@@ -297,6 +297,9 @@
<Unit filename="..\src\dcc.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\src\debug.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\src\filename.c">
<Option compilerVar="CC" />
</Unit>
+1
View File
@@ -46,6 +46,7 @@ CORE1_SRC = $(BACNET_CORE)\apdu.c \
$(BACNET_CORE)\bactext.c \
$(BACNET_CORE)\datetime.c \
$(BACNET_CORE)\indtext.c \
$(BACNET_CORE)\debug.c \
$(BACNET_CORE)\bigend.c \
$(BACNET_CORE)\abort.c \
$(BACNET_CORE)\reject.c \
+1
View File
@@ -43,6 +43,7 @@
<Linker>
<Add library="..\..\lib\libbacnet.a" />
<Add library="ws2_32" />
<Add library="iphlpapi" />
</Linker>
<Unit filename="..\..\include\bacaddr.h" />
<Unit filename="..\..\include\bacdef.h" />
+8 -4
View File
@@ -157,10 +157,6 @@ SOURCE=..\..\..\demo\object\bi.c
# End Source File
# Begin Source File
SOURCE=..\..\..\src\bigend.c
# End Source File
# Begin Source File
SOURCE="..\bip-init.c"
# End Source File
# Begin Source File
@@ -193,6 +189,10 @@ SOURCE=..\..\..\src\datetime.c
# End Source File
# Begin Source File
SOURCE=..\..\..\src\debug.c
# End Source File
# Begin Source File
SOURCE=..\..\..\src\dcc.c
# End Source File
# Begin Source File
@@ -433,6 +433,10 @@ SOURCE=..\..\..\include\datetime.h
# End Source File
# Begin Source File
SOURCE=..\..\..\include\debug.h
# End Source File
# Begin Source File
SOURCE=..\..\..\demo\object\device.h
# End Source File
# Begin Source File
+1
View File
@@ -53,6 +53,7 @@ CORESRC = ../../npdu.c \
../../reject.c \
../../bacapp.c \
../../datetime.c \
../../debug.c \
../../rp.c \
../../wp.c \
../../dcc.c \
+7 -4
View File
@@ -3,11 +3,12 @@
<FileVersion major="1" minor="6" />
<Project>
<Option title="rs485" />
<Option makefile="makefile" />
<Option pch_mode="2" />
<Option compiler="gcc" />
<Build>
<Target title="Debug">
<Option output="bin\Debug\rs485.exe" prefix_auto="1" extension_auto="1" />
<Option output="bin\Debug\rs485" prefix_auto="1" extension_auto="1" />
<Option object_output="obj\Debug\" />
<Option type="1" />
<Option compiler="gcc" />
@@ -16,7 +17,7 @@
</Compiler>
</Target>
<Target title="Release">
<Option output="bin\Release\rs485.exe" prefix_auto="1" extension_auto="1" />
<Option output="bin\Release\rs485" prefix_auto="1" extension_auto="1" />
<Option object_output="obj\Release\" />
<Option type="1" />
<Option compiler="gcc" />
@@ -38,15 +39,17 @@
<Add directory="..\..\..\bacnet-stack" />
<Add directory="..\..\demo\handler" />
<Add directory="..\..\demo\object" />
<Add directory="..\..\include" />
</Compiler>
<Unit filename="dlmstp.h" />
<Unit filename="mstp.h" />
<Unit filename="..\..\include\dlmstp.h" />
<Unit filename="..\..\include\mstp.h" />
<Unit filename="rs485.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="rs485.h" />
<Extensions>
<code_completion />
<debugger />
</Extensions>
</Project>
</CodeBlocks_project_file>