tangzz98 3 лет назад
Родитель
Сommit
c4a7d28234
2 измененных файлов с 71 добавлено и 101 удалено
  1. 71 100
      FreeRTOS/include/FreeRTOSConfig.h
  2. 0 1
      FreeRTOS/tasks.c

+ 71 - 100
FreeRTOS/include/FreeRTOSConfig.h

@@ -1,6 +1,8 @@
 /*
 /*
- * FreeRTOS V202112.00
- * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
+ * FreeRTOS Kernel V10.4.6
+ * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
+ *
+ * SPDX-License-Identifier: MIT
  *
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
  * this software and associated documentation files (the "Software"), to deal in
@@ -20,128 +22,97 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  *
  * https://www.FreeRTOS.org
  * https://www.FreeRTOS.org
- * https://aws.amazon.com/freertos
+ * https://github.com/FreeRTOS
  *
  *
  */
  */
 
 
-
 #ifndef FREERTOS_CONFIG_H
 #ifndef FREERTOS_CONFIG_H
 #define FREERTOS_CONFIG_H
 #define FREERTOS_CONFIG_H
 
 
-/*-----------------------------------------------------------
- * Application specific definitions.
- *
- * These definitions should be adjusted for your particular hardware and
- * application requirements.
- *
- * THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE
- * FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE.
- *
- * See http://www.freertos.org/a00110.html
- *----------------------------------------------------------*/
-
-//not used
+/* The following options are read-only */
 #define configUSE_PREEMPTION                    1
 #define configUSE_PREEMPTION                    1
+#define configUSE_TIME_SLICING                  1
 #define configUSE_PORT_OPTIMISED_TASK_SELECTION 1
 #define configUSE_PORT_OPTIMISED_TASK_SELECTION 1
-#define configUSE_QUEUE_SETS                    1
-#define configUSE_IDLE_HOOK                     0
-#define configUSE_TICK_HOOK                     1
-#define configCPU_CLOCK_HZ                      ( SystemCoreClock )
-#define configTICK_RATE_HZ                      ( 1000 )
-#define configMINIMAL_STACK_SIZE                ( ( unsigned short ) 130 )
-#define configMAX_TASK_NAME_LEN                 ( 10 )
-#define configUSE_TRACE_FACILITY                1
 #define configUSE_16_BIT_TICKS                  0
 #define configUSE_16_BIT_TICKS                  0
-#define configIDLE_SHOULD_YIELD                 1
-#define configQUEUE_REGISTRY_SIZE               8
-#define configCHECK_FOR_STACK_OVERFLOW          2
-
-/* The full demo always has tasks to run so the tick will never be turned off.
-The blinky demo will use the default tickless idle implementation to turn the
-tick off. */
-#define configUSE_TICKLESS_IDLE                 0
-
-/* Run time stats gathering definitions. */
-#define configGENERATE_RUN_TIME_STATS   0
-
-/* This demo makes use of one or more example stats formatting functions.  These
-format the raw data provided by the uxTaskGetSystemState() function in to human
-readable ASCII form.  See the notes in the implementation of vTaskList() within
-FreeRTOS/Source/tasks.c for limitations. */
-#define configUSE_STATS_FORMATTING_FUNCTIONS    1
 
 
-/* Co-routine definitions. */
-#define configUSE_CO_ROUTINES           0
-#define configMAX_CO_ROUTINE_PRIORITIES ( 2 )
-
-/* Software timer definitions. */
-#define configTIMER_TASK_PRIORITY       ( configMAX_PRIORITIES - 1 )
-#define configTIMER_QUEUE_LENGTH        5
-#define configTIMER_TASK_STACK_DEPTH    ( configMINIMAL_STACK_SIZE * 2 )
-
-/* Set the following definitions to 1 to include the API function, or zero
-to exclude the API function. */
-#define INCLUDE_vTaskCleanUpResources   1
-#define INCLUDE_xTimerPendFunctionCall  1
+/* The following read-only options are controlled by rtconfig.h. */
+#define configTICK_RATE_HZ                      RT_TICK_PER_SECOND
+#define configMAX_PRIORITIES                    RT_THREAD_PRIORITY_MAX
+#define configMAX_TASK_NAME_LEN                 RT_NAME_MAX
+
+#ifdef RT_USING_TIMER_SOFT
+    #define configUSE_TIMERS                    1
+    #define configTIMER_TASK_PRIORITY           (RT_THREAD_PRIORITY_MAX - 1 - RT_TIMER_THREAD_PRIO)
+    /* RT-Thread does not use a timer queue. This option is not used. */
+    #define configTIMER_QUEUE_LENGTH            0
+    #define configTIMER_TASK_STACK_DEPTH        RT_TIMER_THREAD_STACK_SIZE
+#endif
 
 
-/* Cortex-M specific definitions. */
-#ifdef __NVIC_PRIO_BITS
-    /* __BVIC_PRIO_BITS will be specified when CMSIS is being used. */
-    #define configPRIO_BITS             __NVIC_PRIO_BITS
-#else
-    #define configPRIO_BITS             4        /* 15 priority levels */
+/* These options can be modified to selectively disable recursive mutex */
+/* Take effect only if RT_USING_MUTEX is defined */
+#ifdef RT_USING_MUTEX
+    #define configUSE_RECURSIVE_MUTEXES         1
+    #define configUSE_MUTEXES                   1
 #endif
 #endif
 
 
-/* The lowest interrupt priority that can be used in a call to a "set priority"
-function. */
-#define configLIBRARY_LOWEST_INTERRUPT_PRIORITY         15
+/* These options can be modified to selectively disable counting semaphore */
+/* Take effect only if RT_USING_SEMAPHORE is defined */
+#ifdef RT_USING_SEMAPHORE
+    #define configUSE_COUNTING_SEMAPHORES       1
+#endif
 
 
-/* The highest interrupt priority that can be used by any interrupt service
-routine that makes calls to interrupt safe FreeRTOS API functions.  DO NOT CALL
-INTERRUPT SAFE FREERTOS API FUNCTIONS FROM ANY INTERRUPT THAT HAS A HIGHER
-PRIORITY THAN THIS! (higher priorities are lower numeric values. */
-#define configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY    4
+/* Memory allocation related definitions. */
+#define configSUPPORT_STATIC_ALLOCATION         1
+#ifdef RT_USING_HEAP
+    #define configSUPPORT_DYNAMIC_ALLOCATION    1
+    #define configTOTAL_HEAP_SIZE               10240
+    #define configAPPLICATION_ALLOCATED_HEAP    0
+#endif
 
 
-/* Interrupt priorities used by the kernel port layer itself.  These are generic
-to all Cortex-M ports, and do not rely on any particular library functions. */
-#define configKERNEL_INTERRUPT_PRIORITY         ( configLIBRARY_LOWEST_INTERRUPT_PRIORITY << (8 - configPRIO_BITS) )
-/* !!!! configMAX_SYSCALL_INTERRUPT_PRIORITY must not be set to zero !!!!
-See http://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html. */
-#define configMAX_SYSCALL_INTERRUPT_PRIORITY    ( configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY << (8 - configPRIO_BITS) )
+/* Hook functions are not supported. */
+#define configUSE_IDLE_HOOK                     0
+#define configUSE_TICK_HOOK                     0
+#define configCHECK_FOR_STACK_OVERFLOW          0
+#define configUSE_MALLOC_FAILED_HOOK            0
+#define configUSE_DAEMON_TASK_STARTUP_HOOK      0
+
+/* The following features are not supported. */
+#define INCLUDE_xTimerPendFunctionCall          0
+#define configNUM_THREAD_LOCAL_STORAGE_POINTERS 0
+#define configUSE_CO_ROUTINES                   0
+#define configQUEUE_REGISTRY_SIZE               0
+#define configUSE_QUEUE_SETS                    0
+#define configUSE_NEWLIB_REENTRANT              0
+#define configUSE_TICKLESS_IDLE                 0
+#define configQUEUE_REGISTRY_SIZE               0
+#define configGENERATE_RUN_TIME_STATS           0
+#define configUSE_TRACE_FACILITY                0
+#define configUSE_STATS_FORMATTING_FUNCTIONS    0
 
 
-/* Definitions that map the FreeRTOS port interrupt handlers to their CMSIS
-standard names. */
-#define xPortPendSVHandler PendSV_Handler
-#define vPortSVCHandler SVC_Handler
-#define xPortSysTickHandler SysTick_Handler
+/* Can be modified */
+#define configMINIMAL_STACK_SIZE                128
 
 
-//used
-#define configUSE_MUTEXES                       1
-#define configSUPPORT_DYNAMIC_ALLOCATION        1
-#define configSUPPORT_STATIC_ALLOCATION         1
-#define configUSE_RECURSIVE_MUTEXES             1
-#define configTOTAL_HEAP_SIZE                   ( ( size_t ) ( 46 * 1024 ) )
-#define configUSE_COUNTING_SEMAPHORES           1
-#define configUSE_MALLOC_FAILED_HOOK            0
-#define INCLUDE_vTaskDelete                     1
-#define INCLUDE_vTaskDelayUntil                 1
-#define INCLUDE_vTaskDelay                      1
-#define INCLUDE_vTaskSuspend                    1
-#define INCLUDE_xTaskResumeFromISR              1
+/* Optional functions */
 #define INCLUDE_vTaskPrioritySet                1
 #define INCLUDE_vTaskPrioritySet                1
 #define INCLUDE_uxTaskPriorityGet               1
 #define INCLUDE_uxTaskPriorityGet               1
-#define INCLUDE_xTaskGetCurrentTaskHandle       1
+#define INCLUDE_vTaskDelete                     1
+#define INCLUDE_vTaskSuspend                    1
+#define INCLUDE_xTaskDelayUntil                 1
+#define INCLUDE_vTaskDelay                      1
+#define INCLUDE_xTaskGetIdleTaskHandle          1
 #define INCLUDE_xTaskAbortDelay                 1
 #define INCLUDE_xTaskAbortDelay                 1
+#define INCLUDE_xSemaphoreGetMutexHolder        1
 #define INCLUDE_xTaskGetHandle                  1
 #define INCLUDE_xTaskGetHandle                  1
-#define configUSE_APPLICATION_TASK_TAG          1
-#define INCLUDE_xTaskGetIdleTaskHandle          1
 #define INCLUDE_uxTaskGetStackHighWaterMark     1
 #define INCLUDE_uxTaskGetStackHighWaterMark     1
 #define INCLUDE_uxTaskGetStackHighWaterMark2    1
 #define INCLUDE_uxTaskGetStackHighWaterMark2    1
-#define configUSE_TASK_NOTIFICATIONS            1
 #define INCLUDE_eTaskGetState                   1
 #define INCLUDE_eTaskGetState                   1
-#define configMAX_PRIORITIES                    ( 32 )
-#define configUSE_TIMERS                        1
+#define INCLUDE_xTaskResumeFromISR              1
 #define INCLUDE_xTaskGetSchedulerState          1
 #define INCLUDE_xTaskGetSchedulerState          1
-#define INCLUDE_xSemaphoreGetMutexHolder        1
+#define INCLUDE_xTaskGetCurrentTaskHandle       1
+#define configUSE_APPLICATION_TASK_TAG          1
+#define configUSE_TASK_NOTIFICATIONS            1
+#define configTASK_NOTIFICATION_ARRAY_ENTRIES   3
+
+/* Other definitions can go here, e.g. configAssert*/
 
 
 #endif /* FREERTOS_CONFIG_H */
 #endif /* FREERTOS_CONFIG_H */

+ 0 - 1
FreeRTOS/tasks.c

@@ -34,7 +34,6 @@
 #include "FreeRTOS.h"
 #include "FreeRTOS.h"
 #include "task.h"
 #include "task.h"
 
 
-//TODO: check configMAX_PRIORITIES == RT_THREAD_PRIORITY_MAX
 #define FREERTOS_PRIORITY_TO_RTTHREAD(priority)    ( configMAX_PRIORITIES - 1 - ( priority ) )
 #define FREERTOS_PRIORITY_TO_RTTHREAD(priority)    ( configMAX_PRIORITIES - 1 - ( priority ) )
 #define RTTHREAD_PRIORITY_TO_FREERTOS(priority)    ( RT_THREAD_PRIORITY_MAX - 1 - ( priority ) )
 #define RTTHREAD_PRIORITY_TO_FREERTOS(priority)    ( RT_THREAD_PRIORITY_MAX - 1 - ( priority ) )