Merge branch 'develop' into master

4 files changed, 78 insertions, 0 deletions

diff --git a/src/logging/DummyLogger.h b/src/logging/DummyLogger.h
new file mode 100644
index 0000000..0aa7288
--- /dev/null
+++ b/src/logging/DummyLogger.h
@@ -0,0 +1,13 @@
+#pragma once
+#include "Logger.h"
+
+namespace Pinetime {
+  namespace Logging{
+  class DummyLogger : public Logger {
+    public:
+      void Init() override {}
+      void Resume() override {}
+  };
+  }
+}
+
diff --git a/src/logging/Logger.h b/src/logging/Logger.h
new file mode 100644
index 0000000..95d21dc
--- /dev/null
+++ b/src/logging/Logger.h
@@ -0,0 +1,11 @@
+#pragma once
+
+namespace Pinetime {
+  namespace Logging {
+    class Logger {
+      public:
+        virtual void Init() = 0;
+        virtual void Resume() = 0;
+    };
+  }
+}
\ No newline at end of file
diff --git a/src/logging/NrfLogger.cpp b/src/logging/NrfLogger.cpp
new file mode 100644
index 0000000..0d95c06
--- /dev/null
+++ b/src/logging/NrfLogger.cpp
@@ -0,0 +1,37 @@
+#include <libraries/log/nrf_log_ctrl.h>
+#include <libraries/log/nrf_log_default_backends.h>
+#include <FreeRTOS.h>
+#include <task.h>
+#include <libraries/log/nrf_log.h>
+#include "NrfLogger.h"
+
+using namespace Pinetime::Logging;
+
+void NrfLogger::Init() {
+  auto result = NRF_LOG_INIT(nullptr);
+  APP_ERROR_CHECK(result);
+
+  NRF_LOG_DEFAULT_BACKENDS_INIT();
+
+  if (pdPASS != xTaskCreate(NrfLogger::Process, "LOGGER", 200, this, 0, &m_logger_thread))
+    APP_ERROR_HANDLER(NRF_ERROR_NO_MEM);
+}
+
+void NrfLogger::Process(void*) {
+  NRF_LOG_INFO("Logger task started!");
+  // Suppress endless loop diagnostic
+  #pragma clang diagnostic push
+  #pragma ide diagnostic ignored "EndlessLoop"
+  while (1) {
+    NRF_LOG_FLUSH();
+    vTaskDelay(100); // Not good for power consumption, it will wake up every 100ms...
+  }
+  // Clear diagnostic suppression
+  #pragma clang diagnostic pop
+}
+
+void NrfLogger::Resume() {
+  vTaskResume(m_logger_thread);
+}
+
+
diff --git a/src/logging/NrfLogger.h b/src/logging/NrfLogger.h
new file mode 100644
index 0000000..cb7089f
--- /dev/null
+++ b/src/logging/NrfLogger.h
@@ -0,0 +1,17 @@
+#pragma once
+#include "Logger.h"
+
+namespace Pinetime {
+  namespace Logging{
+    class NrfLogger : public Logger {
+      public:
+        void Init() override;
+        void Resume() override;
+
+      private:
+        static void Process(void*);
+        TaskHandle_t m_logger_thread;
+    };
+  }
+}
+