Skip to content

Commit

Permalink
Merge branch 'main' into fix_mqtt_keep_alive_demo_warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
tony-josi-aws authored Apr 17, 2024
2 parents c441c4d + 2b499ab commit 3309140
Show file tree
Hide file tree
Showing 2 changed files with 66 additions and 10 deletions.
10 changes: 6 additions & 4 deletions FreeRTOS/Demo/WIN32-MingW/.cproject
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
<option id="gnu.c.compiler.mingw.exe.debug.option.debugging.level.514946732" name="Debug Level" superClass="gnu.c.compiler.mingw.exe.debug.option.debugging.level" useByScannerDiscovery="false" value="gnu.c.debugging.level.max" valueType="enumerated"/>
<option id="gnu.c.compiler.option.include.paths.1474487302" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/FreeRTOS_Source/include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/FreeRTOS+Trace Recorder/Include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/FreeRTOS+Trace Recorder/include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/FreeRTOS+Trace Recorder/kernelports/FreeRTOS/include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Trace_Recorder_Configuration}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Standard_Demo_Tasks/Include}&quot;"/>
Expand Down Expand Up @@ -66,7 +67,7 @@
</toolChain>
</folderInfo>
<sourceEntries>
<entry excluding="FreeRTOS+Trace Recorder/streamports" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
</sourceEntries>
</configuration>
</storageModule>
Expand Down Expand Up @@ -101,7 +102,8 @@
<option id="gnu.c.compiler.mingw.exe.debug.option.debugging.level.434354805" name="Debug Level" superClass="gnu.c.compiler.mingw.exe.debug.option.debugging.level" useByScannerDiscovery="false" value="gnu.c.debugging.level.max" valueType="enumerated"/>
<option id="gnu.c.compiler.option.include.paths.1988602727" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/FreeRTOS_Source/include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/FreeRTOS+Trace Recorder/Include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/FreeRTOS+Trace Recorder/include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/FreeRTOS+Trace Recorder/kernelports/FreeRTOS/include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Trace_Recorder_Configuration}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Standard_Demo_Tasks/Include}&quot;"/>
Expand Down Expand Up @@ -139,7 +141,7 @@
</toolChain>
</folderInfo>
<sourceEntries>
<entry excluding="FreeRTOS+Trace Recorder|FreeRTOS+Trace Recorder/streamports" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
<entry excluding="FreeRTOS+Trace Recorder" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
</sourceEntries>
</configuration>
</storageModule>
Expand Down
66 changes: 60 additions & 6 deletions FreeRTOS/Demo/WIN32-MingW/.project
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,57 @@
</linkedResources>
<filteredResources>
<filter>
<id>1387372952208</id>
<id>1713338225157</id>
<name>FreeRTOS+Trace Recorder</name>
<type>10</type>
<type>9</type>
<matcher>
<id>org.eclipse.ui.ide.multiFilter</id>
<arguments>1.0-name-matches-false-false-include</arguments>
</matcher>
</filter>
<filter>
<id>1713338225174</id>
<name>FreeRTOS+Trace Recorder</name>
<type>9</type>
<matcher>
<id>org.eclipse.ui.ide.multiFilter</id>
<arguments>1.0-name-matches-false-false-kernelports</arguments>
</matcher>
</filter>
<filter>
<id>1713338225189</id>
<name>FreeRTOS+Trace Recorder</name>
<type>9</type>
<matcher>
<id>org.eclipse.ui.ide.multiFilter</id>
<arguments>1.0-name-matches-false-false-config</arguments>
</matcher>
</filter>
<filter>
<id>1713338266068</id>
<name>FreeRTOS_Source</name>
<type>5</type>
<matcher>
<id>org.eclipse.ui.ide.multiFilter</id>
<arguments>1.0-name-matches-false-false-ConfigurationTemplate</arguments>
<arguments>1.0-name-matches-false-false-*.c</arguments>
</matcher>
</filter>
<filter>
<id>1713338266079</id>
<name>FreeRTOS_Source</name>
<type>9</type>
<matcher>
<id>org.eclipse.ui.ide.multiFilter</id>
<arguments>1.0-name-matches-false-false-include</arguments>
</matcher>
</filter>
<filter>
<id>1713338266087</id>
<name>FreeRTOS_Source</name>
<type>9</type>
<matcher>
<id>org.eclipse.ui.ide.multiFilter</id>
<arguments>1.0-name-matches-false-false-portable</arguments>
</matcher>
</filter>
<filter>
Expand Down Expand Up @@ -290,7 +335,16 @@
</matcher>
</filter>
<filter>
<id>0</id>
<id>1712588912887</id>
<name>FreeRTOS+Trace Recorder/kernelports</name>
<type>9</type>
<matcher>
<id>org.eclipse.ui.ide.multiFilter</id>
<arguments>1.0-name-matches-false-false-FreeRTOS</arguments>
</matcher>
</filter>
<filter>
<id>1712588782478</id>
<name>FreeRTOS_Source/portable</name>
<type>9</type>
<matcher>
Expand All @@ -299,7 +353,7 @@
</matcher>
</filter>
<filter>
<id>0</id>
<id>1712588782487</id>
<name>FreeRTOS_Source/portable</name>
<type>9</type>
<matcher>
Expand All @@ -308,7 +362,7 @@
</matcher>
</filter>
<filter>
<id>1418321226214</id>
<id>1712588808334</id>
<name>FreeRTOS_Source/portable/MemMang</name>
<type>5</type>
<matcher>
Expand Down

0 comments on commit 3309140

Please sign in to comment.