From 1296b8777e8ea20fcac9d2bec64313e393ca23e7 Mon Sep 17 00:00:00 2001
From: Akash John Subash <akash.subash@wiferion.com>
Date: Sun, 11 Dec 2022 11:50:28 +0100
Subject: [PATCH 1/3] Test Commit: Trace macro user def.

---
 .../include/freertos/FreeRTOSConfig.h          | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/components/freertos/esp_additions/include/freertos/FreeRTOSConfig.h b/components/freertos/esp_additions/include/freertos/FreeRTOSConfig.h
index 4239d4bb1eb2..a0ffc02b3e87 100644
--- a/components/freertos/esp_additions/include/freertos/FreeRTOSConfig.h
+++ b/components/freertos/esp_additions/include/freertos/FreeRTOSConfig.h
@@ -236,10 +236,20 @@ This file get's pulled into assembly sources. Therefore, some includes need to b
 
 // -------------------- Trace Macros -----------------------
 
-/*
-For trace macros.
-Note: Include trace macros here and not above as trace macros are dependent on some of the FreeRTOS configs
-*/
+/* For trace macros.
+Note: Include trace macros here and not above as trace macros are dependent on some of the FreeRTOS configs*/
+
+#define traceTASK_INCREMENT_TICK(xTickCount)\
+extern int taskList[100][2];\
+extern int taskList_size;\
+extern int idx_gl;\
+if(idx_gl < taskList_size)\
+{\
+taskList[idx_gl][0] = pxCurrentTCB[0]->uxTCBNumber;\
+taskList[idx_gl][1] = xTickCount;\
+idx_gl++;\
+}
+
 #ifndef __ASSEMBLER__
 #if CONFIG_SYSVIEW_ENABLE
 #include "SEGGER_SYSVIEW_FreeRTOS.h"

From bb9158326140b6eabb3dfab2c5df4492f948a35d Mon Sep 17 00:00:00 2001
From: Akash John Subash <akash.subash@wiferion.com>
Date: Sun, 11 Dec 2022 12:11:59 +0100
Subject: [PATCH 2/3] trace macro redefinition

---
 .../include/freertos/FreeRTOSConfig.h         | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/components/freertos/esp_additions/include/freertos/FreeRTOSConfig.h b/components/freertos/esp_additions/include/freertos/FreeRTOSConfig.h
index a0ffc02b3e87..5357c485a314 100644
--- a/components/freertos/esp_additions/include/freertos/FreeRTOSConfig.h
+++ b/components/freertos/esp_additions/include/freertos/FreeRTOSConfig.h
@@ -234,22 +234,6 @@ This file get's pulled into assembly sources. Therefore, some includes need to b
 //Unlisted
 #define INCLUDE_pxTaskGetStackStart                     1
 
-// -------------------- Trace Macros -----------------------
-
-/* For trace macros.
-Note: Include trace macros here and not above as trace macros are dependent on some of the FreeRTOS configs*/
-
-#define traceTASK_INCREMENT_TICK(xTickCount)\
-extern int taskList[100][2];\
-extern int taskList_size;\
-extern int idx_gl;\
-if(idx_gl < taskList_size)\
-{\
-taskList[idx_gl][0] = pxCurrentTCB[0]->uxTCBNumber;\
-taskList[idx_gl][1] = xTickCount;\
-idx_gl++;\
-}
-
 #ifndef __ASSEMBLER__
 #if CONFIG_SYSVIEW_ENABLE
 #include "SEGGER_SYSVIEW_FreeRTOS.h"
@@ -301,3 +285,19 @@ extern void vPortCleanUpTCB ( void *pxTCB );
 #endif // CONFIG_FREERTOS_SMP
 
 #endif /* FREERTOS_CONFIG_H */
+
+// -------------------- Trace Macros -----------------------
+
+/* For trace macros.
+Note: Include trace macros here and not above as trace macros are dependent on some of the FreeRTOS configs*/
+
+#define traceTASK_INCREMENT_TICK(xTickCount)\
+extern int taskList[100][2];\
+extern int taskList_size;\
+extern int idx_gl;\
+if(idx_gl < taskList_size)\
+{\
+taskList[idx_gl][0] = pxCurrentTCB[0]->uxTCBNumber;\
+taskList[idx_gl][1] = xTickCount;\
+idx_gl++;\
+}
\ No newline at end of file

From 9ef1a971da2946ecd8bdefc2446d9d6ef4cfb534 Mon Sep 17 00:00:00 2001
From: Akash John Subash <akash.subash@wiferion.com>
Date: Sun, 18 Dec 2022 12:58:18 +0100
Subject: [PATCH 3/3] Fixed "backslash newline at end of file warning"

---
 .../esp_additions/include/freertos/FreeRTOSConfig.h        | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/components/freertos/esp_additions/include/freertos/FreeRTOSConfig.h b/components/freertos/esp_additions/include/freertos/FreeRTOSConfig.h
index 5357c485a314..fbabfb92dbd5 100644
--- a/components/freertos/esp_additions/include/freertos/FreeRTOSConfig.h
+++ b/components/freertos/esp_additions/include/freertos/FreeRTOSConfig.h
@@ -287,9 +287,7 @@ extern void vPortCleanUpTCB ( void *pxTCB );
 #endif /* FREERTOS_CONFIG_H */
 
 // -------------------- Trace Macros -----------------------
-
-/* For trace macros.
-Note: Include trace macros here and not above as trace macros are dependent on some of the FreeRTOS configs*/
+// Note: Include trace macros here and not above as trace macros are dependent on some of the FreeRTOS configs*/
 
 #define traceTASK_INCREMENT_TICK(xTickCount)\
 extern int taskList[100][2];\
@@ -300,4 +298,5 @@ if(idx_gl < taskList_size)\
 taskList[idx_gl][0] = pxCurrentTCB[0]->uxTCBNumber;\
 taskList[idx_gl][1] = xTickCount;\
 idx_gl++;\
-}
\ No newline at end of file
+}
+