diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/RTOSDemo.atsuo b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/RTOSDemo.atsuo
index f638ada01..13e628a46 100644
Binary files a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/RTOSDemo.atsuo and b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/RTOSDemo.atsuo differ
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/RTOSDemo.cproj b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/RTOSDemo.cproj
index 27a9cf098..76f7aadf2 100644
--- a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/RTOSDemo.cproj
+++ b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/RTOSDemo.cproj
@@ -10,132 +10,132 @@
3.1.3
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
ATSAM4S16C
sam4s
@@ -185,113 +185,113 @@
- __SAM4S16C__
- True
- True
- True
- True
-
-
- ARM_MATH_CM4=true
- BOARD=SAM4S_EK
- __SAM4S16C__
-
-
-
-
- ../src
- ../src/asf/common/applications/user_application/sam4s16c_sam4s_ek
- ../src/asf/common/boards
- ../src/asf/common/services/gpio
- ../src/asf/common/utils
- ../src/asf/sam/boards
- ../src/asf/sam/boards/sam4s_ek
- ../src/asf/sam/drivers/pio
- ../src/asf/sam/utils
- ../src/asf/sam/utils/cmsis/sam4s/include
- ../src/asf/sam/utils/cmsis/sam4s/source/templates
- ../src/asf/sam/utils/header_files
- ../src/asf/sam/utils/preprocessor
- ../src/asf/thirdparty/CMSIS/Include
- ../src/asf/thirdparty/CMSIS/Lib/GCC
- ../src/config
- C:\devtools\Atmel\Atmel Studio 6.0\extensions\Atmel\ARMGCC\3.3.1.83\ARMSupportFiles
- C:\devtools\Atmel\Atmel Studio 6.0\extensions\Atmel\ARMGCC\3.3.1.83\ARMSupportFiles\CMSIS\Include
- C:\devtools\Atmel\Atmel Studio 6.0\extensions\Atmel\ARMGCC\3.3.1.83\ARMSupportFiles\Device\ATMEL
- C:\devtools\Atmel\Atmel Studio 6.0\extensions\Atmel\ARMGCC\3.3.1.83\ARMSupportFiles\Device\ATMEL\sam4s\include
- ../src/asf/sam/drivers/pmc
- ../src/asf/common/services/clock
- ../src/asf/sam/drivers/usart
-
-
- Optimize for size (-Os)
- -fdata-sections
- True
- True
- -pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Werror-implicit-function-declaration -Wpointer-arith -std=gnu99 -ffunction-sections -fdata-sections -Wchar-subscripts -Wcomment -Wformat=2 -Wimplicit-int -Wmain -Wparentheses -Wsequence-point -Wreturn-type -Wswitch -Wtrigraphs -Wunused -Wuninitialized -Wunknown-pragmas -Wfloat-equal -Wundef -Wshadow -Wbad-function-cast -Wwrite-strings -Wsign-compare -Waggregate-return -Wmissing-declarations -Wformat -Wmissing-format-attribute -Wno-deprecated-declarations -Wpacked -Wredundant-decls -Wnested-externs -Winline -Wlong-long -Wunreachable-code -Wcast-align --param max-inline-insns-single=500 -Dprintf=iprintf
-
-
-
-
-
- arm_cortexM4l_math
-
-
-
-
- ../src/asf/thirdparty/CMSIS/Lib/GCC
-
-
- True
- -T../src/asf/sam/utils/linker_scripts/sam4s/sam4s16/gcc/flash.ld -Wl,--cref -Wl,--entry=Reset_Handler -mthumb
-
-
- ../src
- ../src/asf/common/applications/user_application/sam4s16c_sam4s_ek
- ../src/asf/common/boards
- ../src/asf/common/services/gpio
- ../src/asf/common/utils
- ../src/asf/sam/boards
- ../src/asf/sam/boards/sam4s_ek
- ../src/asf/sam/drivers/pio
- ../src/asf/sam/utils
- ../src/asf/sam/utils/cmsis/sam4s/include
- ../src/asf/sam/utils/cmsis/sam4s/source/templates
- ../src/asf/sam/utils/header_files
- ../src/asf/sam/utils/preprocessor
- ../src/asf/thirdparty/CMSIS/Include
- ../src/asf/thirdparty/CMSIS/Lib/GCC
- ../src/config
- ../src/asf/sam/drivers/pmc
- ../src/asf/common/services/clock
- ../src/asf/sam/drivers/usart
-
-
- -DARM_MATH_CM4=true -DBOARD=SAM4S_EK -D__SAM4S16C__
-
-
- ../src
- ../src/asf/common/applications/user_application/sam4s16c_sam4s_ek
- ../src/asf/common/boards
- ../src/asf/common/services/gpio
- ../src/asf/common/utils
- ../src/asf/sam/boards
- ../src/asf/sam/boards/sam4s_ek
- ../src/asf/sam/drivers/pio
- ../src/asf/sam/utils
- ../src/asf/sam/utils/cmsis/sam4s/include
- ../src/asf/sam/utils/cmsis/sam4s/source/templates
- ../src/asf/sam/utils/header_files
- ../src/asf/sam/utils/preprocessor
- ../src/asf/thirdparty/CMSIS/Include
- ../src/asf/thirdparty/CMSIS/Lib/GCC
- ../src/config
- ../src/asf/sam/drivers/pmc
- ../src/asf/common/services/clock
- ../src/asf/sam/drivers/usart
-
-
-
+ __SAM4S16C__
+ True
+ True
+ True
+ True
+
+
+ ARM_MATH_CM4=true
+ BOARD=SAM4S_EK
+ __SAM4S16C__
+
+
+
+
+ ../src
+ ../src/asf/common/applications/user_application/sam4s16c_sam4s_ek
+ ../src/asf/common/boards
+ ../src/asf/common/services/gpio
+ ../src/asf/common/utils
+ ../src/asf/sam/boards
+ ../src/asf/sam/boards/sam4s_ek
+ ../src/asf/sam/drivers/pio
+ ../src/asf/sam/utils
+ ../src/asf/sam/utils/cmsis/sam4s/include
+ ../src/asf/sam/utils/cmsis/sam4s/source/templates
+ ../src/asf/sam/utils/header_files
+ ../src/asf/sam/utils/preprocessor
+ ../src/asf/thirdparty/CMSIS/Include
+ ../src/asf/thirdparty/CMSIS/Lib/GCC
+ ../src/config
+ C:\devtools\Atmel\Atmel Studio 6.0\extensions\Atmel\ARMGCC\3.3.1.83\ARMSupportFiles
+ C:\devtools\Atmel\Atmel Studio 6.0\extensions\Atmel\ARMGCC\3.3.1.83\ARMSupportFiles\CMSIS\Include
+ C:\devtools\Atmel\Atmel Studio 6.0\extensions\Atmel\ARMGCC\3.3.1.83\ARMSupportFiles\Device\ATMEL
+ C:\devtools\Atmel\Atmel Studio 6.0\extensions\Atmel\ARMGCC\3.3.1.83\ARMSupportFiles\Device\ATMEL\sam4s\include
+ ../src/asf/sam/drivers/pmc
+ ../src/asf/common/services/clock
+ ../src/asf/sam/drivers/usart
+
+
+ Optimize for size (-Os)
+ -fdata-sections
+ True
+ True
+ -pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Werror-implicit-function-declaration -Wpointer-arith -std=gnu99 -ffunction-sections -fdata-sections -Wchar-subscripts -Wcomment -Wformat=2 -Wimplicit-int -Wmain -Wparentheses -Wsequence-point -Wreturn-type -Wswitch -Wtrigraphs -Wunused -Wuninitialized -Wunknown-pragmas -Wfloat-equal -Wundef -Wshadow -Wbad-function-cast -Wwrite-strings -Wsign-compare -Waggregate-return -Wmissing-declarations -Wformat -Wmissing-format-attribute -Wno-deprecated-declarations -Wpacked -Wredundant-decls -Wnested-externs -Winline -Wlong-long -Wunreachable-code -Wcast-align --param max-inline-insns-single=500 -Dprintf=iprintf
+
+
+
+
+
+ arm_cortexM4l_math
+
+
+
+
+ ../src/asf/thirdparty/CMSIS/Lib/GCC
+
+
+ True
+ -T../src/asf/sam/utils/linker_scripts/sam4s/sam4s16/gcc/flash.ld -Wl,--cref -Wl,--entry=Reset_Handler -mthumb
+
+
+ ../src
+ ../src/asf/common/applications/user_application/sam4s16c_sam4s_ek
+ ../src/asf/common/boards
+ ../src/asf/common/services/gpio
+ ../src/asf/common/utils
+ ../src/asf/sam/boards
+ ../src/asf/sam/boards/sam4s_ek
+ ../src/asf/sam/drivers/pio
+ ../src/asf/sam/utils
+ ../src/asf/sam/utils/cmsis/sam4s/include
+ ../src/asf/sam/utils/cmsis/sam4s/source/templates
+ ../src/asf/sam/utils/header_files
+ ../src/asf/sam/utils/preprocessor
+ ../src/asf/thirdparty/CMSIS/Include
+ ../src/asf/thirdparty/CMSIS/Lib/GCC
+ ../src/config
+ ../src/asf/sam/drivers/pmc
+ ../src/asf/common/services/clock
+ ../src/asf/sam/drivers/usart
+
+
+ -DARM_MATH_CM4=true -DBOARD=SAM4S_EK -D__SAM4S16C__
+
+
+ ../src
+ ../src/asf/common/applications/user_application/sam4s16c_sam4s_ek
+ ../src/asf/common/boards
+ ../src/asf/common/services/gpio
+ ../src/asf/common/utils
+ ../src/asf/sam/boards
+ ../src/asf/sam/boards/sam4s_ek
+ ../src/asf/sam/drivers/pio
+ ../src/asf/sam/utils
+ ../src/asf/sam/utils/cmsis/sam4s/include
+ ../src/asf/sam/utils/cmsis/sam4s/source/templates
+ ../src/asf/sam/utils/header_files
+ ../src/asf/sam/utils/preprocessor
+ ../src/asf/thirdparty/CMSIS/Include
+ ../src/asf/thirdparty/CMSIS/Lib/GCC
+ ../src/config
+ ../src/asf/sam/drivers/pmc
+ ../src/asf/common/services/clock
+ ../src/asf/sam/drivers/usart
+
+
+
True
True
@@ -351,11 +351,6 @@
Maximum (-g3)
True
-pipe -Wall -Wextra -std=gnu99 -ffunction-sections -fdata-sections --param max-inline-insns-single=500 -Dprintf=iprintf
-
-
- arm_cortexM4l_math
-
-
../src/asf/thirdparty/CMSIS/Lib/GCC