diff --git a/ports/stm32f10x/bacnet.ewp b/ports/stm32f10x/bacnet.ewp
index 7c8cbfcb..4160746b 100644
--- a/ports/stm32f10x/bacnet.ewp
+++ b/ports/stm32f10x/bacnet.ewp
@@ -229,13 +229,6 @@
                     <state>BACDL_MSTP</state>
                     <state>MAX_APDU=480</state>
                     <state>MAX_TSM_TRANSACTIONS=0</state>
-                    <state>BACAPP_BOOLEAN</state>
-                    <state>BACAPP_REAL</state>
-                    <state>BACAPP_OBJECT_ID</state>
-                    <state>BACAPP_UNSIGNED</state>
-                    <state>BACAPP_ENUMERATED</state>
-                    <state>BACAPP_CHARACTER_STRING</state>
-                    <state>WRITE_PROPERTY</state>
                 </option>
                 <option>
                     <name>CCPreprocFile</name>
@@ -275,7 +268,7 @@
                 </option>
                 <option>
                     <name>CCDiagSuppress</name>
-                    <state></state>
+                    <state>Pe550,Pa084</state>
                 </option>
                 <option>
                     <name>CCDiagRemark</name>
@@ -1076,21 +1069,18 @@
         <file>
             <name>$PROJ_DIR$\..\..\src\bacnet\bacstr.c</name>
         </file>
-        <file>
-            <name>$PROJ_DIR$\..\..\src\bacnet\datalink\crc.c</name>
-        </file>
         <file>
             <name>$PROJ_DIR$\..\..\src\bacnet\dcc.c</name>
         </file>
-        <file>
-            <name>$PROJ_DIR$\..\..\src\bacnet\basic\sys\fifo.c</name>
-        </file>
         <file>
             <name>$PROJ_DIR$\..\..\src\bacnet\iam.c</name>
         </file>
         <file>
             <name>$PROJ_DIR$\..\..\src\bacnet\ihave.c</name>
         </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\src\bacnet\lighting.c</name>
+        </file>
         <file>
             <name>$PROJ_DIR$\..\..\src\bacnet\memcopy.c</name>
         </file>
@@ -1125,6 +1115,18 @@
             <name>$PROJ_DIR$\..\..\src\bacnet\wp.c</name>
         </file>
     </group>
+    <group>
+        <name>BACnet-Datalink</name>
+        <file>
+            <name>$PROJ_DIR$\automac.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\src\bacnet\datalink\crc.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\dlmstp.c</name>
+        </file>
+    </group>
     <group>
         <name>BACnet-Basic-Services</name>
         <file>
@@ -1172,6 +1174,9 @@
         <file>
             <name>$PROJ_DIR$\..\..\src\bacnet\basic\sys\bigend.c</name>
         </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\src\bacnet\basic\sys\fifo.c</name>
+        </file>
         <file>
             <name>$PROJ_DIR$\..\..\src\bacnet\basic\sys\mstimer.c</name>
         </file>
@@ -1257,9 +1262,6 @@
             <name>$PROJ_DIR$\drivers\src\stm32f10x_wwdg.c</name>
         </file>
     </group>
-    <file>
-        <name>$PROJ_DIR$\automac.c</name>
-    </file>
     <file>
         <name>$PROJ_DIR$\bacnet.c</name>
     </file>
@@ -1269,9 +1271,6 @@
     <file>
         <name>$PROJ_DIR$\device.c</name>
     </file>
-    <file>
-        <name>$PROJ_DIR$\dlmstp.c</name>
-    </file>
     <file>
         <name>$PROJ_DIR$\led.c</name>
     </file>
diff --git a/ports/stm32f4xx/bacnet.ewp b/ports/stm32f4xx/bacnet.ewp
index 47dfc35d..2f13cdbd 100644
--- a/ports/stm32f4xx/bacnet.ewp
+++ b/ports/stm32f4xx/bacnet.ewp
@@ -266,7 +266,7 @@
                 </option>
                 <option>
                     <name>CCDiagSuppress</name>
-                    <state>Pe550</state>
+                    <state>Pe550,Pa084</state>
                 </option>
                 <option>
                     <name>CCDiagRemark</name>