From 592d41dfca6f18dcd24a371ee61817c6c8b37ad2 Mon Sep 17 00:00:00 2001 From: richardbarry Date: Sun, 8 Jul 2012 15:58:54 +0000 Subject: [PATCH] Renamed the CORTEX_M4_ATSAM4S_AVR_Studio directory to the correct CORTEX_M4_ATSAM4S_Atmel_Studio. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1759 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- .../RTOSDemo.atsln | 0 .../RTOSDemo.atsuo | Bin .../RTOSDemo.cproj | 0 .../src/Common-Demo-Source/BlockQ.c | 0 .../src/Common-Demo-Source/GenQTest.c | 0 .../src/Common-Demo-Source/PollQ.c | 0 .../src/Common-Demo-Source/blocktim.c | 0 .../src/Common-Demo-Source/comtest.c | 0 .../src/Common-Demo-Source/countsem.c | 0 .../src/Common-Demo-Source/death.c | 0 .../src/Common-Demo-Source/dynamic.c | 0 .../src/Common-Demo-Source/flash_timer.c | 0 .../src/Common-Demo-Source/include/BlockQ.h | 0 .../src/Common-Demo-Source/include/GenQTest.h | 0 .../src/Common-Demo-Source/include/PollQ.h | 0 .../src/Common-Demo-Source/include/blocktim.h | 0 .../src/Common-Demo-Source/include/comtest2.h | 0 .../src/Common-Demo-Source/include/countsem.h | 0 .../src/Common-Demo-Source/include/death.h | 0 .../src/Common-Demo-Source/include/demo_serial.h | 0 .../src/Common-Demo-Source/include/dynamic.h | 0 .../src/Common-Demo-Source/include/flash_timer.h | 0 .../src/Common-Demo-Source/include/integer.h | 0 .../src/Common-Demo-Source/include/partest.h | 0 .../src/Common-Demo-Source/include/recmutex.h | 0 .../src/Common-Demo-Source/include/semtest.h | 0 .../src/Common-Demo-Source/integer.c | 0 .../src/Common-Demo-Source/recmutex.c | 0 .../src/Common-Demo-Source/semtest.c | 0 .../src/FreeRTOSConfig.h | 0 .../src/ParTest.c | 0 .../src/asf.h | 0 .../src/asf/common/boards/board.h | 0 .../src/asf/common/services/clock/genclk.h | 0 .../src/asf/common/services/clock/osc.h | 0 .../src/asf/common/services/clock/pll.h | 0 .../src/asf/common/services/clock/sam4s/genclk.h | 0 .../src/asf/common/services/clock/sam4s/osc.h | 0 .../src/asf/common/services/clock/sam4s/pll.h | 0 .../src/asf/common/services/clock/sam4s/sysclk.c | 0 .../src/asf/common/services/clock/sam4s/sysclk.h | 0 .../src/asf/common/services/clock/sysclk.h | 0 .../src/asf/common/services/gpio/gpio.h | 0 .../asf/common/services/gpio/sam_ioport/sam_gpio.h | 0 .../src/asf/common/utils/interrupt.h | 0 .../asf/common/utils/interrupt/interrupt_sam_nvic.c | 0 .../asf/common/utils/interrupt/interrupt_sam_nvic.h | 0 .../src/asf/sam/boards/sam4s_ek/init.c | 0 .../src/asf/sam/boards/sam4s_ek/sam4s_ek.h | 0 .../src/asf/sam/drivers/pio/pio.c | 0 .../src/asf/sam/drivers/pio/pio.h | 0 .../src/asf/sam/drivers/pio/pio_handler.c | 0 .../src/asf/sam/drivers/pio/pio_handler.h | 0 .../src/asf/sam/drivers/pmc/pmc.c | 0 .../src/asf/sam/drivers/pmc/pmc.h | 0 .../src/asf/sam/drivers/pmc/sleep.h | 0 .../src/asf/sam/drivers/usart/usart.c | 0 .../src/asf/sam/drivers/usart/usart.h | 0 .../cmsis/sam4s/include/component/component_acc.h | 0 .../cmsis/sam4s/include/component/component_adc.h | 0 .../sam4s/include/component/component_chipid.h | 0 .../cmsis/sam4s/include/component/component_crccu.h | 0 .../cmsis/sam4s/include/component/component_dacc.h | 0 .../cmsis/sam4s/include/component/component_efc.h | 0 .../cmsis/sam4s/include/component/component_gpbr.h | 0 .../cmsis/sam4s/include/component/component_hsmci.h | 0 .../sam4s/include/component/component_matrix.h | 0 .../cmsis/sam4s/include/component/component_pdc.h | 0 .../cmsis/sam4s/include/component/component_pio.h | 0 .../cmsis/sam4s/include/component/component_pmc.h | 0 .../cmsis/sam4s/include/component/component_pwm.h | 0 .../cmsis/sam4s/include/component/component_rstc.h | 0 .../cmsis/sam4s/include/component/component_rtc.h | 0 .../cmsis/sam4s/include/component/component_rtt.h | 0 .../cmsis/sam4s/include/component/component_smc.h | 0 .../cmsis/sam4s/include/component/component_spi.h | 0 .../cmsis/sam4s/include/component/component_ssc.h | 0 .../cmsis/sam4s/include/component/component_supc.h | 0 .../cmsis/sam4s/include/component/component_tc.h | 0 .../cmsis/sam4s/include/component/component_twi.h | 0 .../cmsis/sam4s/include/component/component_uart.h | 0 .../cmsis/sam4s/include/component/component_udp.h | 0 .../cmsis/sam4s/include/component/component_usart.h | 0 .../cmsis/sam4s/include/component/component_wdt.h | 0 .../cmsis/sam4s/include/instance/instance_acc.h | 0 .../cmsis/sam4s/include/instance/instance_adc.h | 0 .../cmsis/sam4s/include/instance/instance_chipid.h | 0 .../cmsis/sam4s/include/instance/instance_crccu.h | 0 .../cmsis/sam4s/include/instance/instance_dacc.h | 0 .../cmsis/sam4s/include/instance/instance_efc.h | 0 .../cmsis/sam4s/include/instance/instance_gpbr.h | 0 .../cmsis/sam4s/include/instance/instance_hsmci.h | 0 .../cmsis/sam4s/include/instance/instance_matrix.h | 0 .../cmsis/sam4s/include/instance/instance_pioa.h | 0 .../cmsis/sam4s/include/instance/instance_piob.h | 0 .../cmsis/sam4s/include/instance/instance_pioc.h | 0 .../cmsis/sam4s/include/instance/instance_pmc.h | 0 .../cmsis/sam4s/include/instance/instance_pwm.h | 0 .../cmsis/sam4s/include/instance/instance_rstc.h | 0 .../cmsis/sam4s/include/instance/instance_rtc.h | 0 .../cmsis/sam4s/include/instance/instance_rtt.h | 0 .../cmsis/sam4s/include/instance/instance_smc.h | 0 .../cmsis/sam4s/include/instance/instance_spi.h | 0 .../cmsis/sam4s/include/instance/instance_ssc.h | 0 .../cmsis/sam4s/include/instance/instance_supc.h | 0 .../cmsis/sam4s/include/instance/instance_tc0.h | 0 .../cmsis/sam4s/include/instance/instance_tc1.h | 0 .../cmsis/sam4s/include/instance/instance_twi0.h | 0 .../cmsis/sam4s/include/instance/instance_twi1.h | 0 .../cmsis/sam4s/include/instance/instance_uart0.h | 0 .../cmsis/sam4s/include/instance/instance_uart1.h | 0 .../cmsis/sam4s/include/instance/instance_udp.h | 0 .../cmsis/sam4s/include/instance/instance_usart0.h | 0 .../cmsis/sam4s/include/instance/instance_usart1.h | 0 .../cmsis/sam4s/include/instance/instance_wdt.h | 0 .../utils/cmsis/sam4s/include/pio/pio_sam4s16c.h | 0 .../src/asf/sam/utils/cmsis/sam4s/include/sam4s.h | 0 .../asf/sam/utils/cmsis/sam4s/include/sam4s16c.h | 0 .../utils/cmsis/sam4s/source/templates/exceptions.c | 0 .../utils/cmsis/sam4s/source/templates/exceptions.h | 0 .../sam4s/source/templates/gcc/startup_sam4s.c | 0 .../cmsis/sam4s/source/templates/system_sam4s.c | 0 .../cmsis/sam4s/source/templates/system_sam4s.h | 0 .../src/asf/sam/utils/compiler.h | 0 .../src/asf/sam/utils/header_files/io.h | 0 .../utils/linker_scripts/sam4s/sam4s16/gcc/flash.ld | 0 .../src/asf/sam/utils/make/Makefile.in | 0 .../src/asf/sam/utils/parts.h | 0 .../src/asf/sam/utils/preprocessor/mrepeat.h | 0 .../src/asf/sam/utils/preprocessor/preprocessor.h | 0 .../src/asf/sam/utils/preprocessor/stringz.h | 0 .../src/asf/sam/utils/preprocessor/tpaste.h | 0 .../src/asf/sam/utils/status_codes.h | 0 .../CMSIS/CMSIS END USER LICENCE AGREEMENT.pdf | Bin .../src/asf/thirdparty/CMSIS/Include/arm_math.h | 0 .../src/asf/thirdparty/CMSIS/Include/core_cm4.h | 0 .../asf/thirdparty/CMSIS/Include/core_cm4_simd.h | 0 .../src/asf/thirdparty/CMSIS/Include/core_cmFunc.h | 0 .../src/asf/thirdparty/CMSIS/Include/core_cmInstr.h | 0 .../src/asf/thirdparty/CMSIS/README.txt | 0 .../src/asf/thirdparty/CMSIS/license.txt | 0 .../src/asf/thirdparty/FreeRTOS/include/FreeRTOS.h | 0 .../asf/thirdparty/FreeRTOS/include/StackMacros.h | 0 .../src/asf/thirdparty/FreeRTOS/include/croutine.h | 0 .../src/asf/thirdparty/FreeRTOS/include/list.h | 0 .../asf/thirdparty/FreeRTOS/include/mpu_wrappers.h | 0 .../src/asf/thirdparty/FreeRTOS/include/portable.h | 0 .../src/asf/thirdparty/FreeRTOS/include/projdefs.h | 0 .../src/asf/thirdparty/FreeRTOS/include/queue.h | 0 .../src/asf/thirdparty/FreeRTOS/include/semphr.h | 0 .../src/asf/thirdparty/FreeRTOS/include/task.h | 0 .../src/asf/thirdparty/FreeRTOS/include/timers.h | 0 .../src/asf/thirdparty/FreeRTOS/list.c | 0 .../thirdparty/FreeRTOS/portable/GCC/ARM_CM3/port.c | 0 .../FreeRTOS/portable/GCC/ARM_CM3/portmacro.h | 0 .../thirdparty/FreeRTOS/portable/MemMang/heap_2.c | 0 .../src/asf/thirdparty/FreeRTOS/queue.c | 0 .../src/asf/thirdparty/FreeRTOS/tasks.c | 0 .../src/asf/thirdparty/FreeRTOS/timers.c | 0 .../src/config/conf_board.h | 0 .../src/config/conf_clock.h | 0 .../src/main.c | 0 .../src/main_blinky.c | 0 .../src/main_full.c | 0 .../src/serial.c | 0 Demo/Common/Minimal/flash_timer.c | 10 +++++----- Demo/Common/include/flash_timer.h | 2 +- 167 files changed, 6 insertions(+), 6 deletions(-) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/RTOSDemo.atsln (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/RTOSDemo.atsuo (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/RTOSDemo.cproj (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/Common-Demo-Source/BlockQ.c (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/Common-Demo-Source/GenQTest.c (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/Common-Demo-Source/PollQ.c (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/Common-Demo-Source/blocktim.c (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/Common-Demo-Source/comtest.c (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/Common-Demo-Source/countsem.c (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/Common-Demo-Source/death.c (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/Common-Demo-Source/dynamic.c (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/Common-Demo-Source/flash_timer.c (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/Common-Demo-Source/include/BlockQ.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/Common-Demo-Source/include/GenQTest.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/Common-Demo-Source/include/PollQ.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/Common-Demo-Source/include/blocktim.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/Common-Demo-Source/include/comtest2.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/Common-Demo-Source/include/countsem.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/Common-Demo-Source/include/death.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/Common-Demo-Source/include/demo_serial.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/Common-Demo-Source/include/dynamic.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/Common-Demo-Source/include/flash_timer.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/Common-Demo-Source/include/integer.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/Common-Demo-Source/include/partest.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/Common-Demo-Source/include/recmutex.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/Common-Demo-Source/include/semtest.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/Common-Demo-Source/integer.c (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/Common-Demo-Source/recmutex.c (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/Common-Demo-Source/semtest.c (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/FreeRTOSConfig.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/ParTest.c (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/common/boards/board.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/common/services/clock/genclk.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/common/services/clock/osc.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/common/services/clock/pll.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/common/services/clock/sam4s/genclk.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/common/services/clock/sam4s/osc.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/common/services/clock/sam4s/pll.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/common/services/clock/sam4s/sysclk.c (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/common/services/clock/sam4s/sysclk.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/common/services/clock/sysclk.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/common/services/gpio/gpio.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/common/services/gpio/sam_ioport/sam_gpio.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/common/utils/interrupt.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/common/utils/interrupt/interrupt_sam_nvic.c (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/common/utils/interrupt/interrupt_sam_nvic.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/boards/sam4s_ek/init.c (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/boards/sam4s_ek/sam4s_ek.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/drivers/pio/pio.c (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/drivers/pio/pio.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/drivers/pio/pio_handler.c (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/drivers/pio/pio_handler.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/drivers/pmc/pmc.c (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/drivers/pmc/pmc.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/drivers/pmc/sleep.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/drivers/usart/usart.c (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/drivers/usart/usart.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/component/component_acc.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/component/component_adc.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/component/component_chipid.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/component/component_crccu.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/component/component_dacc.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/component/component_efc.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/component/component_gpbr.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/component/component_hsmci.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/component/component_matrix.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/component/component_pdc.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/component/component_pio.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/component/component_pmc.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/component/component_pwm.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/component/component_rstc.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/component/component_rtc.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/component/component_rtt.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/component/component_smc.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/component/component_spi.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/component/component_ssc.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/component/component_supc.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/component/component_tc.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/component/component_twi.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/component/component_uart.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/component/component_udp.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/component/component_usart.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/component/component_wdt.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_acc.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_adc.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_chipid.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_crccu.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_dacc.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_efc.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_gpbr.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_hsmci.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_matrix.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_pioa.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_piob.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_pioc.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_pmc.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_pwm.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_rstc.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_rtc.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_rtt.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_smc.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_spi.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_ssc.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_supc.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_tc0.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_tc1.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_twi0.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_twi1.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_uart0.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_uart1.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_udp.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_usart0.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_usart1.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_wdt.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/pio/pio_sam4s16c.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/sam4s.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/include/sam4s16c.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/source/templates/exceptions.c (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/source/templates/exceptions.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/source/templates/gcc/startup_sam4s.c (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/source/templates/system_sam4s.c (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/cmsis/sam4s/source/templates/system_sam4s.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/compiler.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/header_files/io.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/linker_scripts/sam4s/sam4s16/gcc/flash.ld (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/make/Makefile.in (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/parts.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/preprocessor/mrepeat.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/preprocessor/preprocessor.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/preprocessor/stringz.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/preprocessor/tpaste.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/sam/utils/status_codes.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/thirdparty/CMSIS/CMSIS END USER LICENCE AGREEMENT.pdf (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/thirdparty/CMSIS/Include/arm_math.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/thirdparty/CMSIS/Include/core_cm4.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/thirdparty/CMSIS/Include/core_cm4_simd.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/thirdparty/CMSIS/Include/core_cmFunc.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/thirdparty/CMSIS/Include/core_cmInstr.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/thirdparty/CMSIS/README.txt (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/thirdparty/CMSIS/license.txt (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/thirdparty/FreeRTOS/include/FreeRTOS.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/thirdparty/FreeRTOS/include/StackMacros.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/thirdparty/FreeRTOS/include/croutine.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/thirdparty/FreeRTOS/include/list.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/thirdparty/FreeRTOS/include/mpu_wrappers.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/thirdparty/FreeRTOS/include/portable.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/thirdparty/FreeRTOS/include/projdefs.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/thirdparty/FreeRTOS/include/queue.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/thirdparty/FreeRTOS/include/semphr.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/thirdparty/FreeRTOS/include/task.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/thirdparty/FreeRTOS/include/timers.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/thirdparty/FreeRTOS/list.c (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/thirdparty/FreeRTOS/portable/GCC/ARM_CM3/port.c (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/thirdparty/FreeRTOS/portable/GCC/ARM_CM3/portmacro.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/thirdparty/FreeRTOS/portable/MemMang/heap_2.c (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/thirdparty/FreeRTOS/queue.c (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/thirdparty/FreeRTOS/tasks.c (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/asf/thirdparty/FreeRTOS/timers.c (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/config/conf_board.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/config/conf_clock.h (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/main.c (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/main_blinky.c (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/main_full.c (100%) rename Demo/{CORTEX_M4_ATSAM4S_AVR_Studio => CORTEX_M4_ATSAM4S_Atmel_Studio}/src/serial.c (100%) diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/RTOSDemo.atsln b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/RTOSDemo.atsln similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/RTOSDemo.atsln rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/RTOSDemo.atsln diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/RTOSDemo.atsuo b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/RTOSDemo.atsuo similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/RTOSDemo.atsuo rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/RTOSDemo.atsuo diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/RTOSDemo.cproj b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/RTOSDemo.cproj similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/RTOSDemo.cproj rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/RTOSDemo.cproj diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/BlockQ.c b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/BlockQ.c similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/BlockQ.c rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/BlockQ.c diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/GenQTest.c b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/GenQTest.c similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/GenQTest.c rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/GenQTest.c diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/PollQ.c b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/PollQ.c similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/PollQ.c rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/PollQ.c diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/blocktim.c b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/blocktim.c similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/blocktim.c rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/blocktim.c diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/comtest.c b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/comtest.c similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/comtest.c rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/comtest.c diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/countsem.c b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/countsem.c similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/countsem.c rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/countsem.c diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/death.c b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/death.c similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/death.c rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/death.c diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/dynamic.c b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/dynamic.c similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/dynamic.c rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/dynamic.c diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/flash_timer.c b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/flash_timer.c similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/flash_timer.c rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/flash_timer.c diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/include/BlockQ.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/include/BlockQ.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/include/BlockQ.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/include/BlockQ.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/include/GenQTest.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/include/GenQTest.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/include/GenQTest.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/include/GenQTest.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/include/PollQ.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/include/PollQ.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/include/PollQ.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/include/PollQ.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/include/blocktim.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/include/blocktim.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/include/blocktim.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/include/blocktim.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/include/comtest2.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/include/comtest2.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/include/comtest2.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/include/comtest2.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/include/countsem.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/include/countsem.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/include/countsem.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/include/countsem.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/include/death.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/include/death.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/include/death.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/include/death.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/include/demo_serial.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/include/demo_serial.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/include/demo_serial.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/include/demo_serial.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/include/dynamic.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/include/dynamic.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/include/dynamic.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/include/dynamic.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/include/flash_timer.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/include/flash_timer.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/include/flash_timer.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/include/flash_timer.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/include/integer.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/include/integer.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/include/integer.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/include/integer.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/include/partest.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/include/partest.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/include/partest.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/include/partest.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/include/recmutex.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/include/recmutex.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/include/recmutex.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/include/recmutex.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/include/semtest.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/include/semtest.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/include/semtest.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/include/semtest.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/integer.c b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/integer.c similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/integer.c rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/integer.c diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/recmutex.c b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/recmutex.c similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/recmutex.c rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/recmutex.c diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/semtest.c b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/semtest.c similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/Common-Demo-Source/semtest.c rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/Common-Demo-Source/semtest.c diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOSConfig.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/FreeRTOSConfig.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOSConfig.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/FreeRTOSConfig.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/ParTest.c b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/ParTest.c similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/ParTest.c rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/ParTest.c diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/common/boards/board.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/common/boards/board.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/common/boards/board.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/common/boards/board.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/common/services/clock/genclk.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/common/services/clock/genclk.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/common/services/clock/genclk.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/common/services/clock/genclk.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/common/services/clock/osc.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/common/services/clock/osc.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/common/services/clock/osc.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/common/services/clock/osc.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/common/services/clock/pll.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/common/services/clock/pll.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/common/services/clock/pll.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/common/services/clock/pll.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/common/services/clock/sam4s/genclk.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/common/services/clock/sam4s/genclk.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/common/services/clock/sam4s/genclk.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/common/services/clock/sam4s/genclk.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/common/services/clock/sam4s/osc.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/common/services/clock/sam4s/osc.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/common/services/clock/sam4s/osc.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/common/services/clock/sam4s/osc.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/common/services/clock/sam4s/pll.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/common/services/clock/sam4s/pll.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/common/services/clock/sam4s/pll.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/common/services/clock/sam4s/pll.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/common/services/clock/sam4s/sysclk.c b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/common/services/clock/sam4s/sysclk.c similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/common/services/clock/sam4s/sysclk.c rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/common/services/clock/sam4s/sysclk.c diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/common/services/clock/sam4s/sysclk.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/common/services/clock/sam4s/sysclk.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/common/services/clock/sam4s/sysclk.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/common/services/clock/sam4s/sysclk.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/common/services/clock/sysclk.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/common/services/clock/sysclk.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/common/services/clock/sysclk.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/common/services/clock/sysclk.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/common/services/gpio/gpio.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/common/services/gpio/gpio.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/common/services/gpio/gpio.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/common/services/gpio/gpio.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/common/services/gpio/sam_ioport/sam_gpio.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/common/services/gpio/sam_ioport/sam_gpio.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/common/services/gpio/sam_ioport/sam_gpio.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/common/services/gpio/sam_ioport/sam_gpio.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/common/utils/interrupt.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/common/utils/interrupt.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/common/utils/interrupt.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/common/utils/interrupt.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/common/utils/interrupt/interrupt_sam_nvic.c b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/common/utils/interrupt/interrupt_sam_nvic.c similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/common/utils/interrupt/interrupt_sam_nvic.c rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/common/utils/interrupt/interrupt_sam_nvic.c diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/common/utils/interrupt/interrupt_sam_nvic.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/common/utils/interrupt/interrupt_sam_nvic.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/common/utils/interrupt/interrupt_sam_nvic.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/common/utils/interrupt/interrupt_sam_nvic.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/boards/sam4s_ek/init.c b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/boards/sam4s_ek/init.c similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/boards/sam4s_ek/init.c rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/boards/sam4s_ek/init.c diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/boards/sam4s_ek/sam4s_ek.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/boards/sam4s_ek/sam4s_ek.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/boards/sam4s_ek/sam4s_ek.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/boards/sam4s_ek/sam4s_ek.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/drivers/pio/pio.c b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/drivers/pio/pio.c similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/drivers/pio/pio.c rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/drivers/pio/pio.c diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/drivers/pio/pio.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/drivers/pio/pio.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/drivers/pio/pio.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/drivers/pio/pio.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/drivers/pio/pio_handler.c b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/drivers/pio/pio_handler.c similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/drivers/pio/pio_handler.c rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/drivers/pio/pio_handler.c diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/drivers/pio/pio_handler.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/drivers/pio/pio_handler.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/drivers/pio/pio_handler.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/drivers/pio/pio_handler.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/drivers/pmc/pmc.c b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/drivers/pmc/pmc.c similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/drivers/pmc/pmc.c rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/drivers/pmc/pmc.c diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/drivers/pmc/pmc.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/drivers/pmc/pmc.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/drivers/pmc/pmc.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/drivers/pmc/pmc.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/drivers/pmc/sleep.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/drivers/pmc/sleep.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/drivers/pmc/sleep.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/drivers/pmc/sleep.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/drivers/usart/usart.c b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/drivers/usart/usart.c similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/drivers/usart/usart.c rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/drivers/usart/usart.c diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/drivers/usart/usart.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/drivers/usart/usart.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/drivers/usart/usart.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/drivers/usart/usart.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_acc.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_acc.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_acc.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_acc.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_adc.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_adc.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_adc.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_adc.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_chipid.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_chipid.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_chipid.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_chipid.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_crccu.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_crccu.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_crccu.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_crccu.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_dacc.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_dacc.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_dacc.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_dacc.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_efc.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_efc.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_efc.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_efc.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_gpbr.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_gpbr.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_gpbr.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_gpbr.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_hsmci.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_hsmci.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_hsmci.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_hsmci.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_matrix.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_matrix.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_matrix.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_matrix.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_pdc.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_pdc.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_pdc.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_pdc.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_pio.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_pio.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_pio.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_pio.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_pmc.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_pmc.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_pmc.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_pmc.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_pwm.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_pwm.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_pwm.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_pwm.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_rstc.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_rstc.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_rstc.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_rstc.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_rtc.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_rtc.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_rtc.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_rtc.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_rtt.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_rtt.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_rtt.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_rtt.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_smc.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_smc.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_smc.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_smc.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_spi.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_spi.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_spi.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_spi.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_ssc.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_ssc.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_ssc.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_ssc.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_supc.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_supc.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_supc.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_supc.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_tc.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_tc.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_tc.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_tc.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_twi.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_twi.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_twi.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_twi.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_uart.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_uart.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_uart.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_uart.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_udp.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_udp.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_udp.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_udp.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_usart.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_usart.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_usart.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_usart.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_wdt.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_wdt.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_wdt.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/component/component_wdt.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_acc.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_acc.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_acc.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_acc.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_adc.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_adc.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_adc.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_adc.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_chipid.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_chipid.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_chipid.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_chipid.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_crccu.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_crccu.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_crccu.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_crccu.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_dacc.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_dacc.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_dacc.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_dacc.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_efc.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_efc.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_efc.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_efc.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_gpbr.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_gpbr.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_gpbr.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_gpbr.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_hsmci.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_hsmci.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_hsmci.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_hsmci.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_matrix.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_matrix.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_matrix.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_matrix.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_pioa.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_pioa.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_pioa.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_pioa.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_piob.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_piob.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_piob.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_piob.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_pioc.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_pioc.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_pioc.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_pioc.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_pmc.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_pmc.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_pmc.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_pmc.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_pwm.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_pwm.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_pwm.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_pwm.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_rstc.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_rstc.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_rstc.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_rstc.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_rtc.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_rtc.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_rtc.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_rtc.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_rtt.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_rtt.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_rtt.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_rtt.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_smc.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_smc.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_smc.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_smc.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_spi.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_spi.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_spi.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_spi.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_ssc.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_ssc.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_ssc.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_ssc.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_supc.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_supc.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_supc.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_supc.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_tc0.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_tc0.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_tc0.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_tc0.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_tc1.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_tc1.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_tc1.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_tc1.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_twi0.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_twi0.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_twi0.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_twi0.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_twi1.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_twi1.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_twi1.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_twi1.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_uart0.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_uart0.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_uart0.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_uart0.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_uart1.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_uart1.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_uart1.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_uart1.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_udp.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_udp.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_udp.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_udp.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_usart0.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_usart0.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_usart0.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_usart0.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_usart1.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_usart1.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_usart1.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_usart1.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_wdt.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_wdt.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_wdt.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/instance/instance_wdt.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/pio/pio_sam4s16c.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/pio/pio_sam4s16c.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/pio/pio_sam4s16c.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/pio/pio_sam4s16c.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/sam4s.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/sam4s.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/sam4s.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/sam4s.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/sam4s16c.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/sam4s16c.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/include/sam4s16c.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/include/sam4s16c.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/source/templates/exceptions.c b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/source/templates/exceptions.c similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/source/templates/exceptions.c rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/source/templates/exceptions.c diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/source/templates/exceptions.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/source/templates/exceptions.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/source/templates/exceptions.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/source/templates/exceptions.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/source/templates/gcc/startup_sam4s.c b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/source/templates/gcc/startup_sam4s.c similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/source/templates/gcc/startup_sam4s.c rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/source/templates/gcc/startup_sam4s.c diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/source/templates/system_sam4s.c b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/source/templates/system_sam4s.c similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/source/templates/system_sam4s.c rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/source/templates/system_sam4s.c diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/source/templates/system_sam4s.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/source/templates/system_sam4s.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/cmsis/sam4s/source/templates/system_sam4s.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/cmsis/sam4s/source/templates/system_sam4s.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/compiler.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/compiler.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/compiler.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/compiler.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/header_files/io.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/header_files/io.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/header_files/io.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/header_files/io.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/linker_scripts/sam4s/sam4s16/gcc/flash.ld b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/linker_scripts/sam4s/sam4s16/gcc/flash.ld similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/linker_scripts/sam4s/sam4s16/gcc/flash.ld rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/linker_scripts/sam4s/sam4s16/gcc/flash.ld diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/make/Makefile.in b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/make/Makefile.in similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/make/Makefile.in rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/make/Makefile.in diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/parts.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/parts.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/parts.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/parts.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/preprocessor/mrepeat.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/preprocessor/mrepeat.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/preprocessor/mrepeat.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/preprocessor/mrepeat.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/preprocessor/preprocessor.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/preprocessor/preprocessor.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/preprocessor/preprocessor.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/preprocessor/preprocessor.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/preprocessor/stringz.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/preprocessor/stringz.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/preprocessor/stringz.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/preprocessor/stringz.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/preprocessor/tpaste.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/preprocessor/tpaste.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/preprocessor/tpaste.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/preprocessor/tpaste.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/status_codes.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/status_codes.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/sam/utils/status_codes.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/sam/utils/status_codes.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/CMSIS/CMSIS END USER LICENCE AGREEMENT.pdf b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/CMSIS/CMSIS END USER LICENCE AGREEMENT.pdf similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/CMSIS/CMSIS END USER LICENCE AGREEMENT.pdf rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/CMSIS/CMSIS END USER LICENCE AGREEMENT.pdf diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/CMSIS/Include/arm_math.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/CMSIS/Include/arm_math.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/CMSIS/Include/arm_math.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/CMSIS/Include/arm_math.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/CMSIS/Include/core_cm4.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/CMSIS/Include/core_cm4.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/CMSIS/Include/core_cm4.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/CMSIS/Include/core_cm4.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/CMSIS/Include/core_cm4_simd.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/CMSIS/Include/core_cm4_simd.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/CMSIS/Include/core_cm4_simd.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/CMSIS/Include/core_cm4_simd.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/CMSIS/Include/core_cmFunc.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/CMSIS/Include/core_cmFunc.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/CMSIS/Include/core_cmFunc.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/CMSIS/Include/core_cmFunc.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/CMSIS/Include/core_cmInstr.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/CMSIS/Include/core_cmInstr.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/CMSIS/Include/core_cmInstr.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/CMSIS/Include/core_cmInstr.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/CMSIS/README.txt b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/CMSIS/README.txt similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/CMSIS/README.txt rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/CMSIS/README.txt diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/CMSIS/license.txt b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/CMSIS/license.txt similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/CMSIS/license.txt rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/CMSIS/license.txt diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/FreeRTOS.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/FreeRTOS/include/FreeRTOS.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/FreeRTOS.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/FreeRTOS/include/FreeRTOS.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/StackMacros.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/FreeRTOS/include/StackMacros.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/StackMacros.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/FreeRTOS/include/StackMacros.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/croutine.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/FreeRTOS/include/croutine.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/croutine.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/FreeRTOS/include/croutine.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/list.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/FreeRTOS/include/list.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/list.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/FreeRTOS/include/list.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/mpu_wrappers.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/FreeRTOS/include/mpu_wrappers.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/mpu_wrappers.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/FreeRTOS/include/mpu_wrappers.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/portable.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/FreeRTOS/include/portable.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/portable.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/FreeRTOS/include/portable.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/projdefs.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/FreeRTOS/include/projdefs.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/projdefs.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/FreeRTOS/include/projdefs.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/queue.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/FreeRTOS/include/queue.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/queue.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/FreeRTOS/include/queue.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/semphr.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/FreeRTOS/include/semphr.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/semphr.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/FreeRTOS/include/semphr.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/task.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/FreeRTOS/include/task.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/task.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/FreeRTOS/include/task.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/timers.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/FreeRTOS/include/timers.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/timers.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/FreeRTOS/include/timers.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/list.c b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/FreeRTOS/list.c similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/list.c rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/FreeRTOS/list.c diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/portable/GCC/ARM_CM3/port.c b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/FreeRTOS/portable/GCC/ARM_CM3/port.c similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/portable/GCC/ARM_CM3/port.c rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/FreeRTOS/portable/GCC/ARM_CM3/port.c diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/portable/GCC/ARM_CM3/portmacro.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/FreeRTOS/portable/GCC/ARM_CM3/portmacro.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/portable/GCC/ARM_CM3/portmacro.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/FreeRTOS/portable/GCC/ARM_CM3/portmacro.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/portable/MemMang/heap_2.c b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/FreeRTOS/portable/MemMang/heap_2.c similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/portable/MemMang/heap_2.c rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/FreeRTOS/portable/MemMang/heap_2.c diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/queue.c b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/FreeRTOS/queue.c similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/queue.c rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/FreeRTOS/queue.c diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/tasks.c b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/FreeRTOS/tasks.c similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/tasks.c rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/FreeRTOS/tasks.c diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/timers.c b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/FreeRTOS/timers.c similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/timers.c rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/asf/thirdparty/FreeRTOS/timers.c diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/config/conf_board.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/config/conf_board.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/config/conf_board.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/config/conf_board.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/config/conf_clock.h b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/config/conf_clock.h similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/config/conf_clock.h rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/config/conf_clock.h diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/main.c b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/main.c similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/main.c rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/main.c diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/main_blinky.c b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/main_blinky.c similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/main_blinky.c rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/main_blinky.c diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/main_full.c b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/main_full.c similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/main_full.c rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/main_full.c diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/serial.c b/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/serial.c similarity index 100% rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/serial.c rename to Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/src/serial.c diff --git a/Demo/Common/Minimal/flash_timer.c b/Demo/Common/Minimal/flash_timer.c index b969a4bf4..39c0fc8a4 100644 --- a/Demo/Common/Minimal/flash_timer.c +++ b/Demo/Common/Minimal/flash_timer.c @@ -94,19 +94,19 @@ static void prvLEDTimerCallback( xTimerHandle xTimer ); /*-----------------------------------------------------------*/ -void vStartLEDFlashTimers( unsigned portBASE_TYPE xNumberOfLEDs ) +void vStartLEDFlashTimers( unsigned portBASE_TYPE uxNumberOfLEDs ) { -portBASE_TYPE xLEDTimer; +unsigned portBASE_TYPE uxLEDTimer; xTimerHandle xTimer; /* Create and start the requested number of timers. */ - for( xLEDTimer = 0; xLEDTimer < xNumberOfLEDs; ++xLEDTimer ) + for( uxLEDTimer = 0; uxLEDTimer < uxNumberOfLEDs; ++uxLEDTimer ) { /* Create the timer. */ xTimer = xTimerCreate( ( const signed char * const ) "Flasher",/* A text name, purely to help debugging. */ - ledFLASH_RATE_BASE * ( xLEDTimer + 1 ), /* The timer period, which is a multiple of ledFLASH_RATE_BASE. */ + ledFLASH_RATE_BASE * ( uxLEDTimer + 1 ), /* The timer period, which is a multiple of ledFLASH_RATE_BASE. */ pdTRUE, /* This is an auto-reload timer, so xAutoReload is set to pdTRUE. */ - ( void * ) xLEDTimer, /* The ID is used to identify the timer within the timer callback function, as each timer uses the same callback. */ + ( void * ) uxLEDTimer, /* The ID is used to identify the timer within the timer callback function, as each timer uses the same callback. */ prvLEDTimerCallback /* Each timer uses the same callback. */ ); diff --git a/Demo/Common/include/flash_timer.h b/Demo/Common/include/flash_timer.h index 7404d7275..fd0b071eb 100644 --- a/Demo/Common/include/flash_timer.h +++ b/Demo/Common/include/flash_timer.h @@ -75,6 +75,6 @@ * within the callback function to determine which timer has actually expired * (and therefore which LED to toggle). */ -void vStartLEDFlashTimers( unsigned portBASE_TYPE xNumberOfLEDs ); +void vStartLEDFlashTimers( unsigned portBASE_TYPE uxNumberOfLEDs ); #endif /* FLASH_TIMER_H */ -- 2.39.5