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.
This commit is contained in:
Reinhold Gschweicher 2021-10-13 22:08:35 +02:00
parent 624429b54c
commit ac7b2da611
140 changed files with 243 additions and 243 deletions

View File

@ -15,7 +15,7 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>. along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
#include "AlarmController.h" #include "components/alarm/AlarmController.h"
#include "systemtask/SystemTask.h" #include "systemtask/SystemTask.h"
#include "app_timer.h" #include "app_timer.h"
#include "task.h" #include "task.h"

View File

@ -1,4 +1,4 @@
#include "BatteryController.h" #include "components/battery/BatteryController.h"
#include "drivers/PinMap.h" #include "drivers/PinMap.h"
#include <hal/nrf_gpio.h> #include <hal/nrf_gpio.h>
#include <nrfx_saadc.h> #include <nrfx_saadc.h>

View File

@ -1,6 +1,6 @@
#include "AlertNotificationClient.h" #include "components/ble/AlertNotificationClient.h"
#include <algorithm> #include <algorithm>
#include "NotificationManager.h" #include "components/ble/NotificationManager.h"
#include "systemtask/SystemTask.h" #include "systemtask/SystemTask.h"
using namespace Pinetime::Controllers; using namespace Pinetime::Controllers;

View File

@ -7,7 +7,7 @@
#include <host/ble_gap.h> #include <host/ble_gap.h>
#undef max #undef max
#undef min #undef min
#include "BleClient.h" #include "components/ble/BleClient.h"
namespace Pinetime { namespace Pinetime {

View File

@ -1,8 +1,8 @@
#include "AlertNotificationService.h" #include "components/ble/AlertNotificationService.h"
#include <hal/nrf_rtc.h> #include <hal/nrf_rtc.h>
#include <cstring> #include <cstring>
#include <algorithm> #include <algorithm>
#include "NotificationManager.h" #include "components/ble/NotificationManager.h"
#include "systemtask/SystemTask.h" #include "systemtask/SystemTask.h"
using namespace Pinetime::Controllers; using namespace Pinetime::Controllers;

View File

@ -1,5 +1,5 @@
#include <nrf_log.h> #include <nrf_log.h>
#include "BatteryInformationService.h" #include "components/ble/BatteryInformationService.h"
#include "components/battery/BatteryController.h" #include "components/battery/BatteryController.h"
using namespace Pinetime::Controllers; using namespace Pinetime::Controllers;

View File

@ -1,4 +1,4 @@
#include "BleController.h" #include "components/ble/BleController.h"
using namespace Pinetime::Controllers; using namespace Pinetime::Controllers;

View File

@ -1,4 +1,4 @@
#include "CurrentTimeClient.h" #include "components/ble/CurrentTimeClient.h"
#include <hal/nrf_rtc.h> #include <hal/nrf_rtc.h>
#include <nrf_log.h> #include <nrf_log.h>
#include "components/datetime/DateTimeController.h" #include "components/datetime/DateTimeController.h"

View File

@ -5,7 +5,7 @@
#undef max #undef max
#undef min #undef min
#include <cstdint> #include <cstdint>
#include "BleClient.h" #include "components/ble/BleClient.h"
namespace Pinetime { namespace Pinetime {
namespace Controllers { namespace Controllers {

View File

@ -1,4 +1,4 @@
#include "CurrentTimeService.h" #include "components/ble/CurrentTimeService.h"
#include <hal/nrf_rtc.h> #include <hal/nrf_rtc.h>
#include <nrf_log.h> #include <nrf_log.h>

View File

@ -1,4 +1,4 @@
#include "DeviceInformationService.h" #include "components/ble/DeviceInformationService.h"
using namespace Pinetime::Controllers; using namespace Pinetime::Controllers;

View File

@ -1,4 +1,4 @@
#include "DfuService.h" #include "components/ble/DfuService.h"
#include <cstring> #include <cstring>
#include "components/ble/BleController.h" #include "components/ble/BleController.h"
#include "drivers/SpiNorFlash.h" #include "drivers/SpiNorFlash.h"

View File

@ -1,4 +1,4 @@
#include "HeartRateService.h" #include "components/ble/HeartRateService.h"
#include "components/heartrate/HeartRateController.h" #include "components/heartrate/HeartRateController.h"
#include "systemtask/SystemTask.h" #include "systemtask/SystemTask.h"

View File

@ -1,6 +1,6 @@
#include "ImmediateAlertService.h" #include "components/ble/ImmediateAlertService.h"
#include <cstring> #include <cstring>
#include "NotificationManager.h" #include "components/ble/NotificationManager.h"
#include "systemtask/SystemTask.h" #include "systemtask/SystemTask.h"
using namespace Pinetime::Controllers; using namespace Pinetime::Controllers;

View File

@ -1,4 +1,4 @@
#include "MotionService.h" #include "components/ble/MotionService.h"
#include "components/motion//MotionController.h" #include "components/motion//MotionController.h"
#include "systemtask/SystemTask.h" #include "systemtask/SystemTask.h"

View File

@ -15,7 +15,7 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>. along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
#include "MusicService.h" #include "components/ble/MusicService.h"
#include "systemtask/SystemTask.h" #include "systemtask/SystemTask.h"
namespace { namespace {

View File

@ -16,7 +16,7 @@
along with this program. If not, see <https://www.gnu.org/licenses/>. along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
#include "NavigationService.h" #include "components/ble/NavigationService.h"
#include "systemtask/SystemTask.h" #include "systemtask/SystemTask.h"

View File

@ -1,4 +1,4 @@
#include "NimbleController.h" #include "components/ble/NimbleController.h"
#include <hal/nrf_rtc.h> #include <hal/nrf_rtc.h>
#define min // workaround: nimble's min/max macros conflict with libstdc++ #define min // workaround: nimble's min/max macros conflict with libstdc++
#define max #define max

View File

@ -7,19 +7,19 @@
#include <host/ble_gap.h> #include <host/ble_gap.h>
#undef max #undef max
#undef min #undef min
#include "AlertNotificationClient.h" #include "components/ble/AlertNotificationClient.h"
#include "AlertNotificationService.h" #include "components/ble/AlertNotificationService.h"
#include "BatteryInformationService.h" #include "components/ble/BatteryInformationService.h"
#include "CurrentTimeClient.h" #include "components/ble/CurrentTimeClient.h"
#include "CurrentTimeService.h" #include "components/ble/CurrentTimeService.h"
#include "DeviceInformationService.h" #include "components/ble/DeviceInformationService.h"
#include "DfuService.h" #include "components/ble/DfuService.h"
#include "ImmediateAlertService.h" #include "components/ble/ImmediateAlertService.h"
#include "MusicService.h" #include "components/ble/MusicService.h"
#include "NavigationService.h" #include "components/ble/NavigationService.h"
#include "ServiceDiscovery.h" #include "components/ble/ServiceDiscovery.h"
#include "HeartRateService.h" #include "components/ble/HeartRateService.h"
#include "MotionService.h" #include "components/ble/MotionService.h"
namespace Pinetime { namespace Pinetime {
namespace Drivers { namespace Drivers {

View File

@ -1,4 +1,4 @@
#include "NotificationManager.h" #include "components/ble/NotificationManager.h"
#include <cstring> #include <cstring>
#include <algorithm> #include <algorithm>

View File

@ -1,6 +1,6 @@
#include "ServiceDiscovery.h" #include "components/ble/ServiceDiscovery.h"
#include <libraries/log/nrf_log.h> #include <libraries/log/nrf_log.h>
#include "BleClient.h" #include "components/ble/BleClient.h"
using namespace Pinetime::Controllers; using namespace Pinetime::Controllers;

View File

@ -1,4 +1,4 @@
#include "BrightnessController.h" #include "components/brightness/BrightnessController.h"
#include <hal/nrf_gpio.h> #include <hal/nrf_gpio.h>
#include "displayapp/screens/Symbols.h" #include "displayapp/screens/Symbols.h"
#include "drivers/PinMap.h" #include "drivers/PinMap.h"

View File

@ -1,4 +1,4 @@
#include "DateTimeController.h" #include "components/datetime/DateTimeController.h"
#include <date/date.h> #include <date/date.h>
#include <libraries/log/nrf_log.h> #include <libraries/log/nrf_log.h>
#include <systemtask/SystemTask.h> #include <systemtask/SystemTask.h>

View File

@ -1,4 +1,4 @@
#include "FirmwareValidator.h" #include "components/firmwarevalidator/FirmwareValidator.h"
#include <hal/nrf_rtc.h> #include <hal/nrf_rtc.h>
#include "drivers/InternalFlash.h" #include "drivers/InternalFlash.h"

View File

@ -1,4 +1,4 @@
#include "FS.h" #include "components/fs/FS.h"
#include <cstring> #include <cstring>
#include <littlefs/lfs.h> #include <littlefs/lfs.h>
#include <lvgl/lvgl.h> #include <lvgl/lvgl.h>

View File

@ -1,4 +1,4 @@
#include "Gfx.h" #include "components/gfx/Gfx.h"
#include "drivers/St7789.h" #include "drivers/St7789.h"
using namespace Pinetime::Components; using namespace Pinetime::Components;

View File

@ -4,7 +4,7 @@
C++ port Copyright (C) 2021 Jean-François Milants C++ port Copyright (C) 2021 Jean-François Milants
*/ */
#include "Biquad.h" #include "components/heartrate/Biquad.h"
using namespace Pinetime::Controllers; using namespace Pinetime::Controllers;

View File

@ -1,4 +1,4 @@
#include "HeartRateController.h" #include "components/heartrate/HeartRateController.h"
#include <heartratetask/HeartRateTask.h> #include <heartratetask/HeartRateTask.h>
#include <systemtask/SystemTask.h> #include <systemtask/SystemTask.h>

View File

@ -6,7 +6,7 @@
#include <vector> #include <vector>
#include <nrf_log.h> #include <nrf_log.h>
#include "Ppg.h" #include "components/heartrate/Ppg.h"
using namespace Pinetime::Controllers; using namespace Pinetime::Controllers;
/** Original implementation from wasp-os : https://github.com/daniel-thompson/wasp-os/blob/master/wasp/ppg.py */ /** Original implementation from wasp-os : https://github.com/daniel-thompson/wasp-os/blob/master/wasp/ppg.py */

View File

@ -1,8 +1,8 @@
#pragma once #pragma once
#include <array> #include <array>
#include "Biquad.h" #include "components/heartrate/Biquad.h"
#include "Ptagc.h" #include "components/heartrate/Ptagc.h"
namespace Pinetime { namespace Pinetime {
namespace Controllers { namespace Controllers {

View File

@ -5,7 +5,7 @@
*/ */
#include <cmath> #include <cmath>
#include "Ptagc.h" #include "components/heartrate/Ptagc.h"
using namespace Pinetime::Controllers; using namespace Pinetime::Controllers;

View File

@ -1,4 +1,4 @@
#include "MotionController.h" #include "components/motion/MotionController.h"
using namespace Pinetime::Controllers; using namespace Pinetime::Controllers;

View File

@ -1,4 +1,4 @@
#include "MotorController.h" #include "components/motor/MotorController.h"
#include <hal/nrf_gpio.h> #include <hal/nrf_gpio.h>
#include "systemtask/SystemTask.h" #include "systemtask/SystemTask.h"
#include "app_timer.h" #include "app_timer.h"

View File

@ -1,4 +1,4 @@
#include "RleDecoder.h" #include "components/rle/RleDecoder.h"
using namespace Pinetime::Tools; using namespace Pinetime::Tools;

View File

@ -1,4 +1,4 @@
#include "Settings.h" #include "components/settings/Settings.h"
#include <cstdlib> #include <cstdlib>
#include <cstring> #include <cstring>

View File

@ -2,7 +2,7 @@
// Created by florian on 16.05.21. // Created by florian on 16.05.21.
// //
#include "TimerController.h" #include "components/timer/TimerController.h"
#include "systemtask/SystemTask.h" #include "systemtask/SystemTask.h"
#include "app_timer.h" #include "app_timer.h"
#include "task.h" #include "task.h"

View File

@ -1,4 +1,4 @@
#include "Colors.h" #include "displayapp/Colors.h"
using namespace Pinetime::Applications; using namespace Pinetime::Applications;
using namespace Pinetime::Controllers; using namespace Pinetime::Controllers;

View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <lvgl/src/lv_misc/lv_color.h> #include <lvgl/src/lv_misc/lv_color.h>
#include <components/settings/Settings.h> #include "components/settings/Settings.h"
namespace Pinetime { namespace Pinetime {
namespace Applications { namespace Applications {

View File

@ -1,9 +1,9 @@
#include "DisplayApp.h" #include "displayapp/DisplayApp.h"
#include <libraries/log/nrf_log.h> #include <libraries/log/nrf_log.h>
#include <displayapp/screens/HeartRate.h> #include "displayapp/screens/HeartRate.h"
#include <displayapp/screens/Motion.h> #include "displayapp/screens/Motion.h"
#include <displayapp/screens/Timer.h> #include "displayapp/screens/Timer.h"
#include <displayapp/screens/Alarm.h> #include "displayapp/screens/Alarm.h"
#include "components/battery/BatteryController.h" #include "components/battery/BatteryController.h"
#include "components/ble/BleController.h" #include "components/ble/BleController.h"
#include "components/datetime/DateTimeController.h" #include "components/datetime/DateTimeController.h"

View File

@ -5,9 +5,9 @@
#include <task.h> #include <task.h>
#include <memory> #include <memory>
#include <systemtask/Messages.h> #include <systemtask/Messages.h>
#include "Apps.h" #include "displayapp/Apps.h"
#include "LittleVgl.h" #include "displayapp/LittleVgl.h"
#include "TouchEvents.h" #include "displayapp/TouchEvents.h"
#include "components/brightness/BrightnessController.h" #include "components/brightness/BrightnessController.h"
#include "components/motor/MotorController.h" #include "components/motor/MotorController.h"
#include "components/firmwarevalidator/FirmwareValidator.h" #include "components/firmwarevalidator/FirmwareValidator.h"
@ -17,7 +17,7 @@
#include "components/alarm/AlarmController.h" #include "components/alarm/AlarmController.h"
#include "touchhandler/TouchHandler.h" #include "touchhandler/TouchHandler.h"
#include "Messages.h" #include "displayapp/Messages.h"
#include "BootErrors.h" #include "BootErrors.h"
namespace Pinetime { namespace Pinetime {

View File

@ -1,9 +1,9 @@
#include "DisplayAppRecovery.h" #include "displayapp/DisplayAppRecovery.h"
#include <FreeRTOS.h> #include <FreeRTOS.h>
#include <task.h> #include <task.h>
#include <libraries/log/nrf_log.h> #include <libraries/log/nrf_log.h>
#include <components/rle/RleDecoder.h> #include "components/rle/RleDecoder.h"
#include <touchhandler/TouchHandler.h> #include "touchhandler/TouchHandler.h"
#include "displayapp/icons/infinitime/infinitime-nb.c" #include "displayapp/icons/infinitime/infinitime-nb.c"
#include "components/ble/BleController.h" #include "components/ble/BleController.h"

View File

@ -11,10 +11,10 @@
#include <drivers/Watchdog.h> #include <drivers/Watchdog.h>
#include <components/motor/MotorController.h> #include <components/motor/MotorController.h>
#include "BootErrors.h" #include "BootErrors.h"
#include "TouchEvents.h" #include "displayapp/TouchEvents.h"
#include "Apps.h" #include "displayapp/Apps.h"
#include "Messages.h" #include "displayapp/Messages.h"
#include "DummyLittleVgl.h" #include "displayapp/DummyLittleVgl.h"
namespace Pinetime { namespace Pinetime {
namespace Drivers { namespace Drivers {

View File

@ -1,5 +1,5 @@
#include "LittleVgl.h" #include "displayapp/LittleVgl.h"
#include "lv_pinetime_theme.h" #include "displayapp/lv_pinetime_theme.h"
#include <FreeRTOS.h> #include <FreeRTOS.h>
#include <task.h> #include <task.h>

View File

@ -6,7 +6,7 @@
/********************* /*********************
* INCLUDES * INCLUDES
*********************/ *********************/
#include "lv_pinetime_theme.h" #include "displayapp/lv_pinetime_theme.h"
/********************* /*********************
* DEFINES * DEFINES

View File

@ -15,9 +15,9 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>. along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
#include "Alarm.h" #include "displayapp/screens/Alarm.h"
#include "Screen.h" #include "displayapp/screens/Screen.h"
#include "Symbols.h" #include "displayapp/screens/Symbols.h"
using namespace Pinetime::Applications::Screens; using namespace Pinetime::Applications::Screens;
using Pinetime::Controllers::AlarmController; using Pinetime::Controllers::AlarmController;

View File

@ -17,9 +17,9 @@
*/ */
#pragma once #pragma once
#include "Screen.h" #include "displayapp/screens/Screen.h"
#include "systemtask/SystemTask.h" #include "systemtask/SystemTask.h"
#include "../LittleVgl.h" #include "displayapp/LittleVgl.h"
#include "components/alarm/AlarmController.h" #include "components/alarm/AlarmController.h"
namespace Pinetime { namespace Pinetime {

View File

@ -1,10 +1,10 @@
#include "ApplicationList.h" #include "displayapp/screens/ApplicationList.h"
#include <lvgl/lvgl.h> #include <lvgl/lvgl.h>
#include <array> #include <array>
#include "Symbols.h" #include "displayapp/screens/Symbols.h"
#include "Tile.h" #include "displayapp/screens/Tile.h"
#include "displayapp/Apps.h" #include "displayapp/Apps.h"
#include "../DisplayApp.h" #include "displayapp/DisplayApp.h"
using namespace Pinetime::Applications::Screens; using namespace Pinetime::Applications::Screens;

View File

@ -2,8 +2,8 @@
#include <memory> #include <memory>
#include "Screen.h" #include "displayapp/screens/Screen.h"
#include "ScreenList.h" #include "displayapp/screens/ScreenList.h"
#include "components/datetime/DateTimeController.h" #include "components/datetime/DateTimeController.h"
#include "components/settings/Settings.h" #include "components/settings/Settings.h"
#include "components/battery/BatteryController.h" #include "components/battery/BatteryController.h"

View File

@ -1,6 +1,6 @@
#include <cstdint> #include <cstdint>
#include "BatteryIcon.h" #include "displayapp/screens/BatteryIcon.h"
#include "Symbols.h" #include "displayapp/screens/Symbols.h"
using namespace Pinetime::Applications::Screens; using namespace Pinetime::Applications::Screens;

View File

@ -1,5 +1,5 @@
#include "BatteryInfo.h" #include "displayapp/screens/BatteryInfo.h"
#include "../DisplayApp.h" #include "displayapp/DisplayApp.h"
#include "components/battery/BatteryController.h" #include "components/battery/BatteryController.h"
using namespace Pinetime::Applications::Screens; using namespace Pinetime::Applications::Screens;

View File

@ -3,7 +3,7 @@
#include <cstdint> #include <cstdint>
#include <FreeRTOS.h> #include <FreeRTOS.h>
#include <timers.h> #include <timers.h>
#include "Screen.h" #include "displayapp/screens/Screen.h"
#include <lvgl/lvgl.h> #include <lvgl/lvgl.h>
namespace Pinetime { namespace Pinetime {

View File

@ -1,5 +1,5 @@
#include "BleIcon.h" #include "displayapp/screens/BleIcon.h"
#include "Symbols.h" #include "displayapp/screens/Symbols.h"
using namespace Pinetime::Applications::Screens; using namespace Pinetime::Applications::Screens;
const char* BleIcon::GetIcon(bool isConnected) { const char* BleIcon::GetIcon(bool isConnected) {

View File

@ -1,4 +1,4 @@
#include "Brightness.h" #include "displayapp/screens/Brightness.h"
#include <lvgl/lvgl.h> #include <lvgl/lvgl.h>
using namespace Pinetime::Applications::Screens; using namespace Pinetime::Applications::Screens;

View File

@ -2,7 +2,7 @@
#include <lvgl/src/lv_core/lv_obj.h> #include <lvgl/src/lv_core/lv_obj.h>
#include <cstdint> #include <cstdint>
#include "Screen.h" #include "displayapp/screens/Screen.h"
#include "components/brightness/BrightnessController.h" #include "components/brightness/BrightnessController.h"
namespace Pinetime { namespace Pinetime {

View File

@ -1,4 +1,4 @@
#include "Clock.h" #include "displayapp/screens/Clock.h"
#include <date/date.h> #include <date/date.h>
#include <lvgl/lvgl.h> #include <lvgl/lvgl.h>
@ -6,10 +6,10 @@
#include "components/motion/MotionController.h" #include "components/motion/MotionController.h"
#include "components/ble/BleController.h" #include "components/ble/BleController.h"
#include "components/ble/NotificationManager.h" #include "components/ble/NotificationManager.h"
#include "../DisplayApp.h" #include "displayapp/DisplayApp.h"
#include "WatchFaceDigital.h" #include "displayapp/screens/WatchFaceDigital.h"
#include "WatchFaceAnalog.h" #include "displayapp/screens/WatchFaceAnalog.h"
#include "PineTimeStyle.h" #include "displayapp/screens/PineTimeStyle.h"
using namespace Pinetime::Applications::Screens; using namespace Pinetime::Applications::Screens;

View File

@ -5,7 +5,7 @@
#include <cstdint> #include <cstdint>
#include <memory> #include <memory>
#include <components/heartrate/HeartRateController.h> #include <components/heartrate/HeartRateController.h>
#include "Screen.h" #include "displayapp/screens/Screen.h"
#include "components/datetime/DateTimeController.h" #include "components/datetime/DateTimeController.h"
namespace Pinetime { namespace Pinetime {

View File

@ -1,7 +1,7 @@
#include "DropDownDemo.h" #include "displayapp/screens/DropDownDemo.h"
#include <lvgl/lvgl.h> #include <lvgl/lvgl.h>
#include <libraries/log/nrf_log.h> #include <libraries/log/nrf_log.h>
#include "../DisplayApp.h" #include "displayapp/DisplayApp.h"
using namespace Pinetime::Applications::Screens; using namespace Pinetime::Applications::Screens;

View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <cstdint> #include <cstdint>
#include "Screen.h" #include "displayapp/screens/Screen.h"
#include <lvgl/src/lv_core/lv_obj.h> #include <lvgl/src/lv_core/lv_obj.h>
namespace Pinetime { namespace Pinetime {

View File

@ -1,4 +1,4 @@
#include "Error.h" #include "displayapp/screens/Error.h"
using namespace Pinetime::Applications::Screens; using namespace Pinetime::Applications::Screens;

View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Screen.h" #include "displayapp/screens/Screen.h"
#include "BootErrors.h" #include "BootErrors.h"
#include <lvgl/lvgl.h> #include <lvgl/lvgl.h>

View File

@ -1,7 +1,7 @@
#include "FirmwareUpdate.h" #include "displayapp/screens/FirmwareUpdate.h"
#include <lvgl/lvgl.h> #include <lvgl/lvgl.h>
#include "components/ble/BleController.h" #include "components/ble/BleController.h"
#include "../DisplayApp.h" #include "displayapp/DisplayApp.h"
using namespace Pinetime::Applications::Screens; using namespace Pinetime::Applications::Screens;

View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Screen.h" #include "displayapp/screens/Screen.h"
#include <lvgl/src/lv_core/lv_obj.h> #include <lvgl/src/lv_core/lv_obj.h>
#include "FreeRTOS.h" #include "FreeRTOS.h"

View File

@ -1,8 +1,8 @@
#include "FirmwareValidation.h" #include "displayapp/screens/FirmwareValidation.h"
#include <lvgl/lvgl.h> #include <lvgl/lvgl.h>
#include "Version.h" #include "Version.h"
#include "components/firmwarevalidator/FirmwareValidator.h" #include "components/firmwarevalidator/FirmwareValidator.h"
#include "../DisplayApp.h" #include "displayapp/DisplayApp.h"
using namespace Pinetime::Applications::Screens; using namespace Pinetime::Applications::Screens;

View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Screen.h" #include "displayapp/screens/Screen.h"
#include <lvgl/src/lv_core/lv_obj.h> #include <lvgl/src/lv_core/lv_obj.h>
namespace Pinetime { namespace Pinetime {

View File

@ -1,6 +1,6 @@
#include "FlashLight.h" #include "displayapp/screens/FlashLight.h"
#include "../DisplayApp.h" #include "displayapp/DisplayApp.h"
#include "Symbols.h" #include "displayapp/screens/Symbols.h"
using namespace Pinetime::Applications::Screens; using namespace Pinetime::Applications::Screens;

View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Screen.h" #include "displayapp/screens/Screen.h"
#include "components/brightness/BrightnessController.h" #include "components/brightness/BrightnessController.h"
#include "systemtask/SystemTask.h" #include "systemtask/SystemTask.h"
#include <cstdint> #include <cstdint>

View File

@ -1,8 +1,8 @@
#include <libs/lvgl/lvgl.h> #include <lvgl/lvgl.h>
#include "HeartRate.h" #include "displayapp/screens/HeartRate.h"
#include <components/heartrate/HeartRateController.h> #include <components/heartrate/HeartRateController.h>
#include "../DisplayApp.h" #include "displayapp/DisplayApp.h"
using namespace Pinetime::Applications::Screens; using namespace Pinetime::Applications::Screens;

View File

@ -2,7 +2,7 @@
#include <cstdint> #include <cstdint>
#include <chrono> #include <chrono>
#include "Screen.h" #include "displayapp/screens/Screen.h"
#include <bits/unique_ptr.h> #include <bits/unique_ptr.h>
#include "systemtask/SystemTask.h" #include "systemtask/SystemTask.h"
#include <libs/lvgl/src/lv_core/lv_style.h> #include <libs/lvgl/src/lv_core/lv_style.h>

View File

@ -1,6 +1,6 @@
#include "InfiniPaint.h" #include "displayapp/screens/InfiniPaint.h"
#include "../DisplayApp.h" #include "displayapp/DisplayApp.h"
#include "../LittleVgl.h" #include "displayapp/LittleVgl.h"
using namespace Pinetime::Applications::Screens; using namespace Pinetime::Applications::Screens;

View File

@ -2,7 +2,7 @@
#include <lvgl/lvgl.h> #include <lvgl/lvgl.h>
#include <cstdint> #include <cstdint>
#include "Screen.h" #include "displayapp/screens/Screen.h"
namespace Pinetime { namespace Pinetime {
namespace Components { namespace Components {

View File

@ -1,4 +1,4 @@
#include "Label.h" #include "displayapp/screens/Label.h"
using namespace Pinetime::Applications::Screens; using namespace Pinetime::Applications::Screens;

View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Screen.h" #include "displayapp/screens/Screen.h"
#include <lvgl/lvgl.h> #include <lvgl/lvgl.h>
namespace Pinetime { namespace Pinetime {

View File

@ -1,6 +1,6 @@
#include "List.h" #include "displayapp/screens/List.h"
#include "../DisplayApp.h" #include "displayapp/DisplayApp.h"
#include "Symbols.h" #include "displayapp/screens/Symbols.h"
using namespace Pinetime::Applications::Screens; using namespace Pinetime::Applications::Screens;

View File

@ -3,8 +3,8 @@
#include <lvgl/lvgl.h> #include <lvgl/lvgl.h>
#include <cstdint> #include <cstdint>
#include <memory> #include <memory>
#include "Screen.h" #include "displayapp/screens/Screen.h"
#include "../Apps.h" #include "displayapp/Apps.h"
#include "components/settings/Settings.h" #include "components/settings/Settings.h"
#define MAXLISTITEMS 4 #define MAXLISTITEMS 4

View File

@ -1,6 +1,6 @@
#include "Meter.h" #include "displayapp/screens/Meter.h"
#include <lvgl/lvgl.h> #include <lvgl/lvgl.h>
#include "../DisplayApp.h" #include "displayapp/DisplayApp.h"
using namespace Pinetime::Applications::Screens; using namespace Pinetime::Applications::Screens;

View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <cstdint> #include <cstdint>
#include "Screen.h" #include "displayapp/screens/Screen.h"
#include <lvgl/src/lv_core/lv_style.h> #include <lvgl/src/lv_core/lv_style.h>
#include <lvgl/src/lv_core/lv_obj.h> #include <lvgl/src/lv_core/lv_obj.h>

View File

@ -1,5 +1,5 @@
#include "Metronome.h" #include "displayapp/screens/Metronome.h"
#include "Symbols.h" #include "displayapp/screens/Symbols.h"
using namespace Pinetime::Applications::Screens; using namespace Pinetime::Applications::Screens;

View File

@ -1,6 +1,6 @@
#include <libs/lvgl/lvgl.h> #include <libs/lvgl/lvgl.h>
#include "Motion.h" #include "displayapp/screens/Motion.h"
#include "../DisplayApp.h" #include "displayapp/DisplayApp.h"
using namespace Pinetime::Applications::Screens; using namespace Pinetime::Applications::Screens;

View File

@ -2,7 +2,7 @@
#include <cstdint> #include <cstdint>
#include <chrono> #include <chrono>
#include "Screen.h" #include "displayapp/screens/Screen.h"
#include <bits/unique_ptr.h> #include <bits/unique_ptr.h>
#include <libs/lvgl/src/lv_core/lv_style.h> #include <libs/lvgl/src/lv_core/lv_style.h>
#include <libs/lvgl/src/lv_core/lv_obj.h> #include <libs/lvgl/src/lv_core/lv_obj.h>

View File

@ -15,10 +15,10 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>. along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
#include "Music.h" #include "displayapp/screens/Music.h"
#include "Symbols.h" #include "displayapp/screens/Symbols.h"
#include <cstdint> #include <cstdint>
#include "../DisplayApp.h" #include "displayapp/DisplayApp.h"
#include "components/ble/MusicService.h" #include "components/ble/MusicService.h"
#include "displayapp/icons/music/disc.cpp" #include "displayapp/icons/music/disc.cpp"
#include "displayapp/icons/music/disc_f_1.cpp" #include "displayapp/icons/music/disc_f_1.cpp"

View File

@ -20,7 +20,7 @@
#include <FreeRTOS.h> #include <FreeRTOS.h>
#include <lvgl/src/lv_core/lv_obj.h> #include <lvgl/src/lv_core/lv_obj.h>
#include <string> #include <string>
#include "Screen.h" #include "displayapp/screens/Screen.h"
namespace Pinetime { namespace Pinetime {
namespace Controllers { namespace Controllers {

View File

@ -15,9 +15,9 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>. along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
#include "Navigation.h" #include "displayapp/screens/Navigation.h"
#include <cstdint> #include <cstdint>
#include "../DisplayApp.h" #include "displayapp/DisplayApp.h"
#include "components/ble/NavigationService.h" #include "components/ble/NavigationService.h"
using namespace Pinetime::Applications::Screens; using namespace Pinetime::Applications::Screens;

View File

@ -20,7 +20,7 @@
#include <FreeRTOS.h> #include <FreeRTOS.h>
#include <lvgl/src/lv_core/lv_obj.h> #include <lvgl/src/lv_core/lv_obj.h>
#include <string> #include <string>
#include "Screen.h" #include "displayapp/screens/Screen.h"
#include <array> #include <array>
namespace Pinetime { namespace Pinetime {

View File

@ -1,5 +1,5 @@
#include "NotificationIcon.h" #include "displayapp/screens/NotificationIcon.h"
#include "Symbols.h" #include "displayapp/screens/Symbols.h"
using namespace Pinetime::Applications::Screens; using namespace Pinetime::Applications::Screens;
const char* NotificationIcon::GetIcon(bool newNotificationAvailable) { const char* NotificationIcon::GetIcon(bool newNotificationAvailable) {

View File

@ -1,8 +1,8 @@
#include "Notifications.h" #include "displayapp/screens/Notifications.h"
#include <displayapp/DisplayApp.h> #include "displayapp/DisplayApp.h"
#include "components/ble/MusicService.h" #include "components/ble/MusicService.h"
#include "components/ble/AlertNotificationService.h" #include "components/ble/AlertNotificationService.h"
#include "Symbols.h" #include "displayapp/screens/Symbols.h"
using namespace Pinetime::Applications::Screens; using namespace Pinetime::Applications::Screens;
extern lv_font_t jetbrains_mono_extrabold_compressed; extern lv_font_t jetbrains_mono_extrabold_compressed;

View File

@ -3,7 +3,7 @@
#include <lvgl/lvgl.h> #include <lvgl/lvgl.h>
#include <cstdint> #include <cstdint>
#include <memory> #include <memory>
#include "Screen.h" #include "displayapp/screens/Screen.h"
#include "components/ble/NotificationManager.h" #include "components/ble/NotificationManager.h"
#include "components/motor/MotorController.h" #include "components/motor/MotorController.h"

View File

@ -1,6 +1,6 @@
#include "Paddle.h" #include "displayapp/screens/Paddle.h"
#include "../DisplayApp.h" #include "displayapp/DisplayApp.h"
#include "../LittleVgl.h" #include "displayapp/LittleVgl.h"
using namespace Pinetime::Applications::Screens; using namespace Pinetime::Applications::Screens;

View File

@ -2,7 +2,7 @@
#include <lvgl/lvgl.h> #include <lvgl/lvgl.h>
#include <cstdint> #include <cstdint>
#include "Screen.h" #include "displayapp/screens/Screen.h"
namespace Pinetime { namespace Pinetime {
namespace Components { namespace Components {

View File

@ -19,21 +19,21 @@
* Style/layout copied from TimeStyle for Pebble by Dan Tilden (github.com/tilden) * Style/layout copied from TimeStyle for Pebble by Dan Tilden (github.com/tilden)
*/ */
#include "PineTimeStyle.h" #include "displayapp/screens/PineTimeStyle.h"
#include <date/date.h> #include <date/date.h>
#include <lvgl/lvgl.h> #include <lvgl/lvgl.h>
#include <cstdio> #include <cstdio>
#include <displayapp/Colors.h> #include <displayapp/Colors.h>
#include "BatteryIcon.h" #include "displayapp/screens/BatteryIcon.h"
#include "BleIcon.h" #include "displayapp/screens/BleIcon.h"
#include "NotificationIcon.h" #include "displayapp/screens/NotificationIcon.h"
#include "Symbols.h" #include "displayapp/screens/Symbols.h"
#include "components/battery/BatteryController.h" #include "components/battery/BatteryController.h"
#include "components/ble/BleController.h" #include "components/ble/BleController.h"
#include "components/ble/NotificationManager.h" #include "components/ble/NotificationManager.h"
#include "components/motion/MotionController.h" #include "components/motion/MotionController.h"
#include "components/settings/Settings.h" #include "components/settings/Settings.h"
#include "../DisplayApp.h" #include "displayapp/DisplayApp.h"
using namespace Pinetime::Applications::Screens; using namespace Pinetime::Applications::Screens;

View File

@ -4,8 +4,8 @@
#include <chrono> #include <chrono>
#include <cstdint> #include <cstdint>
#include <memory> #include <memory>
#include "Screen.h" #include "displayapp/screens/Screen.h"
#include "ScreenList.h" #include "displayapp/screens/ScreenList.h"
#include "components/datetime/DateTimeController.h" #include "components/datetime/DateTimeController.h"
namespace Pinetime { namespace Pinetime {

View File

@ -1,4 +1,4 @@
#include "Screen.h" #include "displayapp/screens/Screen.h"
using namespace Pinetime::Applications::Screens; using namespace Pinetime::Applications::Screens;
void Screen::RefreshTaskCallback(lv_task_t* task) { void Screen::RefreshTaskCallback(lv_task_t* task) {

View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <cstdint> #include <cstdint>
#include "../TouchEvents.h" #include "displayapp/TouchEvents.h"
#include <lvgl/lvgl.h> #include <lvgl/lvgl.h>
namespace Pinetime { namespace Pinetime {

View File

@ -3,8 +3,8 @@
#include <array> #include <array>
#include <functional> #include <functional>
#include <memory> #include <memory>
#include "Screen.h" #include "displayapp/screens/Screen.h"
#include "../DisplayApp.h" #include "displayapp/DisplayApp.h"
namespace Pinetime { namespace Pinetime {
namespace Applications { namespace Applications {

View File

@ -1,7 +1,7 @@
#include "Steps.h" #include "displayapp/screens/Steps.h"
#include <lvgl/lvgl.h> #include <lvgl/lvgl.h>
#include "../DisplayApp.h" #include "displayapp/DisplayApp.h"
#include "Symbols.h" #include "displayapp/screens/Symbols.h"
using namespace Pinetime::Applications::Screens; using namespace Pinetime::Applications::Screens;

View File

@ -2,7 +2,7 @@
#include <cstdint> #include <cstdint>
#include <lvgl/lvgl.h> #include <lvgl/lvgl.h>
#include "Screen.h" #include "displayapp/screens/Screen.h"
#include <components/motion/MotionController.h> #include <components/motion/MotionController.h>
namespace Pinetime { namespace Pinetime {

View File

@ -1,8 +1,8 @@
#include "StopWatch.h" #include "StopWatch.h"
#include "Screen.h" #include "displayapp/screens/Screen.h"
#include "Symbols.h" #include "displayapp/screens/Symbols.h"
#include "lvgl/lvgl.h" #include <lvgl/lvgl.h>
#include "projdefs.h" #include "projdefs.h"
#include "FreeRTOSConfig.h" #include "FreeRTOSConfig.h"
#include "task.h" #include "task.h"

View File

@ -1,8 +1,8 @@
#pragma once #pragma once
#include "Screen.h" #include "displayapp/screens/Screen.h"
#include "components/datetime/DateTimeController.h" #include "components/datetime/DateTimeController.h"
#include "../LittleVgl.h" #include "displayapp/LittleVgl.h"
#include "FreeRTOS.h" #include "FreeRTOS.h"
#include "portmacro_cmsis.h" #include "portmacro_cmsis.h"

View File

@ -1,7 +1,7 @@
#include "SystemInfo.h" #include "displayapp/screens/SystemInfo.h"
#include <lvgl/lvgl.h> #include <lvgl/lvgl.h>
#include "../DisplayApp.h" #include "displayapp/DisplayApp.h"
#include "Label.h" #include "displayapp/screens/Label.h"
#include "Version.h" #include "Version.h"
#include "BootloaderVersion.h" #include "BootloaderVersion.h"
#include "components/battery/BatteryController.h" #include "components/battery/BatteryController.h"

View File

@ -1,8 +1,8 @@
#pragma once #pragma once
#include <memory> #include <memory>
#include "Screen.h" #include "displayapp/screens/Screen.h"
#include "ScreenList.h" #include "displayapp/screens/ScreenList.h"
namespace Pinetime { namespace Pinetime {
namespace Controllers { namespace Controllers {

View File

@ -1,6 +1,6 @@
#include "Tile.h" #include "displayapp/screens/Tile.h"
#include "../DisplayApp.h" #include "displayapp/DisplayApp.h"
#include "BatteryIcon.h" #include "displayapp/screens/BatteryIcon.h"
using namespace Pinetime::Applications::Screens; using namespace Pinetime::Applications::Screens;

Some files were not shown because too many files have changed in this diff Show More