diff --git a/libraries/FreeRTOS/library.properties b/libraries/FreeRTOS/library.properties index d3c34a7..77e9c0d 100644 --- a/libraries/FreeRTOS/library.properties +++ b/libraries/FreeRTOS/library.properties @@ -2,8 +2,8 @@ name=FreeRTOS version=11.1.0-3 author=Richard Barry maintainer=Phillip Stevens -sentence=FreeRTOS Real Time Operating System implemented for Arduino Uno R3, Nano, Leonardo, Mega, and related Microchip ATmega devices. -paragraph=The primary design goals are: Easy to use, Small footprint, Robust. Uses Watchdog Timer for 15ms resolution. Slow blink = stack overflow. Fast blink = heap malloc() failure. +sentence=FreeRTOS Real Time Operating System implemented for Arduino devices. +paragraph=The primary design goals are: Easy to use, Small footprint, Robust. Uses SysTick for 10ms resolution. Slow blink = stack overflow. Fast blink = heap malloc() failure. category=Timing url=https://github.com/feilipu/Arduino_FreeRTOS_Library architectures=MIK32_Amur diff --git a/libraries/FreeRTOS/src/FreeRTOSConfig.h b/libraries/FreeRTOS/src/FreeRTOSConfig.h index ff46df2..5ecb5b8 100644 --- a/libraries/FreeRTOS/src/FreeRTOSConfig.h +++ b/libraries/FreeRTOS/src/FreeRTOSConfig.h @@ -31,45 +31,43 @@ extern "C" { /* Delay definition - here, the user can choose which delay implementation is required. * The default is to change nothing. */ -#define configUSE_PORT_DELAY 0 #define configUSE_PREEMPTION 1 - #define configCPU_CLOCK_HZ ( ( uint32_t ) F_CPU ) // This F_CPU variable set by the environment #define configTICK_RATE_HZ ( ( TickType_t ) 100 ) -#define configUSE_16_BIT_TICKS 0 - #define configMAX_PRIORITIES 4 -#define configMAX_TASK_NAME_LEN 16 - -#define configTOTAL_HEAP_SIZE ( ( size_t ) 5*1024 ) - -/* Set the stack depth type to be uint16_t, otherwise it defaults to StackType_t */ -#define configSTACK_DEPTH_TYPE uint16_t - #define configMINIMAL_STACK_SIZE 192 -/* don't define to reuse the stack allocated in the linker script via __freertos_irq_stack_top variable*/ -// #define configISR_STACK_SIZE_WORDS 128 -#define configCHECK_FOR_STACK_OVERFLOW 1 -#define configUSE_TRACE_FACILITY 0 - +#define configMAX_TASK_NAME_LEN 16 +#define configUSE_16_BIT_TICKS 0 +#define configIDLE_SHOULD_YIELD 1 #define configUSE_MUTEXES 1 #define configUSE_RECURSIVE_MUTEXES 1 #define configUSE_COUNTING_SEMAPHORES 1 -#define configUSE_TIME_SLICING 1 - -#define configUSE_QUEUE_SETS 0 -#define configUSE_APPLICATION_TASK_TAG 0 -#define configUSE_MALLOC_FAILED_HOOK 1 #define configQUEUE_REGISTRY_SIZE 0 +#define configUSE_QUEUE_SETS 0 +#define configUSE_TIME_SLICING 1 +#define configUSE_APPLICATION_TASK_TAG 0 +#define configUSE_PORT_DELAY 0 +/* Set the stack depth type to be uint16_t, otherwise it defaults to StackType_t */ +#define configSTACK_DEPTH_TYPE uint16_t + +/* Memory allocation related definitions. */ #define configSUPPORT_DYNAMIC_ALLOCATION 1 #define configSUPPORT_STATIC_ALLOCATION 0 +#define configTOTAL_HEAP_SIZE ( ( size_t ) 5*1024 ) +/* don't define to reuse the stack allocated in the linker script via __freertos_irq_stack_top variable*/ +// #define configISR_STACK_SIZE_WORDS 128 +/* Hook function related definitions. */ #define configUSE_IDLE_HOOK 1 -#define configIDLE_SHOULD_YIELD 1 #define configUSE_TICK_HOOK 0 +#define configCHECK_FOR_STACK_OVERFLOW 1 +#define configUSE_MALLOC_FAILED_HOOK 1 -/* Timer definitions. */ +/* Run time and task stats gathering related definitions. */ +#define configUSE_TRACE_FACILITY 0 + +/* Software timer related definitions. */ #define configUSE_TIMERS 1 #define configTIMER_TASK_PRIORITY ( configMAX_PRIORITIES-1 ) #define configTIMER_TASK_STACK_DEPTH 92 @@ -81,22 +79,22 @@ to exclude the API function. */ /* Set the following INCLUDE_* constants to 1 to incldue the named API function, * or 0 to exclude the named API function. Most linkers will remove unused * functions even when the constant is 1. */ -#define INCLUDE_vTaskPrioritySet 1 -#define INCLUDE_uxTaskPriorityGet 1 -#define INCLUDE_vTaskDelete 1 -#define INCLUDE_vTaskSuspend 1 -#define INCLUDE_xTaskResumeFromISR 1 -#define INCLUDE_xTaskDelayUntil 1 -#define INCLUDE_vTaskDelay 1 -#define INCLUDE_xTaskGetSchedulerState 0 -#define INCLUDE_xTaskGetCurrentTaskHandle 1 -#define INCLUDE_uxTaskGetStackHighWaterMark 1 -#define INCLUDE_xTaskGetIdleTaskHandle 0 -#define INCLUDE_eTaskGetState 0 -#define INCLUDE_xEventGroupSetBitFromISR 1 -#define INCLUDE_xTimerPendFunctionCall 0 -#define INCLUDE_xTaskAbortDelay 0 -#define INCLUDE_xTaskGetHandle 0 +#define INCLUDE_vTaskPrioritySet 1 +#define INCLUDE_uxTaskPriorityGet 1 +#define INCLUDE_vTaskDelete 1 +#define INCLUDE_vTaskSuspend 1 +#define INCLUDE_xTaskResumeFromISR 1 +#define INCLUDE_xTaskDelayUntil 1 +#define INCLUDE_vTaskDelay 1 +#define INCLUDE_xTaskGetSchedulerState 0 +#define INCLUDE_xTaskGetCurrentTaskHandle 1 +#define INCLUDE_uxTaskGetStackHighWaterMark 1 +#define INCLUDE_xTaskGetIdleTaskHandle 0 +#define INCLUDE_eTaskGetState 0 +#define INCLUDE_xEventGroupSetBitFromISR 1 +#define INCLUDE_xTimerPendFunctionCall 0 +#define INCLUDE_xTaskAbortDelay 0 +#define INCLUDE_xTaskGetHandle 0 #define configMAX(a,b) ({ __typeof__ (a) _a = (a); __typeof__ (b) _b = (b); _a > _b ? _a : _b; }) #define configMIN(a,b) ({ __typeof__ (a) _a = (a); __typeof__ (b) _b = (b); _a < _b ? _a : _b; }) diff --git a/libraries/FreeRTOS/src/FreeRTOSVariant.h b/libraries/FreeRTOS/src/FreeRTOSVariant.h index 0b03caf..1f9debc 100644 --- a/libraries/FreeRTOS/src/FreeRTOSVariant.h +++ b/libraries/FreeRTOS/src/FreeRTOSVariant.h @@ -32,16 +32,12 @@ #endif void initVariant(void); + +/*-----------------------------------------------------------*/ #ifdef __cplusplus extern "C" { #endif -// System Tick - Scheduler timer - -/*-----------------------------------------------------------*/ - - - void vApplicationIdleHook( void ); void vApplicationMallocFailedHook( void );