diff --git a/bacnet-stack/ports/at91sam7s/bacnet.ewp b/bacnet-stack/ports/at91sam7s/bacnet.ewp
index d81ea05c..5c5a9cad 100644
--- a/bacnet-stack/ports/at91sam7s/bacnet.ewp
+++ b/bacnet-stack/ports/at91sam7s/bacnet.ewp
@@ -39,20 +39,20 @@
         <option>
           <name>Input variant</name>
           <version>3</version>
-          <state>1</state>
+          <state>0</state>
         </option>
         <option>
           <name>Input description</name>
-          <state>Full formatting.</state>
+          <state>Automatic choice of formatter.</state>
         </option>
         <option>
           <name>Output variant</name>
           <version>2</version>
-          <state>1</state>
+          <state>0</state>
         </option>
         <option>
           <name>Output description</name>
-          <state>Full formatting.</state>
+          <state>Automatic choice of formatter.</state>
         </option>
         <option>
           <name>GOutputBinary</name>
@@ -83,7 +83,7 @@
         </option>
         <option>
           <name>OGProductVersion</name>
-          <state>5.10.0.159</state>
+          <state>6.30.7.53437</state>
         </option>
         <option>
           <name>OGLastSavedByProductVersion</name>
@@ -165,15 +165,12 @@
         <option>
           <name>CCDefines</name>
           <state>BACDL_MSTP</state>
-          <state>MAX_APDU=480</state>
-          <state>BIG_ENDIAN=0</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>MAX_CHARACTER_STRING_BYTES=64</state>
+          <state>MAX_OCTET_STRING_BYTES=64</state>
+          <state>PRINT_ENABLED=0</state>
+          <state>MAX_APDU=480</state>
+          <state>CRC_USE_TABLE</state>
         </option>
         <option>
           <name>CCPreprocFile</name>
@@ -302,9 +299,9 @@
         </option>
         <option>
           <name>CCIncludePath2</name>
-          <state>$PROJ_DIR$</state>
           <state>$PROJ_DIR$\..\..\include</state>
           <state>$PROJ_DIR$\..\..\demo\object</state>
+          <state>$PROJ_DIR$\..\..\demo\handler</state>
         </option>
         <option>
           <name>CCStdIncCheck</name>
@@ -324,7 +321,7 @@
         </option>
         <option>
           <name>CCOptLevel</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>CCOptStrategy</name>
@@ -333,7 +330,7 @@
         </option>
         <option>
           <name>CCOptLevelSlave</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>CompilerMisraRules98</name>
@@ -579,7 +576,7 @@
         </option>
         <option>
           <name>OOCOutputFile</name>
-          <state>c.srec</state>
+          <state></state>
         </option>
         <option>
           <name>OOCCommandLineProducer</name>
@@ -619,10 +616,6 @@
         <version>15</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
-        <option>
-          <name>IlinkOutputFile</name>
-          <state>c.out</state>
-        </option>
         <option>
           <name>IlinkLibIOConfig</name>
           <state>1</state>
@@ -635,6 +628,10 @@
           <name>IlinkInputFileSlave</name>
           <state>0</state>
         </option>
+        <option>
+          <name>IlinkOutputFile</name>
+          <state>bacnet.out</state>
+        </option>
         <option>
           <name>IlinkDebugInfoEnable</name>
           <state>1</state>
@@ -697,7 +694,7 @@
         </option>
         <option>
           <name>IlinkIcfFile</name>
-          <state>$TOOLKIT_DIR$\CONFIG\generic.icf</state>
+          <state>lnk0t.icf</state>
         </option>
         <option>
           <name>IlinkIcfFileSlave</name>
@@ -757,7 +754,7 @@
         </option>
         <option>
           <name>IlinkProgramEntryLabel</name>
-          <state>__iar_program_start</state>
+          <state></state>
         </option>
         <option>
           <name>DoFill</name>
@@ -962,20 +959,20 @@
         <option>
           <name>Input variant</name>
           <version>3</version>
-          <state>1</state>
+          <state>0</state>
         </option>
         <option>
           <name>Input description</name>
-          <state>Full formatting.</state>
+          <state></state>
         </option>
         <option>
           <name>Output variant</name>
           <version>2</version>
-          <state>1</state>
+          <state>0</state>
         </option>
         <option>
           <name>Output description</name>
-          <state>Full formatting.</state>
+          <state></state>
         </option>
         <option>
           <name>GOutputBinary</name>
@@ -988,7 +985,7 @@
         </option>
         <option>
           <name>OGCoreOrChip</name>
-          <state>1</state>
+          <state>0</state>
         </option>
         <option>
           <name>GRuntimeLibSelect</name>
@@ -1002,15 +999,15 @@
         </option>
         <option>
           <name>RTDescription</name>
-          <state>Use the normal configuration of the C/C++ runtime library. No locale interface, C locale, no file descriptor support, no multibytes in printf and scanf, and no hex floats in strtod.</state>
+          <state></state>
         </option>
         <option>
           <name>OGProductVersion</name>
-          <state>5.10.0.159</state>
+          <state>6.30.7.53437</state>
         </option>
         <option>
           <name>OGLastSavedByProductVersion</name>
-          <state>6.30.7.53437</state>
+          <state></state>
         </option>
         <option>
           <name>GeneralEnableMisra</name>
@@ -1022,11 +1019,11 @@
         </option>
         <option>
           <name>OGChipSelectEditMenu</name>
-          <state>AT91SAM7S256	Atmel AT91SAM7S256</state>
+          <state></state>
         </option>
         <option>
           <name>GenLowLevelInterface</name>
-          <state>1</state>
+          <state>0</state>
         </option>
         <option>
           <name>GEndianModeBE</name>
@@ -1056,17 +1053,17 @@
         </option>
         <option>
           <name>RTConfigPath2</name>
-          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Normal.h</state>
+          <state></state>
         </option>
         <option>
           <name>GFPUCoreSlave</name>
           <version>19</version>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>GBECoreSlave</name>
           <version>19</version>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>OGUseCmsis</name>
@@ -1087,16 +1084,7 @@
         <debug>0</debug>
         <option>
           <name>CCDefines</name>
-          <state>BACDL_MSTP</state>
-          <state>MAX_APDU=480</state>
-          <state>BIG_ENDIAN=0</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>NDEBUG</state>
         </option>
         <option>
           <name>CCPreprocFile</name>
@@ -1157,11 +1145,11 @@
         <option>
           <name>CCAllowList</name>
           <version>1</version>
-          <state>0000000</state>
+          <state>1111111</state>
         </option>
         <option>
           <name>CCDebugInfo</name>
-          <state>1</state>
+          <state>0</state>
         </option>
         <option>
           <name>IEndianMode</name>
@@ -1209,7 +1197,7 @@
         </option>
         <option>
           <name>OutputFile</name>
-          <state>$FILE_BNAME$.o</state>
+          <state></state>
         </option>
         <option>
           <name>CCLibConfigHeader</name>
@@ -1225,9 +1213,7 @@
         </option>
         <option>
           <name>CCIncludePath2</name>
-          <state>$PROJ_DIR$</state>
-          <state>$PROJ_DIR$\..\..\include</state>
-          <state>$PROJ_DIR$\..\..\demo\object</state>
+          <state></state>
         </option>
         <option>
           <name>CCStdIncCheck</name>
@@ -1247,7 +1233,7 @@
         </option>
         <option>
           <name>CCOptLevel</name>
-          <state>0</state>
+          <state>3</state>
         </option>
         <option>
           <name>CCOptStrategy</name>
@@ -1256,7 +1242,7 @@
         </option>
         <option>
           <name>CCOptLevelSlave</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>CompilerMisraRules98</name>
@@ -1368,7 +1354,7 @@
         </option>
         <option>
           <name>ADebug</name>
-          <state>1</state>
+          <state>0</state>
         </option>
         <option>
           <name>AltRegisterNames</name>
@@ -1452,7 +1438,7 @@
         </option>
         <option>
           <name>AOutputFile</name>
-          <state>$FILE_BNAME$.o</state>
+          <state></state>
         </option>
         <option>
           <name>AMultibyteSupport</name>
@@ -1502,7 +1488,7 @@
         </option>
         <option>
           <name>OOCOutputFile</name>
-          <state>c.srec</state>
+          <state></state>
         </option>
         <option>
           <name>OOCCommandLineProducer</name>
@@ -1542,10 +1528,6 @@
         <version>15</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>0</debug>
-        <option>
-          <name>IlinkOutputFile</name>
-          <state>c.out</state>
-        </option>
         <option>
           <name>IlinkLibIOConfig</name>
           <state>1</state>
@@ -1558,6 +1540,10 @@
           <name>IlinkInputFileSlave</name>
           <state>0</state>
         </option>
+        <option>
+          <name>IlinkOutputFile</name>
+          <state>###Unitialized###</state>
+        </option>
         <option>
           <name>IlinkDebugInfoEnable</name>
           <state>1</state>
@@ -1620,7 +1606,7 @@
         </option>
         <option>
           <name>IlinkIcfFile</name>
-          <state>$TOOLKIT_DIR$\CONFIG\generic.icf</state>
+          <state>lnk0t.icf</state>
         </option>
         <option>
           <name>IlinkIcfFileSlave</name>
@@ -1680,7 +1666,7 @@
         </option>
         <option>
           <name>IlinkProgramEntryLabel</name>
-          <state>__iar_program_start</state>
+          <state></state>
         </option>
         <option>
           <name>DoFill</name>
@@ -1771,7 +1757,7 @@
         </option>
         <option>
           <name>IlinkOptInline</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>IlinkOptExceptionsAllow</name>
@@ -1849,7 +1835,7 @@
     </settings>
   </configuration>
   <group>
-    <name>BACnet</name>
+    <name>BACnet-Core</name>
     <file>
       <name>$PROJ_DIR$\..\..\src\abort.c</name>
     </file>
@@ -1865,6 +1851,9 @@
     <file>
       <name>$PROJ_DIR$\..\..\src\bacdcode.c</name>
     </file>
+    <file>
+      <name>$PROJ_DIR$\..\..\src\bacdevobjpropref.c</name>
+    </file>
     <file>
       <name>$PROJ_DIR$\..\..\src\bacerror.c</name>
     </file>
@@ -1881,10 +1870,10 @@
       <name>$PROJ_DIR$\..\..\src\crc.c</name>
     </file>
     <file>
-      <name>$PROJ_DIR$\..\..\src\dcc.c</name>
+      <name>$PROJ_DIR$\..\..\src\datetime.c</name>
     </file>
     <file>
-      <name>$PROJ_DIR$\..\..\src\fifo.c</name>
+      <name>$PROJ_DIR$\..\..\src\dcc.c</name>
     </file>
     <file>
       <name>$PROJ_DIR$\..\..\src\iam.c</name>
@@ -1892,6 +1881,9 @@
     <file>
       <name>$PROJ_DIR$\..\..\src\ihave.c</name>
     </file>
+    <file>
+      <name>$PROJ_DIR$\..\..\src\lighting.c</name>
+    </file>
     <file>
       <name>$PROJ_DIR$\..\..\src\memcopy.c</name>
     </file>
@@ -1930,7 +1922,7 @@
     </file>
   </group>
   <group>
-    <name>BACnet-Handlers</name>
+    <name>BACnet-Demo</name>
     <file>
       <name>$PROJ_DIR$\..\..\demo\handler\h_dcc.c</name>
     </file>
@@ -1977,6 +1969,9 @@
   <file>
     <name>$PROJ_DIR$\bi.c</name>
   </file>
+  <file>
+    <name>$PROJ_DIR$\blinker.c</name>
+  </file>
   <file>
     <name>$PROJ_DIR$\bv.c</name>
   </file>
@@ -1990,7 +1985,7 @@
     <name>$PROJ_DIR$\init.c</name>
   </file>
   <file>
-    <name>$PROJ_DIR$\irq.c</name>
+    <name>$PROJ_DIR$\isr.c</name>
   </file>
   <file>
     <name>$PROJ_DIR$\main.c</name>