Merge branch 'develop'

# Conflicts:
#	ARM.CMSIS-FreeRTOS.pdsc

Author: JonatanAntoni

ARM.CMSIS-FreeRTOS.pdsc

@@ -84,7 +84,11 @@
 
 #include <stdint.h>
 
-extern uint32_t SystemCoreClock;
+#include "RTE_Components.h"
+#include CMSIS_device_header
+
+#include "os_tick.h"
+
 
 //-------- <<< Use Configuration Wizard in Context Menu >>> --------------------
 
@@ -215,11 +219,12 @@ extern uint32_t SystemCoreClock;
 #define INCLUDE_vTaskSuspend                    1
 #define INCLUDE_xTimerPendFunctionCall          1
 
-/* Include kernel tick timer definitions */
-#include "FreeRTOS_Tick_Config.h"
-
 /* Map the FreeRTOS port timer configuration functions to their implementations */
-#define configSETUP_TICK_INTERRUPT()            vConfigureTickInterrupt()
-#define configCLEAR_TICK_INTERRUPT()            vClearTickInterrupt()
+#define configSETUP_TICK_INTERRUPT()                         \
+  OS_Tick_Setup (configTICK_RATE_HZ, FreeRTOS_Tick_Handler); \
+  OS_Tick_Enable();
+
+#define configCLEAR_TICK_INTERRUPT()                         \
+    OS_Tick_AcknowledgeIRQ()
 
 #endif /* FREERTOS_CONFIG_H */

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

@@ -84,7 +84,10 @@
 
 #include <stdint.h>
 
-extern uint32_t SystemCoreClock;
+#include "RTE_Components.h"
+#include CMSIS_device_header
+
+#include "os_tick.h"
 
 //-------- <<< Use Configuration Wizard in Context Menu >>> --------------------
 
@@ -197,9 +200,6 @@ extern uint32_t SystemCoreClock;
 #define xPortPendSVHandler                    PendSV_Handler
 #define vPortSVCHandler                       SVC_Handler
 
-/* Include kernel tick timer definitions */
-#include "FreeRTOS_Tick_Config.h"
-
 /* Include debug event definitions */
 #include "freertos_evr.h"
 

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

@@ -25,6 +25,10 @@
 #include "RTE_Components.h"
 #include CMSIS_device_header
 
+#ifdef RTE_Compiler_EventRecorder
+#include "EventRecorder.h"
+#endif
+
 #include "cmsis_os2.h"
 
 
@@ -136,7 +140,11 @@ 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) {