diff --git a/apps/mstpcap/mstpcap.txt b/apps/mstpcap/mstpcap.txt index b20f96bd..41cd238f 100644 --- a/apps/mstpcap/mstpcap.txt +++ b/apps/mstpcap/mstpcap.txt @@ -147,15 +147,29 @@ Locate the 10 27 which in my case were in 5th and 6th position and replace with This will make the RS485 go to 76800 baud (76923 baud) baud when you ask it to be 300 baud. -So to capture at 76800 baud type: mstpcap.exe COM2 300 +So to capture at 76800 baud type: + +From the command line: +> mstpcap.exe COM2 300 + +From Visual Studio in debug mode: +Setting project properties -> Debugging -> Command line arguments to COM4 + +Some USB to RS485 converters: + +Waveshare USB to RS485 converter +https://www.waveshare.com/product/usb-to-rs485-b.htm + +B&B Electronics USB to RS485 converter USOPTL4 (isolated) +https://www.advantech.com/ Linux (used with Debian Lenny and Fedora 15) http://www.connecttech.com/KnowledgeDatabase/kdb309.htm As root: Change USB so I can use it later as normal user: -# chmod 777 /dev/ttyUSB0 - +# chmod 777 /dev/ttyUSB0 Print current info about the device: -# setserial /dev/ttyUSB0 –a +# setserial /dev/ttyUSB0 -a /dev/ttyUSB0, Line 0, UART: unknown, Port: 0x0000, IRQ: 0 Baud_base: 24000000, close_delay: 0, divisor: 0 closing_wait: infinte @@ -166,7 +180,7 @@ Make custom speed: 24000000/312 gives 76923 baudrate: # setserial /dev/ttyUSB0 divisor 312 Print to make sure changes got applied: -# setserial /dev/ttyUSB0 –a +# setserial /dev/ttyUSB0 -a /dev/ttyUSB0, Line 0, UART: unknown, Port: 0x0000, IRQ: 0 Baud_base: 24000000, close_delay: 0, divisor: 312 closing_wait: infinte diff --git a/ports/win32/Microsoft Visual Studio/bacnet-stack.props b/ports/win32/Microsoft Visual Studio/bacnet-stack.props index 7936e298..a014b1e3 100644 --- a/ports/win32/Microsoft Visual Studio/bacnet-stack.props +++ b/ports/win32/Microsoft Visual Studio/bacnet-stack.props @@ -10,6 +10,7 @@ CompileAsC BACNET_STACK_STATIC_DEFINE;_UNICODE;UNICODE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) 4996 + true diff --git a/ports/win32/Microsoft Visual Studio/bacnet-stack.sln b/ports/win32/Microsoft Visual Studio/bacnet-stack.sln index 13458c96..24aa2b52 100644 --- a/ports/win32/Microsoft Visual Studio/bacnet-stack.sln +++ b/ports/win32/Microsoft Visual Studio/bacnet-stack.sln @@ -13,30 +13,128 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution ..\README.md = ..\README.md EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mstpcap", "mstpcap\mstpcap.vcxproj", "{815B9086-238F-4989-954F-2E99C523A0FE}" + ProjectSection(ProjectDependencies) = postProject + {2B0DD90A-C096-401B-97D0-81D3BC4F7EB7} = {2B0DD90A-C096-401B-97D0-81D3BC4F7EB7} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "readprop", "rp\rp.vcxproj", "{7C44F558-7D8B-472B-B09C-72028C5BA7BD}" + ProjectSection(ProjectDependencies) = postProject + {2B0DD90A-C096-401B-97D0-81D3BC4F7EB7} = {2B0DD90A-C096-401B-97D0-81D3BC4F7EB7} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "writeprop", "writeprop\writeprop.vcxproj", "{A8589233-2E02-4748-AB87-2C7490774919}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server-mini", "server-mini\server-mini.vcxproj", "{AFA12944-10C7-44FD-BD67-EDABDE386935}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|ARM = Debug|ARM + Debug|ARM64 = Debug|ARM64 Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 + Release|ARM = Release|ARM + Release|ARM64 = Release|ARM64 Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {2B0DD90A-C096-401B-97D0-81D3BC4F7EB7}.Debug|ARM.ActiveCfg = Debug|x64 + {2B0DD90A-C096-401B-97D0-81D3BC4F7EB7}.Debug|ARM.Build.0 = Debug|x64 + {2B0DD90A-C096-401B-97D0-81D3BC4F7EB7}.Debug|ARM64.ActiveCfg = Debug|x64 + {2B0DD90A-C096-401B-97D0-81D3BC4F7EB7}.Debug|ARM64.Build.0 = Debug|x64 {2B0DD90A-C096-401B-97D0-81D3BC4F7EB7}.Debug|x64.ActiveCfg = Debug|x64 {2B0DD90A-C096-401B-97D0-81D3BC4F7EB7}.Debug|x64.Build.0 = Debug|x64 {2B0DD90A-C096-401B-97D0-81D3BC4F7EB7}.Debug|x86.ActiveCfg = Debug|Win32 {2B0DD90A-C096-401B-97D0-81D3BC4F7EB7}.Debug|x86.Build.0 = Debug|Win32 + {2B0DD90A-C096-401B-97D0-81D3BC4F7EB7}.Release|ARM.ActiveCfg = Release|x64 + {2B0DD90A-C096-401B-97D0-81D3BC4F7EB7}.Release|ARM.Build.0 = Release|x64 + {2B0DD90A-C096-401B-97D0-81D3BC4F7EB7}.Release|ARM64.ActiveCfg = Release|x64 + {2B0DD90A-C096-401B-97D0-81D3BC4F7EB7}.Release|ARM64.Build.0 = Release|x64 {2B0DD90A-C096-401B-97D0-81D3BC4F7EB7}.Release|x64.ActiveCfg = Release|x64 {2B0DD90A-C096-401B-97D0-81D3BC4F7EB7}.Release|x64.Build.0 = Release|x64 {2B0DD90A-C096-401B-97D0-81D3BC4F7EB7}.Release|x86.ActiveCfg = Release|Win32 {2B0DD90A-C096-401B-97D0-81D3BC4F7EB7}.Release|x86.Build.0 = Release|Win32 + {1EBCF151-1331-44FE-8515-B0B3981EF8BC}.Debug|ARM.ActiveCfg = Debug|x64 + {1EBCF151-1331-44FE-8515-B0B3981EF8BC}.Debug|ARM.Build.0 = Debug|x64 + {1EBCF151-1331-44FE-8515-B0B3981EF8BC}.Debug|ARM64.ActiveCfg = Debug|x64 + {1EBCF151-1331-44FE-8515-B0B3981EF8BC}.Debug|ARM64.Build.0 = Debug|x64 {1EBCF151-1331-44FE-8515-B0B3981EF8BC}.Debug|x64.ActiveCfg = Debug|x64 {1EBCF151-1331-44FE-8515-B0B3981EF8BC}.Debug|x64.Build.0 = Debug|x64 {1EBCF151-1331-44FE-8515-B0B3981EF8BC}.Debug|x86.ActiveCfg = Debug|Win32 {1EBCF151-1331-44FE-8515-B0B3981EF8BC}.Debug|x86.Build.0 = Debug|Win32 + {1EBCF151-1331-44FE-8515-B0B3981EF8BC}.Release|ARM.ActiveCfg = Release|x64 + {1EBCF151-1331-44FE-8515-B0B3981EF8BC}.Release|ARM.Build.0 = Release|x64 + {1EBCF151-1331-44FE-8515-B0B3981EF8BC}.Release|ARM64.ActiveCfg = Release|x64 + {1EBCF151-1331-44FE-8515-B0B3981EF8BC}.Release|ARM64.Build.0 = Release|x64 {1EBCF151-1331-44FE-8515-B0B3981EF8BC}.Release|x64.ActiveCfg = Release|x64 {1EBCF151-1331-44FE-8515-B0B3981EF8BC}.Release|x64.Build.0 = Release|x64 {1EBCF151-1331-44FE-8515-B0B3981EF8BC}.Release|x86.ActiveCfg = Release|Win32 {1EBCF151-1331-44FE-8515-B0B3981EF8BC}.Release|x86.Build.0 = Release|Win32 + {815B9086-238F-4989-954F-2E99C523A0FE}.Debug|ARM.ActiveCfg = Debug|x64 + {815B9086-238F-4989-954F-2E99C523A0FE}.Debug|ARM.Build.0 = Debug|x64 + {815B9086-238F-4989-954F-2E99C523A0FE}.Debug|ARM64.ActiveCfg = Debug|x64 + {815B9086-238F-4989-954F-2E99C523A0FE}.Debug|ARM64.Build.0 = Debug|x64 + {815B9086-238F-4989-954F-2E99C523A0FE}.Debug|x64.ActiveCfg = Debug|x64 + {815B9086-238F-4989-954F-2E99C523A0FE}.Debug|x64.Build.0 = Debug|x64 + {815B9086-238F-4989-954F-2E99C523A0FE}.Debug|x86.ActiveCfg = Debug|Win32 + {815B9086-238F-4989-954F-2E99C523A0FE}.Debug|x86.Build.0 = Debug|Win32 + {815B9086-238F-4989-954F-2E99C523A0FE}.Release|ARM.ActiveCfg = Release|x64 + {815B9086-238F-4989-954F-2E99C523A0FE}.Release|ARM.Build.0 = Release|x64 + {815B9086-238F-4989-954F-2E99C523A0FE}.Release|ARM64.ActiveCfg = Release|x64 + {815B9086-238F-4989-954F-2E99C523A0FE}.Release|ARM64.Build.0 = Release|x64 + {815B9086-238F-4989-954F-2E99C523A0FE}.Release|x64.ActiveCfg = Release|x64 + {815B9086-238F-4989-954F-2E99C523A0FE}.Release|x64.Build.0 = Release|x64 + {815B9086-238F-4989-954F-2E99C523A0FE}.Release|x86.ActiveCfg = Release|Win32 + {815B9086-238F-4989-954F-2E99C523A0FE}.Release|x86.Build.0 = Release|Win32 + {7C44F558-7D8B-472B-B09C-72028C5BA7BD}.Debug|ARM.ActiveCfg = Debug|x64 + {7C44F558-7D8B-472B-B09C-72028C5BA7BD}.Debug|ARM.Build.0 = Debug|x64 + {7C44F558-7D8B-472B-B09C-72028C5BA7BD}.Debug|ARM64.ActiveCfg = Debug|x64 + {7C44F558-7D8B-472B-B09C-72028C5BA7BD}.Debug|ARM64.Build.0 = Debug|x64 + {7C44F558-7D8B-472B-B09C-72028C5BA7BD}.Debug|x64.ActiveCfg = Debug|x64 + {7C44F558-7D8B-472B-B09C-72028C5BA7BD}.Debug|x64.Build.0 = Debug|x64 + {7C44F558-7D8B-472B-B09C-72028C5BA7BD}.Debug|x86.ActiveCfg = Debug|Win32 + {7C44F558-7D8B-472B-B09C-72028C5BA7BD}.Debug|x86.Build.0 = Debug|Win32 + {7C44F558-7D8B-472B-B09C-72028C5BA7BD}.Release|ARM.ActiveCfg = Release|x64 + {7C44F558-7D8B-472B-B09C-72028C5BA7BD}.Release|ARM.Build.0 = Release|x64 + {7C44F558-7D8B-472B-B09C-72028C5BA7BD}.Release|ARM64.ActiveCfg = Release|x64 + {7C44F558-7D8B-472B-B09C-72028C5BA7BD}.Release|ARM64.Build.0 = Release|x64 + {7C44F558-7D8B-472B-B09C-72028C5BA7BD}.Release|x64.ActiveCfg = Release|x64 + {7C44F558-7D8B-472B-B09C-72028C5BA7BD}.Release|x64.Build.0 = Release|x64 + {7C44F558-7D8B-472B-B09C-72028C5BA7BD}.Release|x86.ActiveCfg = Release|Win32 + {7C44F558-7D8B-472B-B09C-72028C5BA7BD}.Release|x86.Build.0 = Release|Win32 + {A8589233-2E02-4748-AB87-2C7490774919}.Debug|ARM.ActiveCfg = Debug|x64 + {A8589233-2E02-4748-AB87-2C7490774919}.Debug|ARM.Build.0 = Debug|x64 + {A8589233-2E02-4748-AB87-2C7490774919}.Debug|ARM64.ActiveCfg = Debug|x64 + {A8589233-2E02-4748-AB87-2C7490774919}.Debug|ARM64.Build.0 = Debug|x64 + {A8589233-2E02-4748-AB87-2C7490774919}.Debug|x64.ActiveCfg = Debug|x64 + {A8589233-2E02-4748-AB87-2C7490774919}.Debug|x64.Build.0 = Debug|x64 + {A8589233-2E02-4748-AB87-2C7490774919}.Debug|x86.ActiveCfg = Debug|Win32 + {A8589233-2E02-4748-AB87-2C7490774919}.Debug|x86.Build.0 = Debug|Win32 + {A8589233-2E02-4748-AB87-2C7490774919}.Release|ARM.ActiveCfg = Release|x64 + {A8589233-2E02-4748-AB87-2C7490774919}.Release|ARM.Build.0 = Release|x64 + {A8589233-2E02-4748-AB87-2C7490774919}.Release|ARM64.ActiveCfg = Release|x64 + {A8589233-2E02-4748-AB87-2C7490774919}.Release|ARM64.Build.0 = Release|x64 + {A8589233-2E02-4748-AB87-2C7490774919}.Release|x64.ActiveCfg = Release|x64 + {A8589233-2E02-4748-AB87-2C7490774919}.Release|x64.Build.0 = Release|x64 + {A8589233-2E02-4748-AB87-2C7490774919}.Release|x86.ActiveCfg = Release|Win32 + {A8589233-2E02-4748-AB87-2C7490774919}.Release|x86.Build.0 = Release|Win32 + {AFA12944-10C7-44FD-BD67-EDABDE386935}.Debug|ARM.ActiveCfg = Debug|x64 + {AFA12944-10C7-44FD-BD67-EDABDE386935}.Debug|ARM.Build.0 = Debug|x64 + {AFA12944-10C7-44FD-BD67-EDABDE386935}.Debug|ARM64.ActiveCfg = Debug|x64 + {AFA12944-10C7-44FD-BD67-EDABDE386935}.Debug|ARM64.Build.0 = Debug|x64 + {AFA12944-10C7-44FD-BD67-EDABDE386935}.Debug|x64.ActiveCfg = Debug|x64 + {AFA12944-10C7-44FD-BD67-EDABDE386935}.Debug|x64.Build.0 = Debug|x64 + {AFA12944-10C7-44FD-BD67-EDABDE386935}.Debug|x86.ActiveCfg = Debug|Win32 + {AFA12944-10C7-44FD-BD67-EDABDE386935}.Debug|x86.Build.0 = Debug|Win32 + {AFA12944-10C7-44FD-BD67-EDABDE386935}.Release|ARM.ActiveCfg = Release|x64 + {AFA12944-10C7-44FD-BD67-EDABDE386935}.Release|ARM.Build.0 = Release|x64 + {AFA12944-10C7-44FD-BD67-EDABDE386935}.Release|ARM64.ActiveCfg = Release|x64 + {AFA12944-10C7-44FD-BD67-EDABDE386935}.Release|ARM64.Build.0 = Release|x64 + {AFA12944-10C7-44FD-BD67-EDABDE386935}.Release|x64.ActiveCfg = Release|x64 + {AFA12944-10C7-44FD-BD67-EDABDE386935}.Release|x64.Build.0 = Release|x64 + {AFA12944-10C7-44FD-BD67-EDABDE386935}.Release|x86.ActiveCfg = Release|Win32 + {AFA12944-10C7-44FD-BD67-EDABDE386935}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/ports/win32/Microsoft Visual Studio/bacnet-stack/bacnet-stack.vcxproj b/ports/win32/Microsoft Visual Studio/bacnet-stack/bacnet-stack.vcxproj index 5e5d3f6e..57f7055d 100644 --- a/ports/win32/Microsoft Visual Studio/bacnet-stack/bacnet-stack.vcxproj +++ b/ports/win32/Microsoft Visual Studio/bacnet-stack/bacnet-stack.vcxproj @@ -45,6 +45,7 @@ + @@ -255,6 +256,7 @@ + @@ -517,8 +519,6 @@ - Level3 - true WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true diff --git a/ports/win32/Microsoft Visual Studio/bacnet-stack/bacnet-stack.vcxproj.filters b/ports/win32/Microsoft Visual Studio/bacnet-stack/bacnet-stack.vcxproj.filters index 569a4563..1cf9573d 100644 --- a/ports/win32/Microsoft Visual Studio/bacnet-stack/bacnet-stack.vcxproj.filters +++ b/ports/win32/Microsoft Visual Studio/bacnet-stack/bacnet-stack.vcxproj.filters @@ -49,6 +49,9 @@ {dafdfbc0-5a48-441c-8682-4d5423832141} + + {6c7abd41-d9bc-4212-b651-29a3e656b76f} + @@ -594,9 +597,6 @@ Source Files\src\bacnet\basic\sys - - Source Files\ports\posix - Source Files\ports\win32 @@ -666,6 +666,12 @@ Source Files\src\bacnet\basic + + Source Files + + + Source Files\src\bacnet\basic\npdu + @@ -929,9 +935,6 @@ Source Files\src\bacnet\basic\sys - - Source Files\ports\posix - Source Files\ports\win32 @@ -1319,6 +1322,12 @@ Source Files\src\bacnet\basic + + Header Files + + + Source Files\src\bacnet\basic\npdu + diff --git a/ports/win32/Microsoft Visual Studio/bacserv/bacserv.vcxproj b/ports/win32/Microsoft Visual Studio/bacserv/bacserv.vcxproj index e8720ace..a3335e17 100644 --- a/ports/win32/Microsoft Visual Studio/bacserv/bacserv.vcxproj +++ b/ports/win32/Microsoft Visual Studio/bacserv/bacserv.vcxproj @@ -20,16 +20,12 @@ - {2b0dd90a-c096-401b-97d0-81d3bc4f7eb7} - - - 16.0 Win32Proj diff --git a/ports/win32/Microsoft Visual Studio/bacserv/bacserv.vcxproj.filters b/ports/win32/Microsoft Visual Studio/bacserv/bacserv.vcxproj.filters index 6d3e8f10..ee75ccfb 100644 --- a/ports/win32/Microsoft Visual Studio/bacserv/bacserv.vcxproj.filters +++ b/ports/win32/Microsoft Visual Studio/bacserv/bacserv.vcxproj.filters @@ -13,18 +13,6 @@ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - {90832ddc-f8fc-45e8-aa26-045670fba630} - - - {4a4bcb82-10e3-497f-9ec0-b7ea244db6d8} - - - {81485c5d-72ca-495c-99b4-a747e1b3fe04} - - - {8070a950-266e-4202-9094-8c528cd1b312} - {9f8c7149-3e7a-4583-9890-03c4b43a07cc} @@ -33,16 +21,8 @@ - - Source Files\src\bacnet\basic\npdu - Source Files\apps\server - - - Source Files\src\bacnet\basic\npdu - - \ No newline at end of file diff --git a/ports/win32/Microsoft Visual Studio/mstpcap/mstpcap.vcxproj b/ports/win32/Microsoft Visual Studio/mstpcap/mstpcap.vcxproj new file mode 100644 index 00000000..3ca5551f --- /dev/null +++ b/ports/win32/Microsoft Visual Studio/mstpcap/mstpcap.vcxproj @@ -0,0 +1,174 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 17.0 + Win32Proj + {815b9086-238f-4989-954f-2e99c523a0fe} + mstpcap + 10.0 + + + + Application + true + v143 + Unicode + + + Application + false + v143 + true + Unicode + + + Application + true + v143 + Unicode + + + Application + false + v143 + true + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + ..\..;..\..\..\..\src;$(IncludePath) + + + ..\..;..\..\..\..\src;$(IncludePath) + + + ..\..;..\..\..\..\src;$(IncludePath) + + + ..\..;..\..\..\..\src;$(IncludePath) + + + + Level3 + true + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + + + + + Level3 + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + Level3 + true + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + + + + + Level3 + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + {2b0dd90a-c096-401b-97d0-81d3bc4f7eb7} + + + + + + \ No newline at end of file diff --git a/ports/win32/Microsoft Visual Studio/mstpcap/mstpcap.vcxproj.filters b/ports/win32/Microsoft Visual Studio/mstpcap/mstpcap.vcxproj.filters new file mode 100644 index 00000000..1b01bc04 --- /dev/null +++ b/ports/win32/Microsoft Visual Studio/mstpcap/mstpcap.vcxproj.filters @@ -0,0 +1,86 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + {6a5c5848-9792-4c3b-84c7-66be55afc20f} + + + {6cad8ade-e34f-4800-b3dd-4a3f5ac319ba} + + + {a9bee495-5f86-4e77-bb65-a1bec6c213ad} + + + {8b97958e-ccdd-46b8-98e7-d08774f7c0da} + + + {d41fe73a-7526-45b8-8e68-cd90402b4604} + + + {9bd2cdc8-8665-4365-a6ed-2123066c2018} + + + + + Source Files\apps\mstpcap + + + Source Files\bacnet + + + Source Files\bacnet\datalink + + + Source Files\bacnet\datalink + + + Source Files\ports\win32 + + + + + Source Files\apps\mstpcap + + + + + Source Files\bacnet + + + Source Files\bacnet + + + Source Files\bacnet + + + Source Files\bacnet + + + Source Files\bacnet\datalink + + + Source Files\bacnet\datalink + + + Source Files\bacnet\datalink + + + Source Files\ports\win32 + + + Source Files\ports\win32 + + + \ No newline at end of file diff --git a/ports/win32/Microsoft Visual Studio/rp/rp.vcxproj b/ports/win32/Microsoft Visual Studio/rp/rp.vcxproj new file mode 100644 index 00000000..928997f1 --- /dev/null +++ b/ports/win32/Microsoft Visual Studio/rp/rp.vcxproj @@ -0,0 +1,142 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 17.0 + Win32Proj + {7c44f558-7d8b-472b-b09c-72028c5ba7bd} + rp + 10.0 + readprop + + + + Application + true + v143 + Unicode + + + Application + false + v143 + true + Unicode + + + Application + true + v143 + Unicode + + + Application + false + v143 + true + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + + + + + Level3 + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + Level3 + true + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + + + + + Level3 + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + + + + {2b0dd90a-c096-401b-97d0-81d3bc4f7eb7} + + + + + + \ No newline at end of file diff --git a/ports/win32/Microsoft Visual Studio/rp/rp.vcxproj.filters b/ports/win32/Microsoft Visual Studio/rp/rp.vcxproj.filters new file mode 100644 index 00000000..a8d48bf5 --- /dev/null +++ b/ports/win32/Microsoft Visual Studio/rp/rp.vcxproj.filters @@ -0,0 +1,28 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + {3edf26c8-2418-4f3d-81e1-1e12aa6d45ef} + + + {d01693b7-d778-4107-b90f-46489fa9aa00} + + + + + Source Files\apps\readprop + + + \ No newline at end of file diff --git a/ports/win32/Microsoft Visual Studio/server-mini/server-mini.vcxproj b/ports/win32/Microsoft Visual Studio/server-mini/server-mini.vcxproj new file mode 100644 index 00000000..c5c2e2ad --- /dev/null +++ b/ports/win32/Microsoft Visual Studio/server-mini/server-mini.vcxproj @@ -0,0 +1,140 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 17.0 + Win32Proj + {afa12944-10c7-44fd-bd67-edabde386935} + servermini + 10.0 + + + + Application + true + v143 + Unicode + + + Application + false + v143 + true + Unicode + + + Application + true + v143 + Unicode + + + Application + false + v143 + true + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + Level3 + true + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + + + + + Level3 + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + + + + + Level3 + true + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + + + + + Level3 + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + + + + + + + + {2b0dd90a-c096-401b-97d0-81d3bc4f7eb7} + + + + + + \ No newline at end of file diff --git a/ports/win32/Microsoft Visual Studio/server-mini/server-mini.vcxproj.filters b/ports/win32/Microsoft Visual Studio/server-mini/server-mini.vcxproj.filters new file mode 100644 index 00000000..2e415c06 --- /dev/null +++ b/ports/win32/Microsoft Visual Studio/server-mini/server-mini.vcxproj.filters @@ -0,0 +1,28 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + {696ecfbc-21ac-48f5-9f33-b0ad0824a353} + + + {10d6b416-c08d-46c3-9aed-cf7bc5db472d} + + + + + Source Files\apps\server-mini + + + \ No newline at end of file diff --git a/ports/win32/Microsoft Visual Studio/writeprop/writeprop.vcxproj b/ports/win32/Microsoft Visual Studio/writeprop/writeprop.vcxproj new file mode 100644 index 00000000..f137a4e0 --- /dev/null +++ b/ports/win32/Microsoft Visual Studio/writeprop/writeprop.vcxproj @@ -0,0 +1,144 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 17.0 + Win32Proj + {a8589233-2e02-4748-ab87-2c7490774919} + writeprop + 10.0 + + + + Application + true + v143 + Unicode + + + Application + false + v143 + true + Unicode + + + Application + true + v143 + Unicode + + + Application + false + v143 + true + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + Level3 + true + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + + + + + Level3 + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + Level3 + true + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + + + + + Level3 + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + + + + {2b0dd90a-c096-401b-97d0-81d3bc4f7eb7} + + + + + + \ No newline at end of file diff --git a/ports/win32/Microsoft Visual Studio/writeprop/writeprop.vcxproj.filters b/ports/win32/Microsoft Visual Studio/writeprop/writeprop.vcxproj.filters new file mode 100644 index 00000000..f6b4d117 --- /dev/null +++ b/ports/win32/Microsoft Visual Studio/writeprop/writeprop.vcxproj.filters @@ -0,0 +1,28 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + {231f6413-ac4d-4437-a8ab-940d842530d7} + + + {144a06d4-05e8-4e9d-9dc3-f390ea1d3a66} + + + + + Source Files\apps\writeprop + + + \ No newline at end of file diff --git a/ports/win32/rs485.c b/ports/win32/rs485.c index 72ee5c42..cd40a9b3 100644 --- a/ports/win32/rs485.c +++ b/ports/win32/rs485.c @@ -256,7 +256,10 @@ void RS485_Initialize(void) RS485_Port_Name, GENERIC_READ | GENERIC_WRITE, 0, 0, OPEN_EXISTING, /*FILE_FLAG_OVERLAPPED */ 0, 0); if (RS485_Handle == INVALID_HANDLE_VALUE) { - fprintf(stderr, "RS485 unable to open %s\n", RS485_Port_Name); + DWORD err = GetLastError(); + fprintf( + stderr, "RS485 unable to open %s (Error %lu)\n", RS485_Port_Name, + err); RS485_Print_Error(); exit(1); } diff --git a/src/bacnet/datalink/dlenv.c b/src/bacnet/datalink/dlenv.c index bd6d1e5b..7296eee8 100644 --- a/src/bacnet/datalink/dlenv.c +++ b/src/bacnet/datalink/dlenv.c @@ -31,7 +31,9 @@ #include "bacnet/datalink/datalink.h" #include "bacnet/datalink/dlenv.h" #include "bacnet/datalink/dlmstp.h" +#if defined(BACFILE) #include "bacfile-posix.h" +#endif /* enable debugging */ static bool Datalink_Debug; @@ -991,8 +993,10 @@ void dlenv_init(void) port_type = PORT_TYPE_NON_BACNET; #endif #endif +#if defined(BACFILE) /* initialize the POSIX file objects */ bacfile_posix_init(); +#endif /* === Initialize the Network Port Object Here === */ Network_Port_Type_Set(Network_Port_Instance, port_type); switch (port_type) {