Merge branch 'develop' of JF/PineTime into master

1 files changed, 6 insertions, 34 deletions

diff --git a/src/systemtask/SystemMonitor.h b/src/systemtask/SystemMonitor.h
index 45c02c2..08c8740 100644
--- a/src/systemtask/SystemMonitor.h
+++ b/src/systemtask/SystemMonitor.h
@@ -1,44 +1,16 @@
 #pragma once
-#include <FreeRTOS.h>
+#include <FreeRTOS.h> // declares configUSE_TRACE_FACILITY
 #include <task.h>
-#include <nrf_log.h>
 
 namespace Pinetime {
   namespace System {
-    struct DummyMonitor {};
-    struct FreeRtosMonitor {};
-
-    template <class T> class SystemMonitor {
-    public:
-      SystemMonitor() = delete;
-    };
-
-    template <> class SystemMonitor<DummyMonitor> {
+    class SystemMonitor {
     public:
-      void Process() const {
-      }
-    };
-
-    template <> class SystemMonitor<FreeRtosMonitor> {
-    public:
-      void Process() const {
-        if (xTaskGetTickCount() - lastTick > 10000) {
-          NRF_LOG_INFO("---------------------------------------\nFree heap : %d", xPortGetFreeHeapSize());
-          auto nb = uxTaskGetSystemState(tasksStatus, 10, nullptr);
-          for (uint32_t i = 0; i < nb; i++) {
-            NRF_LOG_INFO("Task [%s] - %d", tasksStatus[i].pcTaskName, tasksStatus[i].usStackHighWaterMark);
-            if (tasksStatus[i].usStackHighWaterMark < 20)
-              NRF_LOG_INFO("WARNING!!! Task %s task is nearly full, only %dB available",
-                           tasksStatus[i].pcTaskName,
-                           tasksStatus[i].usStackHighWaterMark * 4);
-          }
-          lastTick = xTaskGetTickCount();
-        }
-      }
-
+      void Process();
+#if configUSE_TRACE_FACILITY == 1
     private:
       mutable TickType_t lastTick = 0;
-      mutable TaskStatus_t tasksStatus[10];
+#endif
     };
   }
-}
\ No newline at end of file
+}