summaryrefslogtreecommitdiff
path: root/src/logging
diff options
context:
space:
mode:
authorJF <jf@codingfield.com>2021-05-21 09:38:38 (GMT)
committerGitea <gitea@fake.local>2021-05-21 09:38:38 (GMT)
commitde69905c0647997091d9e385538c96de30be93e6 (patch)
tree4775001d808da520c93a7552da1bea80e7714a30 /src/logging
parenta80e782f267cd2424d22da23d809c0c6a8ff8761 (diff)
parent7c9513be8a3bf36fda5706cb0fb1bd6232d42ffd (diff)
Merge branch 'develop' of JF/PineTime into master
Diffstat (limited to 'src/logging')
-rw-r--r--src/logging/DummyLogger.h13
-rw-r--r--src/logging/Logger.h6
-rw-r--r--src/logging/NrfLogger.cpp17
-rw-r--r--src/logging/NrfLogger.h15
4 files changed, 25 insertions, 26 deletions
diff --git a/src/logging/DummyLogger.h b/src/logging/DummyLogger.h
index 0aa7288..8732dff 100644
--- a/src/logging/DummyLogger.h
+++ b/src/logging/DummyLogger.h
@@ -2,12 +2,13 @@
#include "Logger.h"
namespace Pinetime {
- namespace Logging{
- class DummyLogger : public Logger {
+ namespace Logging {
+ class DummyLogger : public Logger {
public:
- void Init() override {}
- void Resume() override {}
- };
+ void Init() override {
+ }
+ void Resume() override {
+ }
+ };
}
}
-
diff --git a/src/logging/Logger.h b/src/logging/Logger.h
index 95d21dc..093a942 100644
--- a/src/logging/Logger.h
+++ b/src/logging/Logger.h
@@ -3,9 +3,9 @@
namespace Pinetime {
namespace Logging {
class Logger {
- public:
- virtual void Init() = 0;
- virtual void Resume() = 0;
+ 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
index 9f7624b..1c048f2 100644
--- a/src/logging/NrfLogger.cpp
+++ b/src/logging/NrfLogger.cpp
@@ -12,25 +12,24 @@ void NrfLogger::Init() {
NRF_LOG_DEFAULT_BACKENDS_INIT();
- if (pdPASS != xTaskCreate(NrfLogger::Process, "LOGGER", 200, this, 0, &m_logger_thread))
+ 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) {
+// Suppress endless loop diagnostic
+#pragma clang diagnostic push
+#pragma ide diagnostic ignored "EndlessLoop"
+ while (true) {
NRF_LOG_FLUSH();
vTaskDelay(100); // Not good for power consumption, it will wake up every 100ms...
}
- // Clear diagnostic suppression
- #pragma clang diagnostic pop
+// 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
index fb68b91..060c4e7 100644
--- a/src/logging/NrfLogger.h
+++ b/src/logging/NrfLogger.h
@@ -5,16 +5,15 @@
#include <task.h>
namespace Pinetime {
- namespace Logging{
+ namespace Logging {
class NrfLogger : public Logger {
- public:
- void Init() override;
- void Resume() override;
+ public:
+ void Init() override;
+ void Resume() override;
- private:
- static void Process(void*);
- TaskHandle_t m_logger_thread;
+ private:
+ static void Process(void*);
+ TaskHandle_t m_logger_thread;
};
}
}
-