Merge pull request #469 from henrygab/enable_sysview

[WIP] Enable/Disable SysView via CFG_SYSVIEW

Author: hathach

boards.txt

@@ -60,6 +60,7 @@ feather52832.menu.debug.l2=Level 2 (Full Debug)
 feather52832.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2
 feather52832.menu.debug.l3=Level 3 (Segger SystemView)
 feather52832.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3
+feather52832.menu.debug.l3.build.sysview_flags=-DCFG_SYSVIEW=1
 
 # ----------------------------------
 # Bluefruit Feather nRF52840 Express
@@ -113,6 +114,7 @@ feather52840.menu.debug.l2=Level 2 (Full Debug)
 feather52840.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2
 feather52840.menu.debug.l3=Level 3 (Segger SystemView)
 feather52840.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3
+feather52840.menu.debug.l3.build.sysview_flags=-DCFG_SYSVIEW=1
 
 
 # ----------------------------------
@@ -167,6 +169,7 @@ feather52840sense.menu.debug.l2=Level 2 (Full Debug)
 feather52840sense.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2
 feather52840sense.menu.debug.l3=Level 3 (Segger SystemView)
 feather52840sense.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3
+feather52840sense.menu.debug.l3.build.sysview_flags=-DCFG_SYSVIEW=1
 
 
 # ---------------------------------------------
@@ -221,6 +224,7 @@ itsybitsy52840.menu.debug.l2=Level 2 (Full Debug)
 itsybitsy52840.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2
 itsybitsy52840.menu.debug.l3=Level 3 (Segger SystemView)
 itsybitsy52840.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3
+itsybitsy52840.menu.debug.l3.build.sysview_flags=-DCFG_SYSVIEW=1
 
 # ---------------------------------------------
 # Bluefruit Circuit Playground nRF52840 Express
@@ -274,6 +278,7 @@ cplaynrf52840.menu.debug.l2=Level 2 (Full Debug)
 cplaynrf52840.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2
 cplaynrf52840.menu.debug.l3=Level 3 (Segger SystemView)
 cplaynrf52840.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3
+cplaynrf52840.menu.debug.l3.build.sysview_flags=-DCFG_SYSVIEW=1
 
 
 # ---------------------------------------------
@@ -328,6 +333,7 @@ cluenrf52840.menu.debug.l2=Level 2 (Full Debug)
 cluenrf52840.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2
 cluenrf52840.menu.debug.l3=Level 3 (Segger SystemView)
 cluenrf52840.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3
+cluenrf52840.menu.debug.l3.build.sysview_flags=-DCFG_SYSVIEW=1
 
 # ----------------------------------
 # Bluefruit Metro nRF52840 Express
@@ -381,6 +387,7 @@ metro52840.menu.debug.l2=Level 2 (Full Debug)
 metro52840.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2
 metro52840.menu.debug.l3=Level 3 (Segger SystemView)
 metro52840.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3
+metro52840.menu.debug.l3.build.sysview_flags=-DCFG_SYSVIEW=1
 
 
 
@@ -434,6 +441,7 @@ pca10056.menu.debug.l2=Level 2 (Full Debug)
 pca10056.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2
 pca10056.menu.debug.l3=Level 3 (Segger SystemView)
 pca10056.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3
+pca10056.menu.debug.l3.build.sysview_flags=-DCFG_SYSVIEW=1
 
 # ----------------------------------
 # Particle Xenon
@@ -487,6 +495,7 @@ particle_xenon.menu.debug.l2=Level 2 (Full Debug)
 particle_xenon.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2
 particle_xenon.menu.debug.l3=Level 3 (Segger SystemView)
 particle_xenon.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3
+particle_xenon.menu.debug.l3.build.sysview_flags=-DCFG_SYSVIEW=1
 
 # ----------------------------------
 # Raytac MDBT50Q - RX
@@ -540,3 +549,4 @@ mdbt50qrx.menu.debug.l2=Level 2 (Full Debug)
 mdbt50qrx.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2
 mdbt50qrx.menu.debug.l3=Level 3 (Segger SystemView)
 mdbt50qrx.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3
+mdbt50qrx.menu.debug.l3.build.sysview_flags=-DCFG_SYSVIEW=1

cores/nRF5/WInterrupts.c

@@ -144,7 +144,7 @@ void detachInterrupt(uint32_t pin)
 
 void GPIOTE_IRQHandler()
 {
-#if CFG_DEBUG >= 3
+#if CFG_SYSVIEW
   SEGGER_SYSVIEW_RecordEnterISR();
 #endif
 
@@ -171,7 +171,7 @@ void GPIOTE_IRQHandler()
     event = (uint32_t)((uint32_t)event + 4);
   }
 
-#if CFG_DEBUG >= 3
+#if CFG_SYSVIEW
     SEGGER_SYSVIEW_RecordExitISR();
 #endif
 }

cores/nRF5/freertos/config/FreeRTOSConfig.h

@@ -196,8 +196,8 @@ standard names - or at least those used in the unmodified vector table. */
      */
 #define configUSE_DISABLE_TICK_AUTO_CORRECTION_DEBUG     0
 
-// Sysview require at least debug level 3
-#if CFG_DEBUG >= 3
+// Sysview is enabled by default at debug level 3
+#if CFG_SYSVIEW
 #include "sysview/SEGGER_SYSVIEW_FreeRTOS.h"
 #endif
 

cores/nRF5/main.cpp

@@ -24,8 +24,8 @@ void Bluefruit_printInfo() __attribute__((weak));
 void Bluefruit_printInfo() {}
 #endif
 
-// DEBUG Level 3
-#if CFG_DEBUG >= 3
+// From the UI, setting debug level to 3 will enable SysView
+#if CFG_SYSVIEW
 #include "SEGGER_SYSVIEW.h"
 #endif
 
@@ -80,7 +80,7 @@ int main( void )
   Adafruit_TinyUSB_Core_init();
 #endif
 
-#if CFG_DEBUG >= 3
+#if CFG_SYSVIEW
   SEGGER_SYSVIEW_Conf();
 #endif
 

cores/nRF5/sysview/SEGGER_SYSVIEW_FreeRTOS.c

@@ -52,7 +52,7 @@ Purpose : Interface between FreeRTOS and SystemView.
 Revision: $Rev: 7947 $
 */
 
-#if CFG_DEBUG >= 3
+#if CFG_SYSVIEW
 
 #include "FreeRTOS.h"
 #include "task.h"
@@ -252,6 +252,6 @@ const SEGGER_SYSVIEW_OS_API SYSVIEW_X_OS_TraceAPI = {
   _cbSendTaskList,
 };
 
-#endif // CFG_DEBUG >= 3
+#endif // CFG_SYSVIEW
 
 /*************************** End of file ****************************/

libraries/Wire/Wire_nRF52.cpp

@@ -399,13 +399,13 @@ extern "C"
 {
   void SPIM0_SPIS0_TWIM0_TWIS0_SPI0_TWI0_IRQHandler(void)
   {
-    #if CFG_DEBUG >= 3
+    #if CFG_SYSVIEW
     SEGGER_SYSVIEW_RecordEnterISR();
     #endif
 
     Wire.onService();
 
-    #if CFG_DEBUG >= 3
+    #if CFG_SYSVIEW
     SEGGER_SYSVIEW_RecordExitISR();
     #endif
   }
@@ -419,13 +419,13 @@ extern "C"
 {
   void SPIM1_SPIS1_TWIM1_TWIS1_SPI1_TWI1_IRQHandler(void)
   {
-    #if CFG_DEBUG >= 3
+    #if CFG_SYSVIEW
     SEGGER_SYSVIEW_RecordEnterISR();
     #endif
 
     Wire1.onService();
 
-    #if CFG_DEBUG >= 3
+    #if CFG_SYSVIEW
     SEGGER_SYSVIEW_RecordExitISR();
     #endif
   }