Updating Win32 MSTP datalink layer. Testing.

This commit is contained in:
skarg
2007-07-03 00:44:48 +00:00
parent d6851d7320
commit 3869b55fea
6 changed files with 169 additions and 104 deletions
+19 -1
View File
@@ -51,9 +51,10 @@
</Target>
</Build>
<Compiler>
<Add option="-O" />
<Add option="-Wall" />
<Add option="-fexceptions" />
<Add option="-DBACDL_BIP=1" />
<Add option="-DBACDL_MSTP=1" />
<Add option="-DBIP_DEBUG=1" />
<Add option="-DUSE_INADDR=1" />
<Add option="-DPRINT_ENABLED=1" />
@@ -109,6 +110,11 @@
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\bip.h" />
<Unit filename="..\..\crc.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\crc.h" />
<Unit filename="..\..\datalink.h" />
<Unit filename="..\..\datetime.c">
<Option compilerVar="CC" />
</Unit>
@@ -219,7 +225,18 @@
<Unit filename="..\..\ports\win32\bip-init.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\ports\win32\dlmstp.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\ports\win32\mstp.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\ports\win32\mstp.h" />
<Unit filename="..\..\ports\win32\net.h" />
<Unit filename="..\..\ports\win32\rs485.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\ports\win32\rs485.h" />
<Unit filename="..\..\rd.c">
<Option compilerVar="CC" />
</Unit>
@@ -250,6 +267,7 @@
<Unit filename="..\..\wp.h" />
<Extensions>
<code_completion />
<envvars />
</Extensions>
</Project>
</CodeBlocks_project_file>
+1 -5
View File
@@ -109,6 +109,7 @@ int main(int argc, char *argv[])
bip_set_port(strtol(argv[3], NULL, 0));
#endif
#if defined(BACDL_MSTP)
RS485_Set_Baud_Rate(38400);
dlmstp_set_max_info_frames(1);
dlmstp_set_max_master(127);
if (argc > 2) {
@@ -117,11 +118,6 @@ int main(int argc, char *argv[])
if (argc > 3) {
dlmstp_set_mac_address(strtol(argv[3], NULL, 0));
}
#if 0
RS485_Set_Baud_Rate(38400);
dlmstp_set_max_info_frames(DEFAULT_MAX_INFO_FRAMES);
dlmstp_set_max_master(DEFAULT_MAX_MASTER);
#endif
#endif
printf("BACnet Server Demo\n"
"BACnet Device ID: %u\r\n",