diff --git a/bacnet-stack/demo/BACnetDemo.workspace b/bacnet-stack/demo/BACnetDemo.workspace
index d3654414..85d6420c 100644
--- a/bacnet-stack/demo/BACnetDemo.workspace
+++ b/bacnet-stack/demo/BACnetDemo.workspace
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_workspace_file>
 	<Workspace title="Workspace">
-		<Project filename="..\lib\bacnet.cbp" active="1" />
+		<Project filename="..\lib\bacnet.cbp" />
 		<Project filename="server\bacserv.cbp" />
 		<Project filename="epics\bacepics.cbp" />
 		<Project filename="readprop\bacrp.cbp" />
 		<Project filename="whois\bacwi.cbp" />
 		<Project filename="..\ports\win32\bacnet.cbp" />
-		<Project filename="..\ports\win32\rs485.cbp" />
+		<Project filename="..\ports\win32\rs485.cbp" active="1" />
 	</Workspace>
 </CodeBlocks_workspace_file>
diff --git a/bacnet-stack/lib/bacnet.cbp b/bacnet-stack/lib/bacnet.cbp
index 7506d4e2..97d27a74 100644
--- a/bacnet-stack/lib/bacnet.cbp
+++ b/bacnet-stack/lib/bacnet.cbp
@@ -46,6 +46,12 @@
 			<Add library="ws2_32" />
 			<Add library="iphlpapi" />
 		</Linker>
+		<Unit filename="..\demo\handler\dlenv.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\demo\handler\h_alarm_ack.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="..\demo\handler\h_arf.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -61,15 +67,27 @@
 		<Unit filename="..\demo\handler\h_dcc.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\demo\handler\h_getevent.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="..\demo\handler\h_iam.c">
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="..\demo\handler\h_ihave.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\demo\handler\h_lso.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="..\demo\handler\h_npdu.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\demo\handler\h_pt.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\demo\handler\h_pt_a.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="..\demo\handler\h_rd.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -82,15 +100,24 @@
 		<Unit filename="..\demo\handler\h_rpm.c">
 			<Option compilerVar="CC" />
 		</Unit>
-        <Unit filename="..\demo\handler\h_rpm_a.c">
-            <Option compilerVar="CC" />
-        </Unit>
+		<Unit filename="..\demo\handler\h_rpm_a.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\demo\handler\h_rr.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\demo\handler\h_rr_a.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="..\demo\handler\h_ts.c">
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="..\demo\handler\h_ucov.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\demo\handler\h_upt.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="..\demo\handler\h_whohas.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -103,39 +130,60 @@
 		<Unit filename="..\demo\handler\noserv.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\demo\handler\s_ack_alarm.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="..\demo\handler\s_arfs.c">
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="..\demo\handler\s_awfs.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\demo\handler\s_cevent.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\demo\handler\s_cov.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="..\demo\handler\s_dcc.c">
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="..\demo\handler\s_iam.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\demo\handler\s_cov.c">
+		<Unit filename="..\demo\handler\s_ihave.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\demo\handler\s_ihave.c">
+		<Unit filename="..\demo\handler\s_lso.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\demo\handler\s_ptransfer.c">
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="..\demo\handler\s_rd.c">
 			<Option compilerVar="CC" />
 		</Unit>
-        <Unit filename="..\demo\handler\s_rp.c">
-            <Option compilerVar="CC" />
-        </Unit>
-        <Unit filename="..\demo\handler\s_rpm.c">
-            <Option compilerVar="CC" />
-        </Unit>
+		<Unit filename="..\demo\handler\s_readrange.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\demo\handler\s_router.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\demo\handler\s_rp.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\demo\handler\s_rpm.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="..\demo\handler\s_ts.c">
 			<Option compilerVar="CC" />
 		</Unit>
-        <Unit filename="..\demo\handler\s_uevent.c">
-            <Option compilerVar="CC" />
-        </Unit>
+		<Unit filename="..\demo\handler\s_uevent.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\demo\handler\s_upt.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="..\demo\handler\s_whohas.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -145,12 +193,9 @@
 		<Unit filename="..\demo\handler\s_wp.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\demo\handler\txbuf.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\demo\handler\dlenv.c">
-			<Option compilerVar="CC" />
-		</Unit>
+		<Unit filename="..\demo\handler\txbuf.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="..\demo\object\ai.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -184,6 +229,9 @@
 		<Unit filename="..\demo\object\mso.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\demo\object\trendlog.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="..\include\abort.h" />
 		<Unit filename="..\include\address.h" />
 		<Unit filename="..\include\ai.h" />
@@ -234,6 +282,7 @@
 		<Unit filename="..\include\lc.h" />
 		<Unit filename="..\include\lo.h" />
 		<Unit filename="..\include\lsp.h" />
+		<Unit filename="..\include\memcopy.h" />
 		<Unit filename="..\include\mso.h" />
 		<Unit filename="..\include\mstp.h" />
 		<Unit filename="..\include\mstptext.h" />
@@ -243,8 +292,7 @@
 		<Unit filename="..\include\ringbuf.h" />
 		<Unit filename="..\include\rp.h" />
 		<Unit filename="..\include\rpm.h" />
-        <Unit filename="..\include\sbuf.h" />
-        <Unit filename="..\include\memcopy.h" />
+		<Unit filename="..\include\sbuf.h" />
 		<Unit filename="..\include\timesync.h" />
 		<Unit filename="..\include\tsm.h" />
 		<Unit filename="..\include\txbuf.h" />
@@ -269,6 +317,9 @@
 		<Unit filename="..\src\address.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\src\alarm_ack.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="..\src\apdu.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -287,6 +338,9 @@
 		<Unit filename="..\src\bacdcode.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\src\bacdevobjpropref.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="..\src\bacerror.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -296,6 +350,9 @@
 		<Unit filename="..\src\bacprop.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\src\bacpropstates.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="..\src\bacreal.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -305,6 +362,9 @@
 		<Unit filename="..\src\bactext.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\src\bigend.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="..\src\bip.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -326,9 +386,18 @@
 		<Unit filename="..\src\debug.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\src\event.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\fifo.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="..\src\filename.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\src\getevent.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="..\src\iam.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -344,27 +413,45 @@
 		<Unit filename="..\src\keylist.c">
 			<Option compilerVar="CC" />
 		</Unit>
-        <Unit filename="..\src\memcopy.c">
-            <Option compilerVar="CC" />
-        </Unit>
-        <Unit filename="..\src\mstp.c">
-            <Option compilerVar="CC" />
-        </Unit>
+		<Unit filename="..\src\lso.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\memcopy.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="..\src\npdu.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\src\ptransfer.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="..\src\rd.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\src\readrange.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="..\src\reject.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\src\ringbuf.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="..\src\rp.c">
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="..\src\rpm.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\src\sbuf.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\stricmp.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\timestamp.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="..\src\timesync.c">
 			<Option compilerVar="CC" />
 		</Unit>