InfiniTime.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2026471c5d8a092e1d1ba0f6fe5eab7cb1b93cca..f7ff6178a81759cab481045e766a165546c98373 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -322,7 +322,7 @@         DisplayApp/Icons/bluetooth/os_bt_disconnected.c
         )
 
 list(APPEND SOURCE_FILES
-        Logging/NrfLogger.cpp
+        logging/NrfLogger.cpp
         DisplayApp/DisplayApp.cpp
         DisplayApp/Screens/Screen.cpp
         DisplayApp/Screens/Clock.cpp
@@ -387,7 +387,7 @@
         drivers/SpiNorFlash.cpp
         drivers/SpiMaster.cpp
         drivers/Spi.cpp
-        Logging/NrfLogger.cpp
+        logging/NrfLogger.cpp
 
         components/Gfx/Gfx.cpp
         drivers/St7789.cpp
@@ -397,8 +397,8 @@         graphics.cpp
         )
 
 set(INCLUDE_FILES
-        Logging/Logger.h
-        Logging/NrfLogger.h
+        logging/Logger.h
+        logging/NrfLogger.h
         DisplayApp/DisplayApp.h
         DisplayApp/TouchEvents.h
         DisplayApp/Screens/Screen.h




diff --git a/src/Logging/DummyLogger.h b/src/Logging/DummyLogger.h
deleted file mode 100644
index 0aa72882f3c17a4e03cb4341bb78b3b1244f1c7c..0000000000000000000000000000000000000000
--- a/src/Logging/DummyLogger.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#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
deleted file mode 100644
index 95d21dc4a067b1418108dcebecc91c55b5b9a961..0000000000000000000000000000000000000000
--- a/src/Logging/Logger.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#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
deleted file mode 100644
index 7ccacc82deb513ad11c20537a614936c20f9d29b..0000000000000000000000000000000000000000
--- a/src/Logging/NrfLogger.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#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!");
-  while (1) {
-    NRF_LOG_FLUSH();
-    vTaskDelay(100); // Not good for power consumption, it will wake up every 100ms...
-  }
-}
-
-void NrfLogger::Resume() {
-  vTaskResume(m_logger_thread);
-}
-
-




diff --git a/src/Logging/NrfLogger.h b/src/Logging/NrfLogger.h
deleted file mode 100644
index cb7089f24eff8ce36dd57b5006aba41c721d13e3..0000000000000000000000000000000000000000
--- a/src/Logging/NrfLogger.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#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;
-    };
-  }
-}
-




diff --git a/src/logging/DummyLogger.h b/src/logging/DummyLogger.h
new file mode 100644
index 0000000000000000000000000000000000000000..0aa72882f3c17a4e03cb4341bb78b3b1244f1c7c
--- /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 0000000000000000000000000000000000000000..95d21dc4a067b1418108dcebecc91c55b5b9a961
--- /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 0000000000000000000000000000000000000000..7ccacc82deb513ad11c20537a614936c20f9d29b
--- /dev/null
+++ b/src/logging/NrfLogger.cpp
@@ -0,0 +1,32 @@
+#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!");
+  while (1) {
+    NRF_LOG_FLUSH();
+    vTaskDelay(100); // Not good for power consumption, it will wake up every 100ms...
+  }
+}
+
+void NrfLogger::Resume() {
+  vTaskResume(m_logger_thread);
+}
+
+




diff --git a/src/logging/NrfLogger.h b/src/logging/NrfLogger.h
new file mode 100644
index 0000000000000000000000000000000000000000..cb7089f24eff8ce36dd57b5006aba41c721d13e3
--- /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;
+    };
+  }
+}
+