FreeRTOS source changes:

[freertos] / FreeRTOS / Demo / CORTEX_M0+_Atmel_SAMD20_XPlained / RTOSDemo / RTOSDemo.cproj

diff --git a/FreeRTOS/Demo/CORTEX_M0+_Atmel_SAMD20_XPlained/RTOSDemo/RTOSDemo.cproj b/FreeRTOS/Demo/CORTEX_M0+_Atmel_SAMD20_XPlained/RTOSDemo/RTOSDemo.cproj
index f6369af17c6ea6a6ac2f6119bca6c28d43ffc8a1..8f0de0298c10e2bc54daf70a49cba129029553bf 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_M0+_Atmel_SAMD20_XPlained/RTOSDemo/RTOSDemo.cproj
+++ b/FreeRTOS/Demo/CORTEX_M0+_Atmel_SAMD20_XPlained/RTOSDemo/RTOSDemo.cproj
@@ -2,7 +2,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">\r
   <PropertyGroup>\r
     <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectVersion>6.1</ProjectVersion>\r
+    <ProjectVersion>7.0</ProjectVersion>\r
     <ProjectGuid>{2a475b6a-78b0-4237-8947-341bd379ab5c}</ProjectGuid>\r
     <Name>$(MSBuildProjectName)</Name>\r
     <AssemblyName>$(MSBuildProjectName)</AssemblyName>\r
@@ -165,7 +165,7 @@
         <documentation help="http://asf.atmel.com/docs/3.11.0/common.applications.user_application.xplained_pro2.samd20_xplained_pro/html/index.html" />\r
         <offline-documentation help="" />\r
         <dependencies>\r
-          <content-extension eid="atmel.asf" uuidref="Atmel.ASF" version="3.11.0" />\r
+          <content-extension eid="atmel.asf" uuidref="Atmel.ASF" version="3.18.1" />\r
         </dependencies>\r
         <project id="common.applications.user_application.xplained_pro2.samd20_xplained_pro" value="Add" config="" content-id="Atmel.ASF" />\r
         <board id="board.samd20_xplained_pro" value="Add" config="" content-id="Atmel.ASF" />\r
@@ -216,6 +216,8 @@
       <ToolNumber>000591000435</ToolNumber>\r
       <ToolName>J-Link</ToolName>\r
     </com_atmel_avrdbg_tool_samice>\r
+    <preserveEEPROM>true</preserveEEPROM>\r
+    <ExternalProgrammingToolCommand />\r
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">\r
     <ToolchainSettings>\r
@@ -282,38 +284,6 @@
   </armgcc.linker.libraries.LibrarySearchPaths>\r
   <armgcc.linker.optimization.GarbageCollectUnusedSections>True</armgcc.linker.optimization.GarbageCollectUnusedSections>\r
   <armgcc.linker.miscellaneous.LinkerFlags>-Wl,--entry=Reset_Handler -Wl,--cref -mthumb -T../src/ASF/sam0/utils/linker_scripts/samd20/gcc/samd20j18_flash.ld</armgcc.linker.miscellaneous.LinkerFlags>\r
-  <armgcc.assembler.general.IncludePaths>\r
-    <ListValues>\r
-      <Value>../src</Value>\r
-      <Value>../src/ASF/common/boards</Value>\r
-      <Value>../src/ASF/common/utils</Value>\r
-      <Value>../src/ASF/sam0/boards</Value>\r
-      <Value>../src/ASF/sam0/boards/samd20_xplained_pro</Value>\r
-      <Value>../src/ASF/sam0/drivers/port</Value>\r
-      <Value>../src/ASF/sam0/drivers/system</Value>\r
-      <Value>../src/ASF/sam0/drivers/system/clock</Value>\r
-      <Value>../src/ASF/sam0/drivers/system/interrupt</Value>\r
-      <Value>../src/ASF/sam0/drivers/system/pinmux</Value>\r
-      <Value>../src/ASF/sam0/utils</Value>\r
-      <Value>../src/ASF/sam0/utils/cmsis/samd20/include</Value>\r
-      <Value>../src/ASF/sam0/utils/cmsis/samd20/include/component</Value>\r
-      <Value>../src/ASF/sam0/utils/cmsis/samd20/include/instance</Value>\r
-      <Value>../src/ASF/sam0/utils/cmsis/samd20/include/pio</Value>\r
-      <Value>../src/ASF/sam0/utils/cmsis/samd20/source</Value>\r
-      <Value>../src/ASF/sam0/utils/header_files</Value>\r
-      <Value>../src/ASF/sam0/utils/preprocessor</Value>\r
-      <Value>../src/ASF/thirdparty/CMSIS/Include</Value>\r
-      <Value>../src/ASF/thirdparty/CMSIS/Lib/GCC</Value>\r
-      <Value>../src/config</Value>\r
-      <Value>%24(ToolchainDir)\..\..\CMSIS_Atmel</Value>\r
-      <Value>%24(ToolchainDir)\..\..\CMSIS_Atmel\CMSIS\Include</Value>\r
-      <Value>%24(ToolchainDir)\..\..\CMSIS_Atmel\Device\ATMEL</Value>\r
-      <Value>%24(ToolchainDir)\..\..\CMSIS_Atmel\Device\ATMEL\samd20\include</Value>\r
-      <Value>../src/ASF/common/services/serial</Value>\r
-      <Value>../src/ASF/sam0/drivers/sercom</Value>\r
-      <Value>../src/ASF/sam0/drivers/sercom/usart</Value>\r
-    </ListValues>\r
-  </armgcc.assembler.general.IncludePaths>\r
   <armgcc.preprocessingassembler.general.AssemblerFlags>-DARM_MATH_CM0=true -DBOARD=SAMD20_XPLAINED_PRO -D__SAMD20J18__ -DUSART_CALLBACK_MODE=true</armgcc.preprocessingassembler.general.AssemblerFlags>\r
   <armgcc.preprocessingassembler.general.IncludePaths>\r
     <ListValues>\r
@@ -419,38 +389,6 @@
   </armgcc.linker.libraries.LibrarySearchPaths>\r
   <armgcc.linker.optimization.GarbageCollectUnusedSections>True</armgcc.linker.optimization.GarbageCollectUnusedSections>\r
   <armgcc.linker.miscellaneous.LinkerFlags>-Wl,--entry=Reset_Handler -Wl,--cref -mthumb -T../src/ASF/sam0/utils/linker_scripts/samd20/gcc/samd20j18_flash.ld</armgcc.linker.miscellaneous.LinkerFlags>\r
-  <armgcc.assembler.general.IncludePaths>\r
-    <ListValues>\r
-      <Value>../src</Value>\r
-      <Value>../src/ASF/common/boards</Value>\r
-      <Value>../src/ASF/common/utils</Value>\r
-      <Value>../src/ASF/sam0/boards</Value>\r
-      <Value>../src/ASF/sam0/boards/samd20_xplained_pro</Value>\r
-      <Value>../src/ASF/sam0/drivers/port</Value>\r
-      <Value>../src/ASF/sam0/drivers/system</Value>\r
-      <Value>../src/ASF/sam0/drivers/system/clock</Value>\r
-      <Value>../src/ASF/sam0/drivers/system/interrupt</Value>\r
-      <Value>../src/ASF/sam0/drivers/system/pinmux</Value>\r
-      <Value>../src/ASF/sam0/utils</Value>\r
-      <Value>../src/ASF/sam0/utils/cmsis/samd20/include</Value>\r
-      <Value>../src/ASF/sam0/utils/cmsis/samd20/include/component</Value>\r
-      <Value>../src/ASF/sam0/utils/cmsis/samd20/include/instance</Value>\r
-      <Value>../src/ASF/sam0/utils/cmsis/samd20/include/pio</Value>\r
-      <Value>../src/ASF/sam0/utils/cmsis/samd20/source</Value>\r
-      <Value>../src/ASF/sam0/utils/header_files</Value>\r
-      <Value>../src/ASF/sam0/utils/preprocessor</Value>\r
-      <Value>../src/ASF/thirdparty/CMSIS/Include</Value>\r
-      <Value>../src/ASF/thirdparty/CMSIS/Lib/GCC</Value>\r
-      <Value>../src/config</Value>\r
-      <Value>%24(ToolchainDir)\..\..\CMSIS_Atmel</Value>\r
-      <Value>%24(ToolchainDir)\..\..\CMSIS_Atmel\CMSIS\Include</Value>\r
-      <Value>%24(ToolchainDir)\..\..\CMSIS_Atmel\Device\ATMEL</Value>\r
-      <Value>%24(ToolchainDir)\..\..\CMSIS_Atmel\Device\ATMEL\samd20\include</Value>\r
-      <Value>../src/ASF/common/services/serial</Value>\r
-      <Value>../src/ASF/sam0/drivers/sercom</Value>\r
-      <Value>../src/ASF/sam0/drivers/sercom/usart</Value>\r
-    </ListValues>\r
-  </armgcc.assembler.general.IncludePaths>\r
   <armgcc.assembler.debugging.DebugLevel>Default (-g)</armgcc.assembler.debugging.DebugLevel>\r
   <armgcc.preprocessingassembler.general.AssemblerFlags>-DARM_MATH_CM0=true -DBOARD=SAMD20_XPLAINED_PRO -D__SAMD20J18__ -DUSART_CALLBACK_MODE=true</armgcc.preprocessingassembler.general.AssemblerFlags>\r
   <armgcc.preprocessingassembler.general.IncludePaths>\r