Added Event Recorder configuration and enhanced debug capabilities

Author: VladimirUmek

ARM.CMSIS-FreeRTOS.pdsc

@@ -8,12 +8,17 @@
   <license>License/license.txt</license>
 
   <releases>
+    <release version="10.0.2-dev3">
+      CMSIS:RTOS2:FreeRTOS update:
+        - Added Event Recorder configuration
+        - Corrected CMSIS-FreeRTOS component viewer linked list processing
+    </release>
     <release version="10.0.2-dev2">
       CMSIS:RTOS2:FreeRTOS update:
       - Updated to FreeRTOS 10.1.1
       - Corrected SysTick_Handler when kernel not started
       - Corrected critical section for osKernelGetSysTimerCount
-    </release>  
+    </release>
     <release version="10.0.2-dev1">
       CMSIS:RTOS2:FreeRTOS update:
       - Updated to CMSIS API 2.1.3
@@ -526,7 +531,7 @@
         </RTE_Components_h>
         <files>
           <file category="doc"    name="CMSIS/Documentation/General/html/cre_freertos_proj.html#cmsis_freertos_config"/>
-          <file category="header" attr="config" name="CMSIS/RTOS2/FreeRTOS/Config/ARMCM/FreeRTOSConfig.h" version="10.0.1" condition="CoreM"/>
+          <file category="header" attr="config" name="CMSIS/RTOS2/FreeRTOS/Config/ARMCM/FreeRTOSConfig.h" version="10.1.1" condition="CoreM"/>
           <file category="header" attr="config" name="CMSIS/RTOS2/FreeRTOS/Config/ARMCA/FreeRTOSConfig.h" version="10.0.1" condition="CoreA"/>
         </files>
       </component>

CMSIS/RTOS2/FreeRTOS/Config/ARMCM/FreeRTOSConfig.h

@@ -17,7 +17,7 @@
  *
  * --------------------------------------------------------------------------
  *
- * $Revision:   V10.0.1
+ * $Revision:   V10.1.1
  *
  * Project:     CMSIS-FreeRTOS
  * Title:       FreeRTOS configuration definitions
@@ -45,8 +45,6 @@
 #include "RTE_Components.h"
 #include CMSIS_device_header
 
-#include "os_tick.h"
-
 //-------- <<< Use Configuration Wizard in Context Menu >>> --------------------
 
 //  <o>Minimal stack size [words] <0-65535>
@@ -131,6 +129,58 @@
 //  <i> Default: 0
 #define configQUEUE_REGISTRY_SIZE               0
 
+// <h>Event Recorder configuration
+//  <i> Initialize and setup Event Recorder level filtering.
+//  <i> Settings have no effect when Event Recorder is not present.
+
+//  <q>Initialize Event Recorder
+//  <i> Initialize Event Recorder before FreeRTOS kernel start.
+//  <i> Default: 1
+#define configEVR_INITIALIZE                    1
+
+//  <e>Setup recording level filter
+//  <i> Enable configuration of FreeRTOS events recording level
+//  <i> Default: 1
+#define configEVR_SETUP_LEVEL                   1
+
+//  <o>Tasks functions
+//  <i> Define event recording level bitmask for events generated from Tasks functions.
+//  <i> Default: 0x05
+//    <0x00=>Off <0x01=>Errors <0x05=>Errors + Operation <0x0F=>All
+#define configEVR_LEVEL_TASKS                   0x05
+
+//  <o>Queue functions
+//  <i> Define event recording level bitmask for events generated from Queue functions.
+//  <i> Default: 0x05
+//    <0x00=>Off <0x01=>Errors <0x05=>Errors + Operation <0x0F=>All
+#define configEVR_LEVEL_QUEUE                   0x05
+
+//  <o>Timer functions
+//  <i> Define event recording level bitmask for events generated from Timer functions.
+//  <i> Default: 0x05
+//    <0x00=>Off <0x01=>Errors <0x05=>Errors + Operation <0x0F=>All
+#define configEVR_LEVEL_TIMERS                  0x05
+
+//  <o>Event Groups functions
+//  <i> Define event recording level bitmask for events generated from Event Groups functions.
+//  <i> Default: 0x05
+//    <0x00=>Off <0x01=>Errors <0x05=>Errors + Operation <0x0F=>All
+#define configEVR_LEVEL_EVENTGROUPS             0x05
+
+//  <o>Heap functions
+//  <i> Define event recording level bitmask for events generated from Heap functions.
+//  <i> Default: 0x05
+//    <0x00=>Off <0x01=>Errors <0x05=>Errors + Operation <0x0F=>All
+#define configEVR_LEVEL_HEAP                    0x05
+
+//  <o>Stream Buffer functions
+//  <i> Define event recording level bitmask for events generated from Stream Buffer functions.
+//  <i> Default: 0x05
+//    <0x00=>Off <0x01=>Errors <0x05=>Errors + Operation <0x0F=>All
+#define configEVR_LEVEL_STREAMBUFFER            0x05
+//  </e>
+// </h>
+
 //------------- <<< end of configuration section >>> ---------------------------
 
 /* Defines needed by FreeRTOS to implement CMSIS RTOS2 API. Do not change! */
@@ -165,8 +215,8 @@
 #define INCLUDE_xTimerPendFunctionCall          1
 
 /* Map the FreeRTOS port interrupt handlers to their CMSIS standard names. */
-#define xPortPendSVHandler                    PendSV_Handler
-#define vPortSVCHandler                       SVC_Handler
+#define xPortPendSVHandler                      PendSV_Handler
+#define vPortSVCHandler                         SVC_Handler
 
 /* Include debug event definitions */
 #include "freertos_evr.h"

CMSIS/RTOS2/FreeRTOS/Examples/Blinky/Blinky.c

@@ -25,10 +25,6 @@
 #include "RTE_Components.h"
 #include CMSIS_device_header
 
-#ifdef RTE_Compiler_EventRecorder
-#include "EventRecorder.h"
-#endif
-
 #include "cmsis_os2.h"
 
 
@@ -141,10 +137,6 @@ int main (void) {
   // System Initialization
   SystemCoreClockUpdate();
 
-#ifdef RTE_Compiler_EventRecorder
-  // Initialize and start Event Recorder
-  EventRecorderInitialize(EventRecordAll, 1U);
-#endif
   osKernelInitialize();                 // Initialize CMSIS-RTOS
   osThreadNew(app_main, NULL, NULL);    // Create application main thread
   if (osKernelGetState() == osKernelReady) {