From ac7b2da611fa5ef4cc989a9feb027f66c0ebfc6c Mon Sep 17 00:00:00 2001
From: Reinhold Gschweicher <pyro4hell@gmail.com>
Date: Wed, 13 Oct 2021 22:08:35 +0200
Subject: Update includes to to be relative to src directory

Don't use relative imports like `../foo.h` as those depend on the
relative position of both files. Rather than that use imports relative
to the `src` directory, which explicitly is part of the include
directories.
---
 src/components/ble/BatteryInformationService.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/components/ble/BatteryInformationService.cpp')

diff --git a/src/components/ble/BatteryInformationService.cpp b/src/components/ble/BatteryInformationService.cpp
index 29178667..b95a88d9 100644
--- a/src/components/ble/BatteryInformationService.cpp
+++ b/src/components/ble/BatteryInformationService.cpp
@@ -1,5 +1,5 @@
 #include <nrf_log.h>
-#include "BatteryInformationService.h"
+#include "components/ble/BatteryInformationService.h"
 #include "components/battery/BatteryController.h"
 
 using namespace Pinetime::Controllers;
-- 
cgit v1.2.3


From 241d36471daaea03215c289f3dc2bdc2860b5053 Mon Sep 17 00:00:00 2001
From: Reinhold Gschweicher <pyro4hell@gmail.com>
Date: Fri, 5 Nov 2021 23:55:34 +0100
Subject: Move up file header include to top

---
 src/components/ble/BatteryInformationService.cpp | 2 +-
 src/components/heartrate/Ppg.cpp                 | 2 +-
 src/components/heartrate/Ptagc.cpp               | 2 +-
 src/displayapp/screens/BatteryIcon.cpp           | 2 +-
 src/displayapp/screens/HeartRate.cpp             | 2 +-
 src/displayapp/screens/Motion.cpp                | 2 +-
 src/displayapp/screens/WatchFaceAnalog.cpp       | 2 +-
 src/drivers/Bma421.cpp                           | 2 +-
 src/drivers/Hrs3300.cpp                          | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/components/ble/BatteryInformationService.cpp')

diff --git a/src/components/ble/BatteryInformationService.cpp b/src/components/ble/BatteryInformationService.cpp
index b95a88d9..9a3f86f5 100644
--- a/src/components/ble/BatteryInformationService.cpp
+++ b/src/components/ble/BatteryInformationService.cpp
@@ -1,5 +1,5 @@
-#include <nrf_log.h>
 #include "components/ble/BatteryInformationService.h"
+#include <nrf_log.h>
 #include "components/battery/BatteryController.h"
 
 using namespace Pinetime::Controllers;
diff --git a/src/components/heartrate/Ppg.cpp b/src/components/heartrate/Ppg.cpp
index c247d1f6..a5d83696 100644
--- a/src/components/heartrate/Ppg.cpp
+++ b/src/components/heartrate/Ppg.cpp
@@ -4,9 +4,9 @@
   C++ port Copyright (C) 2021 Jean-François Milants
 */
 
+#include "components/heartrate/Ppg.h"
 #include <vector>
 #include <nrf_log.h>
-#include "components/heartrate/Ppg.h"
 using namespace Pinetime::Controllers;
 
 /** Original implementation from wasp-os : https://github.com/daniel-thompson/wasp-os/blob/master/wasp/ppg.py */
diff --git a/src/components/heartrate/Ptagc.cpp b/src/components/heartrate/Ptagc.cpp
index db496a15..1c60bc23 100644
--- a/src/components/heartrate/Ptagc.cpp
+++ b/src/components/heartrate/Ptagc.cpp
@@ -4,8 +4,8 @@
   C++ port Copyright (C) 2021 Jean-François Milants
 */
 
-#include <cmath>
 #include "components/heartrate/Ptagc.h"
+#include <cmath>
 
 using namespace Pinetime::Controllers;
 
diff --git a/src/displayapp/screens/BatteryIcon.cpp b/src/displayapp/screens/BatteryIcon.cpp
index 114b08fa..08aaab70 100644
--- a/src/displayapp/screens/BatteryIcon.cpp
+++ b/src/displayapp/screens/BatteryIcon.cpp
@@ -1,5 +1,5 @@
-#include <cstdint>
 #include "displayapp/screens/BatteryIcon.h"
+#include <cstdint>
 #include "displayapp/screens/Symbols.h"
 
 using namespace Pinetime::Applications::Screens;
diff --git a/src/displayapp/screens/HeartRate.cpp b/src/displayapp/screens/HeartRate.cpp
index 65d1aa2f..513c40bf 100644
--- a/src/displayapp/screens/HeartRate.cpp
+++ b/src/displayapp/screens/HeartRate.cpp
@@ -1,5 +1,5 @@
-#include <lvgl/lvgl.h>
 #include "displayapp/screens/HeartRate.h"
+#include <lvgl/lvgl.h>
 #include <components/heartrate/HeartRateController.h>
 
 #include "displayapp/DisplayApp.h"
diff --git a/src/displayapp/screens/Motion.cpp b/src/displayapp/screens/Motion.cpp
index 8162e02f..23eb2765 100644
--- a/src/displayapp/screens/Motion.cpp
+++ b/src/displayapp/screens/Motion.cpp
@@ -1,5 +1,5 @@
-#include <lvgl/lvgl.h>
 #include "displayapp/screens/Motion.h"
+#include <lvgl/lvgl.h>
 #include "displayapp/DisplayApp.h"
 
 using namespace Pinetime::Applications::Screens;
diff --git a/src/displayapp/screens/WatchFaceAnalog.cpp b/src/displayapp/screens/WatchFaceAnalog.cpp
index 470fc8e9..4540c1a8 100644
--- a/src/displayapp/screens/WatchFaceAnalog.cpp
+++ b/src/displayapp/screens/WatchFaceAnalog.cpp
@@ -1,5 +1,5 @@
-#include <lvgl/lvgl.h>
 #include "displayapp/screens/WatchFaceAnalog.h"
+#include <lvgl/lvgl.h>
 #include "displayapp/screens/BatteryIcon.h"
 #include "displayapp/screens/BleIcon.h"
 #include "displayapp/screens/Symbols.h"
diff --git a/src/drivers/Bma421.cpp b/src/drivers/Bma421.cpp
index 8db64ad8..2f60f42f 100644
--- a/src/drivers/Bma421.cpp
+++ b/src/drivers/Bma421.cpp
@@ -1,6 +1,6 @@
+#include "drivers/Bma421.h"
 #include <libraries/delay/nrf_delay.h>
 #include <libraries/log/nrf_log.h>
-#include "drivers/Bma421.h"
 #include "drivers/TwiMaster.h"
 #include <drivers/Bma421_C/bma423.h>
 
diff --git a/src/drivers/Hrs3300.cpp b/src/drivers/Hrs3300.cpp
index cecef145..c14fe7aa 100644
--- a/src/drivers/Hrs3300.cpp
+++ b/src/drivers/Hrs3300.cpp
@@ -4,9 +4,9 @@
   C++ port Copyright (C) 2021 Jean-François Milants
 */
 
+#include "drivers/Hrs3300.h"
 #include <algorithm>
 #include <nrf_gpio.h>
-#include "drivers/Hrs3300.h"
 
 #include <FreeRTOS.h>
 #include <task.h>
-- 
cgit v1.2.3