diff --git a/FreeRTOS/Demo/CORTEX_ATSAM3S-EK2_Atmel_Studio/CreateProjectDirectoryStructure.bat b/FreeRTOS/Demo/CORTEX_ATSAM3S-EK2_Atmel_Studio/CreateProjectDirectoryStructure.bat index a744b23de..fb2f83668 100644 --- a/FreeRTOS/Demo/CORTEX_ATSAM3S-EK2_Atmel_Studio/CreateProjectDirectoryStructure.bat +++ b/FreeRTOS/Demo/CORTEX_ATSAM3S-EK2_Atmel_Studio/CreateProjectDirectoryStructure.bat @@ -1,11 +1,6 @@ REM This file should be executed from the command line prior to the first -REM build. It will be necessary to refresh the Eclipse project once the -REM .bat file has been executed (normally just press F5 to refresh). - -REM Copies all the required files from their location within the standard -REM FreeRTOS directory structure to under the Eclipse project directory. -REM This permits the Eclipse project to be used in 'managed' mode and without -REM having to setup any linked resources. +REM build. Copies all the required files from their location within the standard +REM FreeRTOS directory structure to under the Atmel Studio project directory. REM Standard paths SET FREERTOS_SOURCE=..\..\Source @@ -21,9 +16,9 @@ IF EXIST src\asf\thirdparty\FreeRTOS Goto END MD src\asf\thirdparty\FreeRTOS\portable MD src\asf\thirdparty\FreeRTOS\portable\GCC MD src\asf\thirdparty\FreeRTOS\portable\GCC\ARM_CM3 - MD src\asf\thirdparty\FreeRTOS\portable\MemMang + MD src\asf\thirdparty\FreeRTOS\portable\MemMang MD src\Common-Demo-Source\include - + REM Copy the core kernel files into the project directory copy %FREERTOS_SOURCE%\tasks.c src\asf\thirdparty\FreeRTOS copy %FREERTOS_SOURCE%\queue.c src\asf\thirdparty\FreeRTOS @@ -32,10 +27,10 @@ IF EXIST src\asf\thirdparty\FreeRTOS Goto END REM Copy the common header files into the project directory copy %FREERTOS_SOURCE%\include\*.* src\asf\thirdparty\FreeRTOS\include - + REM Copy the portable layer files into the project directory copy %FREERTOS_SOURCE%\portable\GCC\ARM_CM3\*.* src\asf\thirdparty\FreeRTOS\portable\GCC\ARM_CM3 - + REM Copy the memory allocation files into the project directory copy %FREERTOS_SOURCE%\portable\MemMang\heap_4.c src\asf\thirdparty\FreeRTOS\portable\MemMang @@ -51,8 +46,8 @@ IF EXIST src\asf\thirdparty\FreeRTOS Goto END copy %COMMON_SOURCE%\recmutex.c src\Common-Demo-Source copy %COMMON_SOURCE%\countsem.c src\Common-Demo-Source copy %COMMON_SOURCE%\integer.c src\Common-Demo-Source - + REM Copy the common demo file headers. copy %COMMON_INCLUDE%\*.h src\Common-Demo-Source\include - + : END diff --git a/FreeRTOS/Demo/CORTEX_ATSAM3X_Atmel_Studio/CreateProjectDirectoryStructure.bat b/FreeRTOS/Demo/CORTEX_ATSAM3X_Atmel_Studio/CreateProjectDirectoryStructure.bat index a744b23de..fb2f83668 100644 --- a/FreeRTOS/Demo/CORTEX_ATSAM3X_Atmel_Studio/CreateProjectDirectoryStructure.bat +++ b/FreeRTOS/Demo/CORTEX_ATSAM3X_Atmel_Studio/CreateProjectDirectoryStructure.bat @@ -1,11 +1,6 @@ REM This file should be executed from the command line prior to the first -REM build. It will be necessary to refresh the Eclipse project once the -REM .bat file has been executed (normally just press F5 to refresh). - -REM Copies all the required files from their location within the standard -REM FreeRTOS directory structure to under the Eclipse project directory. -REM This permits the Eclipse project to be used in 'managed' mode and without -REM having to setup any linked resources. +REM build. Copies all the required files from their location within the standard +REM FreeRTOS directory structure to under the Atmel Studio project directory. REM Standard paths SET FREERTOS_SOURCE=..\..\Source @@ -21,9 +16,9 @@ IF EXIST src\asf\thirdparty\FreeRTOS Goto END MD src\asf\thirdparty\FreeRTOS\portable MD src\asf\thirdparty\FreeRTOS\portable\GCC MD src\asf\thirdparty\FreeRTOS\portable\GCC\ARM_CM3 - MD src\asf\thirdparty\FreeRTOS\portable\MemMang + MD src\asf\thirdparty\FreeRTOS\portable\MemMang MD src\Common-Demo-Source\include - + REM Copy the core kernel files into the project directory copy %FREERTOS_SOURCE%\tasks.c src\asf\thirdparty\FreeRTOS copy %FREERTOS_SOURCE%\queue.c src\asf\thirdparty\FreeRTOS @@ -32,10 +27,10 @@ IF EXIST src\asf\thirdparty\FreeRTOS Goto END REM Copy the common header files into the project directory copy %FREERTOS_SOURCE%\include\*.* src\asf\thirdparty\FreeRTOS\include - + REM Copy the portable layer files into the project directory copy %FREERTOS_SOURCE%\portable\GCC\ARM_CM3\*.* src\asf\thirdparty\FreeRTOS\portable\GCC\ARM_CM3 - + REM Copy the memory allocation files into the project directory copy %FREERTOS_SOURCE%\portable\MemMang\heap_4.c src\asf\thirdparty\FreeRTOS\portable\MemMang @@ -51,8 +46,8 @@ IF EXIST src\asf\thirdparty\FreeRTOS Goto END copy %COMMON_SOURCE%\recmutex.c src\Common-Demo-Source copy %COMMON_SOURCE%\countsem.c src\Common-Demo-Source copy %COMMON_SOURCE%\integer.c src\Common-Demo-Source - + REM Copy the common demo file headers. copy %COMMON_INCLUDE%\*.h src\Common-Demo-Source\include - + : END diff --git a/FreeRTOS/Demo/CORTEX_M4_ATSAM4L_Atmel_Studio/src/SAM4L_low_power_tick_management.c b/FreeRTOS/Demo/CORTEX_M4_ATSAM4L_Atmel_Studio/src/SAM4L_low_power_tick_management.c index b34a0f8b3..735cca624 100644 --- a/FreeRTOS/Demo/CORTEX_M4_ATSAM4L_Atmel_Studio/src/SAM4L_low_power_tick_management.c +++ b/FreeRTOS/Demo/CORTEX_M4_ATSAM4L_Atmel_Studio/src/SAM4L_low_power_tick_management.c @@ -134,7 +134,7 @@ static volatile uint32_t ulTickFlag = pdFALSE; following variable offsets the AST counter alarm value by the number of AST counts that would typically be missed while the counter was stopped to compensate for the lost time. _RB_ Value needs calculating correctly. */ -static uint32_t ulStoppedTimerCompensation = 10 / ( configCPU_CLOCK_HZ / configSYSTICK_CLOCK_HZ ); +static uint32_t ulStoppedTimerCompensation = 2 / ( configCPU_CLOCK_HZ / configSYSTICK_CLOCK_HZ ); /*-----------------------------------------------------------*/ @@ -274,10 +274,8 @@ enum sleepmgr_mode xSleepMode; } /* Calculate the reload value required to wait xExpectedIdleTime tick - periods. -1 is used because this code will execute part way through one of - the tick periods, and the fraction of a tick period is accounted for - later. */ - ulAlarmValue = ( ulAlarmValueForOneTick * ( xExpectedIdleTime - 1UL ) ); + periods. */ + ulAlarmValue = ulAlarmValueForOneTick * xExpectedIdleTime; if( ulAlarmValue > ulStoppedTimerCompensation ) { /* Compensate for the fact that the AST is going to be stopped diff --git a/FreeRTOS/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/CreateProjectDirectoryStructure.bat b/FreeRTOS/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/CreateProjectDirectoryStructure.bat index cf4d11ce0..eec526613 100644 --- a/FreeRTOS/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/CreateProjectDirectoryStructure.bat +++ b/FreeRTOS/Demo/CORTEX_M4_ATSAM4S_Atmel_Studio/CreateProjectDirectoryStructure.bat @@ -1,11 +1,6 @@ REM This file should be executed from the command line prior to the first -REM build. It will be necessary to refresh the Eclipse project once the -REM .bat file has been executed (normally just press F5 to refresh). - -REM Copies all the required files from their location within the standard -REM FreeRTOS directory structure to under the Eclipse project directory. -REM This permits the Eclipse project to be used in 'managed' mode and without -REM having to setup any linked resources. +REM build. Copies all the required files from their location within the standard +REM FreeRTOS directory structure to under the Atmel Studio project directory. REM Standard paths SET FREERTOS_SOURCE=..\..\Source @@ -21,9 +16,9 @@ IF EXIST src\asf\thirdparty\FreeRTOS Goto END MD src\asf\thirdparty\FreeRTOS\portable MD src\asf\thirdparty\FreeRTOS\portable\GCC MD src\asf\thirdparty\FreeRTOS\portable\GCC\ARM_CM3 - MD src\asf\thirdparty\FreeRTOS\portable\MemMang + MD src\asf\thirdparty\FreeRTOS\portable\MemMang MD src\Common-Demo-Source\include - + REM Copy the core kernel files into the project directory copy %FREERTOS_SOURCE%\tasks.c src\asf\thirdparty\FreeRTOS copy %FREERTOS_SOURCE%\queue.c src\asf\thirdparty\FreeRTOS @@ -32,10 +27,10 @@ IF EXIST src\asf\thirdparty\FreeRTOS Goto END REM Copy the common header files into the project directory copy %FREERTOS_SOURCE%\include\*.* src\asf\thirdparty\FreeRTOS\include - + REM Copy the portable layer files into the project directory copy %FREERTOS_SOURCE%\portable\GCC\ARM_CM3\*.* src\asf\thirdparty\FreeRTOS\portable\GCC\ARM_CM3 - + REM Copy the memory allocation files into the project directory copy %FREERTOS_SOURCE%\portable\MemMang\heap_4.c src\asf\thirdparty\FreeRTOS\portable\MemMang @@ -52,8 +47,8 @@ IF EXIST src\asf\thirdparty\FreeRTOS Goto END copy %COMMON_SOURCE%\countsem.c src\Common-Demo-Source copy %COMMON_SOURCE%\integer.c src\Common-Demo-Source copy %COMMON_SOURCE%\QueueSet.c src\Common-Demo-Source - + REM Copy the common demo file headers. copy %COMMON_INCLUDE%\*.h src\Common-Demo-Source\include - + : END diff --git a/FreeRTOS/Source/portable/GCC/RX100/port.c b/FreeRTOS/Source/portable/GCC/RX100/port.c index ece7e30f3..3180202fc 100644 --- a/FreeRTOS/Source/portable/GCC/RX100/port.c +++ b/FreeRTOS/Source/portable/GCC/RX100/port.c @@ -580,10 +580,8 @@ static void prvSetupTimerInterrupt( void ) } /* Calculate the reload value required to wait xExpectedIdleTime tick - periods. -1 is used because this code will execute part way through - one of the tick periods, and the fraction of a tick period is accounted - for later. */ - ulMatchValue = ( ulMatchValueForOneTick * ( xExpectedIdleTime - 1UL ) ); + periods. */ + ulMatchValue = ulMatchValueForOneTick * xExpectedIdleTime; if( ulMatchValue > ulStoppedTimerCompensation ) { /* Compensate for the fact that the CMT is going to be stopped diff --git a/FreeRTOS/Source/portable/IAR/RX100/port.c b/FreeRTOS/Source/portable/IAR/RX100/port.c index 1051aff05..23b04391e 100644 --- a/FreeRTOS/Source/portable/IAR/RX100/port.c +++ b/FreeRTOS/Source/portable/IAR/RX100/port.c @@ -424,10 +424,8 @@ static void prvSetupTimerInterrupt( void ) } /* Calculate the reload value required to wait xExpectedIdleTime tick - periods. -1 is used because this code will execute part way through - one of the tick periods, and the fraction of a tick period is accounted - for later. */ - ulMatchValue = ( ulMatchValueForOneTick * ( xExpectedIdleTime - 1UL ) ); + periods. */ + ulMatchValue = ulMatchValueForOneTick * xExpectedIdleTime; if( ulMatchValue > ulStoppedTimerCompensation ) { /* Compensate for the fact that the CMT is going to be stopped diff --git a/FreeRTOS/Source/portable/Renesas/RX100/port.c b/FreeRTOS/Source/portable/Renesas/RX100/port.c index 6dacf3a9c..7026dff16 100644 --- a/FreeRTOS/Source/portable/Renesas/RX100/port.c +++ b/FreeRTOS/Source/portable/Renesas/RX100/port.c @@ -554,10 +554,8 @@ static void prvSetupTimerInterrupt( void ) } /* Calculate the reload value required to wait xExpectedIdleTime tick - periods. -1 is used because this code will execute part way through - one of the tick periods, and the fraction of a tick period is accounted - for later. */ - ulMatchValue = ( ulMatchValueForOneTick * ( xExpectedIdleTime - 1UL ) ); + periods. */ + ulMatchValue = ulMatchValueForOneTick * xExpectedIdleTime; if( ulMatchValue > ulStoppedTimerCompensation ) { /* Compensate for the fact that the CMT is going to be stopped