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/AlertNotificationClient.cpp   |  4 ++--
 src/components/ble/AlertNotificationClient.h     |  2 +-
 src/components/ble/AlertNotificationService.cpp  |  4 ++--
 src/components/ble/BatteryInformationService.cpp |  2 +-
 src/components/ble/BleController.cpp             |  2 +-
 src/components/ble/CurrentTimeClient.cpp         |  2 +-
 src/components/ble/CurrentTimeClient.h           |  2 +-
 src/components/ble/CurrentTimeService.cpp        |  2 +-
 src/components/ble/DeviceInformationService.cpp  |  2 +-
 src/components/ble/DfuService.cpp                |  2 +-
 src/components/ble/HeartRateService.cpp          |  2 +-
 src/components/ble/ImmediateAlertService.cpp     |  4 ++--
 src/components/ble/MotionService.cpp             |  2 +-
 src/components/ble/MusicService.cpp              |  2 +-
 src/components/ble/NavigationService.cpp         |  2 +-
 src/components/ble/NimbleController.cpp          |  2 +-
 src/components/ble/NimbleController.h            | 26 ++++++++++++------------
 src/components/ble/NotificationManager.cpp       |  2 +-
 src/components/ble/ServiceDiscovery.cpp          |  4 ++--
 19 files changed, 35 insertions(+), 35 deletions(-)

(limited to 'src/components/ble')

diff --git a/src/components/ble/AlertNotificationClient.cpp b/src/components/ble/AlertNotificationClient.cpp
index 5e5c25cf..0f850874 100644
--- a/src/components/ble/AlertNotificationClient.cpp
+++ b/src/components/ble/AlertNotificationClient.cpp
@@ -1,6 +1,6 @@
-#include "AlertNotificationClient.h"
+#include "components/ble/AlertNotificationClient.h"
 #include <algorithm>
-#include "NotificationManager.h"
+#include "components/ble/NotificationManager.h"
 #include "systemtask/SystemTask.h"
 
 using namespace Pinetime::Controllers;
diff --git a/src/components/ble/AlertNotificationClient.h b/src/components/ble/AlertNotificationClient.h
index dfba8143..2d6a3873 100644
--- a/src/components/ble/AlertNotificationClient.h
+++ b/src/components/ble/AlertNotificationClient.h
@@ -7,7 +7,7 @@
 #include <host/ble_gap.h>
 #undef max
 #undef min
-#include "BleClient.h"
+#include "components/ble/BleClient.h"
 
 namespace Pinetime {
 
diff --git a/src/components/ble/AlertNotificationService.cpp b/src/components/ble/AlertNotificationService.cpp
index 56fc595f..f616cce8 100644
--- a/src/components/ble/AlertNotificationService.cpp
+++ b/src/components/ble/AlertNotificationService.cpp
@@ -1,8 +1,8 @@
-#include "AlertNotificationService.h"
+#include "components/ble/AlertNotificationService.h"
 #include <hal/nrf_rtc.h>
 #include <cstring>
 #include <algorithm>
-#include "NotificationManager.h"
+#include "components/ble/NotificationManager.h"
 #include "systemtask/SystemTask.h"
 
 using namespace Pinetime::Controllers;
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;
diff --git a/src/components/ble/BleController.cpp b/src/components/ble/BleController.cpp
index 7c14aeb7..a80c9719 100644
--- a/src/components/ble/BleController.cpp
+++ b/src/components/ble/BleController.cpp
@@ -1,4 +1,4 @@
-#include "BleController.h"
+#include "components/ble/BleController.h"
 
 using namespace Pinetime::Controllers;
 
diff --git a/src/components/ble/CurrentTimeClient.cpp b/src/components/ble/CurrentTimeClient.cpp
index 90d1f0c7..dd8171b9 100644
--- a/src/components/ble/CurrentTimeClient.cpp
+++ b/src/components/ble/CurrentTimeClient.cpp
@@ -1,4 +1,4 @@
-#include "CurrentTimeClient.h"
+#include "components/ble/CurrentTimeClient.h"
 #include <hal/nrf_rtc.h>
 #include <nrf_log.h>
 #include "components/datetime/DateTimeController.h"
diff --git a/src/components/ble/CurrentTimeClient.h b/src/components/ble/CurrentTimeClient.h
index 6424c035..9e48be79 100644
--- a/src/components/ble/CurrentTimeClient.h
+++ b/src/components/ble/CurrentTimeClient.h
@@ -5,7 +5,7 @@
 #undef max
 #undef min
 #include <cstdint>
-#include "BleClient.h"
+#include "components/ble/BleClient.h"
 
 namespace Pinetime {
   namespace Controllers {
diff --git a/src/components/ble/CurrentTimeService.cpp b/src/components/ble/CurrentTimeService.cpp
index eefb7ec1..e509aeaf 100644
--- a/src/components/ble/CurrentTimeService.cpp
+++ b/src/components/ble/CurrentTimeService.cpp
@@ -1,4 +1,4 @@
-#include "CurrentTimeService.h"
+#include "components/ble/CurrentTimeService.h"
 #include <hal/nrf_rtc.h>
 #include <nrf_log.h>
 
diff --git a/src/components/ble/DeviceInformationService.cpp b/src/components/ble/DeviceInformationService.cpp
index 778d6e35..0f47c90f 100644
--- a/src/components/ble/DeviceInformationService.cpp
+++ b/src/components/ble/DeviceInformationService.cpp
@@ -1,4 +1,4 @@
-#include "DeviceInformationService.h"
+#include "components/ble/DeviceInformationService.h"
 
 using namespace Pinetime::Controllers;
 
diff --git a/src/components/ble/DfuService.cpp b/src/components/ble/DfuService.cpp
index 3d6416fa..71dcc7e6 100644
--- a/src/components/ble/DfuService.cpp
+++ b/src/components/ble/DfuService.cpp
@@ -1,4 +1,4 @@
-#include "DfuService.h"
+#include "components/ble/DfuService.h"
 #include <cstring>
 #include "components/ble/BleController.h"
 #include "drivers/SpiNorFlash.h"
diff --git a/src/components/ble/HeartRateService.cpp b/src/components/ble/HeartRateService.cpp
index 75a038a2..f178af79 100644
--- a/src/components/ble/HeartRateService.cpp
+++ b/src/components/ble/HeartRateService.cpp
@@ -1,4 +1,4 @@
-#include "HeartRateService.h"
+#include "components/ble/HeartRateService.h"
 #include "components/heartrate/HeartRateController.h"
 #include "systemtask/SystemTask.h"
 
diff --git a/src/components/ble/ImmediateAlertService.cpp b/src/components/ble/ImmediateAlertService.cpp
index 17ed1a96..c80b3783 100644
--- a/src/components/ble/ImmediateAlertService.cpp
+++ b/src/components/ble/ImmediateAlertService.cpp
@@ -1,6 +1,6 @@
-#include "ImmediateAlertService.h"
+#include "components/ble/ImmediateAlertService.h"
 #include <cstring>
-#include "NotificationManager.h"
+#include "components/ble/NotificationManager.h"
 #include "systemtask/SystemTask.h"
 
 using namespace Pinetime::Controllers;
diff --git a/src/components/ble/MotionService.cpp b/src/components/ble/MotionService.cpp
index b4786ab5..0146ae86 100644
--- a/src/components/ble/MotionService.cpp
+++ b/src/components/ble/MotionService.cpp
@@ -1,4 +1,4 @@
-#include "MotionService.h"
+#include "components/ble/MotionService.h"
 #include "components/motion//MotionController.h"
 #include "systemtask/SystemTask.h"
 
diff --git a/src/components/ble/MusicService.cpp b/src/components/ble/MusicService.cpp
index 74fe9522..3457ce4c 100644
--- a/src/components/ble/MusicService.cpp
+++ b/src/components/ble/MusicService.cpp
@@ -15,7 +15,7 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
-#include "MusicService.h"
+#include "components/ble/MusicService.h"
 #include "systemtask/SystemTask.h"
 
 namespace {
diff --git a/src/components/ble/NavigationService.cpp b/src/components/ble/NavigationService.cpp
index b49148d2..5418b9e5 100644
--- a/src/components/ble/NavigationService.cpp
+++ b/src/components/ble/NavigationService.cpp
@@ -16,7 +16,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include "NavigationService.h"
+#include "components/ble/NavigationService.h"
 
 #include "systemtask/SystemTask.h"
 
diff --git a/src/components/ble/NimbleController.cpp b/src/components/ble/NimbleController.cpp
index 1bcae1bc..43a8b0d6 100644
--- a/src/components/ble/NimbleController.cpp
+++ b/src/components/ble/NimbleController.cpp
@@ -1,4 +1,4 @@
-#include "NimbleController.h"
+#include "components/ble/NimbleController.h"
 #include <hal/nrf_rtc.h>
 #define min // workaround: nimble's min/max macros conflict with libstdc++
 #define max
diff --git a/src/components/ble/NimbleController.h b/src/components/ble/NimbleController.h
index 76f89ba8..895b87f2 100644
--- a/src/components/ble/NimbleController.h
+++ b/src/components/ble/NimbleController.h
@@ -7,19 +7,19 @@
 #include <host/ble_gap.h>
 #undef max
 #undef min
-#include "AlertNotificationClient.h"
-#include "AlertNotificationService.h"
-#include "BatteryInformationService.h"
-#include "CurrentTimeClient.h"
-#include "CurrentTimeService.h"
-#include "DeviceInformationService.h"
-#include "DfuService.h"
-#include "ImmediateAlertService.h"
-#include "MusicService.h"
-#include "NavigationService.h"
-#include "ServiceDiscovery.h"
-#include "HeartRateService.h"
-#include "MotionService.h"
+#include "components/ble/AlertNotificationClient.h"
+#include "components/ble/AlertNotificationService.h"
+#include "components/ble/BatteryInformationService.h"
+#include "components/ble/CurrentTimeClient.h"
+#include "components/ble/CurrentTimeService.h"
+#include "components/ble/DeviceInformationService.h"
+#include "components/ble/DfuService.h"
+#include "components/ble/ImmediateAlertService.h"
+#include "components/ble/MusicService.h"
+#include "components/ble/NavigationService.h"
+#include "components/ble/ServiceDiscovery.h"
+#include "components/ble/HeartRateService.h"
+#include "components/ble/MotionService.h"
 
 namespace Pinetime {
   namespace Drivers {
diff --git a/src/components/ble/NotificationManager.cpp b/src/components/ble/NotificationManager.cpp
index 7ffed300..ec99c4ed 100644
--- a/src/components/ble/NotificationManager.cpp
+++ b/src/components/ble/NotificationManager.cpp
@@ -1,4 +1,4 @@
-#include "NotificationManager.h"
+#include "components/ble/NotificationManager.h"
 #include <cstring>
 #include <algorithm>
 
diff --git a/src/components/ble/ServiceDiscovery.cpp b/src/components/ble/ServiceDiscovery.cpp
index b36b241c..03bcfeb4 100644
--- a/src/components/ble/ServiceDiscovery.cpp
+++ b/src/components/ble/ServiceDiscovery.cpp
@@ -1,6 +1,6 @@
-#include "ServiceDiscovery.h"
+#include "components/ble/ServiceDiscovery.h"
 #include <libraries/log/nrf_log.h>
-#include "BleClient.h"
+#include "components/ble/BleClient.h"
 
 using namespace Pinetime::Controllers;
 
-- 
cgit v1.2.3-70-g09d2


From f2918709d92dd49e7e1fffe22be04fc2b47f928b Mon Sep 17 00:00:00 2001
From: Reinhold Gschweicher <pyro4hell@gmail.com>
Date: Wed, 3 Nov 2021 23:02:30 +0100
Subject: Add missing standard includes

---
 src/BootloaderVersion.h                       | 3 +++
 src/Version.h.in                              | 2 ++
 src/components/ble/DeviceInformationService.h | 1 +
 src/displayapp/Messages.h                     | 1 +
 src/displayapp/screens/BatteryIcon.h          | 1 +
 src/displayapp/screens/InfiniPaint.h          | 1 +
 src/drivers/PinMap.h                          | 1 +
 7 files changed, 10 insertions(+)

(limited to 'src/components/ble')

diff --git a/src/BootloaderVersion.h b/src/BootloaderVersion.h
index f8127414..309c23c3 100644
--- a/src/BootloaderVersion.h
+++ b/src/BootloaderVersion.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include <cstdint>
+#include <cstddef>
+
 namespace Pinetime {
   class BootloaderVersion {
   public:
diff --git a/src/Version.h.in b/src/Version.h.in
index 8cd39c96..0d6219c0 100644
--- a/src/Version.h.in
+++ b/src/Version.h.in
@@ -2,6 +2,8 @@
 
 @VERSION_EDIT_WARNING@
 
+#include <cstdint>
+
 namespace Pinetime {
   class Version {
     public:
diff --git a/src/components/ble/DeviceInformationService.h b/src/components/ble/DeviceInformationService.h
index 54b3e961..a269afb4 100644
--- a/src/components/ble/DeviceInformationService.h
+++ b/src/components/ble/DeviceInformationService.h
@@ -1,4 +1,5 @@
 #pragma once
+#include <cstdint>
 #define min // workaround: nimble's min/max macros conflict with libstdc++
 #define max
 #include <host/ble_gap.h>
diff --git a/src/displayapp/Messages.h b/src/displayapp/Messages.h
index ab0a0608..29e09eb3 100644
--- a/src/displayapp/Messages.h
+++ b/src/displayapp/Messages.h
@@ -1,4 +1,5 @@
 #pragma once
+#include <cstdint>
 namespace Pinetime {
   namespace Applications {
     namespace Display {
diff --git a/src/displayapp/screens/BatteryIcon.h b/src/displayapp/screens/BatteryIcon.h
index b370b331..bec2e4e0 100644
--- a/src/displayapp/screens/BatteryIcon.h
+++ b/src/displayapp/screens/BatteryIcon.h
@@ -1,4 +1,5 @@
 #pragma once
+#include <cstdint>
 
 namespace Pinetime {
   namespace Applications {
diff --git a/src/displayapp/screens/InfiniPaint.h b/src/displayapp/screens/InfiniPaint.h
index 322ce757..bc0bca24 100644
--- a/src/displayapp/screens/InfiniPaint.h
+++ b/src/displayapp/screens/InfiniPaint.h
@@ -2,6 +2,7 @@
 
 #include <lvgl/lvgl.h>
 #include <cstdint>
+#include <algorithm> // std::fill
 #include "displayapp/screens/Screen.h"
 
 namespace Pinetime {
diff --git a/src/drivers/PinMap.h b/src/drivers/PinMap.h
index 57964020..579bf38a 100644
--- a/src/drivers/PinMap.h
+++ b/src/drivers/PinMap.h
@@ -1,4 +1,5 @@
 #pragma once
+#include <cstdint>
 
 namespace Pinetime {
   namespace PinMap {
-- 
cgit v1.2.3-70-g09d2


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')

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-70-g09d2