Merge branch 'NeroBurner-restructure_includes' into develop
This commit is contained in:
commit
67e077348c
|
@ -31,6 +31,7 @@ If there are no preconfigured rules for your IDE, you can use one of the existin
|
|||
- **Includes** :
|
||||
- files from the project : `#include "relative/path/to/the/file.h"`
|
||||
- external files and std : `#include <file.h>`
|
||||
- use includes relative to included directories like `src`, not relative to the current file. Don't do: `#include "../file.h"`
|
||||
- Only use [primary spellings for operators and tokens](https://en.cppreference.com/w/cpp/language/operator_alternative)
|
||||
- Use auto sparingly. Don't use auto for [fundamental/built-in types](https://en.cppreference.com/w/cpp/language/types) and [fixed width integer types](https://en.cppreference.com/w/cpp/types/integer), except when initializing with a cast to avoid duplicating the type name.
|
||||
- Examples:
|
||||
|
|
|
@ -1,5 +1,8 @@
|
|||
#pragma once
|
||||
|
||||
#include <cstdint>
|
||||
#include <cstddef>
|
||||
|
||||
namespace Pinetime {
|
||||
class BootloaderVersion {
|
||||
public:
|
||||
|
|
|
@ -2,6 +2,8 @@
|
|||
|
||||
@VERSION_EDIT_WARNING@
|
||||
|
||||
#include <cstdint>
|
||||
|
||||
namespace Pinetime {
|
||||
class Version {
|
||||
public:
|
||||
|
|
|
@ -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 "AlarmController.h"
|
||||
#include "components/alarm/AlarmController.h"
|
||||
#include "systemtask/SystemTask.h"
|
||||
#include "app_timer.h"
|
||||
#include "task.h"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include "BatteryController.h"
|
||||
#include "components/battery/BatteryController.h"
|
||||
#include "drivers/PinMap.h"
|
||||
#include <hal/nrf_gpio.h>
|
||||
#include <nrfx_saadc.h>
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
#include <host/ble_gap.h>
|
||||
#undef max
|
||||
#undef min
|
||||
#include "BleClient.h"
|
||||
#include "components/ble/BleClient.h"
|
||||
|
||||
namespace Pinetime {
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#include "components/ble/BatteryInformationService.h"
|
||||
#include <nrf_log.h>
|
||||
#include "BatteryInformationService.h"
|
||||
#include "components/battery/BatteryController.h"
|
||||
|
||||
using namespace Pinetime::Controllers;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include "BleController.h"
|
||||
#include "components/ble/BleController.h"
|
||||
|
||||
using namespace Pinetime::Controllers;
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
#undef max
|
||||
#undef min
|
||||
#include <cstdint>
|
||||
#include "BleClient.h"
|
||||
#include "components/ble/BleClient.h"
|
||||
|
||||
namespace Pinetime {
|
||||
namespace Controllers {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include "CurrentTimeService.h"
|
||||
#include "components/ble/CurrentTimeService.h"
|
||||
#include <hal/nrf_rtc.h>
|
||||
#include <nrf_log.h>
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include "DeviceInformationService.h"
|
||||
#include "components/ble/DeviceInformationService.h"
|
||||
|
||||
using namespace Pinetime::Controllers;
|
||||
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include "DfuService.h"
|
||||
#include "components/ble/DfuService.h"
|
||||
#include <cstring>
|
||||
#include "components/ble/BleController.h"
|
||||
#include "drivers/SpiNorFlash.h"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include "HeartRateService.h"
|
||||
#include "components/ble/HeartRateService.h"
|
||||
#include "components/heartrate/HeartRateController.h"
|
||||
#include "systemtask/SystemTask.h"
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include "MotionService.h"
|
||||
#include "components/ble/MotionService.h"
|
||||
#include "components/motion//MotionController.h"
|
||||
#include "systemtask/SystemTask.h"
|
||||
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include "NotificationManager.h"
|
||||
#include "components/ble/NotificationManager.h"
|
||||
#include <cstring>
|
||||
#include <algorithm>
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include "BrightnessController.h"
|
||||
#include "components/brightness/BrightnessController.h"
|
||||
#include <hal/nrf_gpio.h>
|
||||
#include "displayapp/screens/Symbols.h"
|
||||
#include "drivers/PinMap.h"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include "DateTimeController.h"
|
||||
#include "components/datetime/DateTimeController.h"
|
||||
#include <date/date.h>
|
||||
#include <libraries/log/nrf_log.h>
|
||||
#include <systemtask/SystemTask.h>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include "FirmwareValidator.h"
|
||||
#include "components/firmwarevalidator/FirmwareValidator.h"
|
||||
|
||||
#include <hal/nrf_rtc.h>
|
||||
#include "drivers/InternalFlash.h"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include "FS.h"
|
||||
#include "components/fs/FS.h"
|
||||
#include <cstring>
|
||||
#include <littlefs/lfs.h>
|
||||
#include <lvgl/lvgl.h>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include "Gfx.h"
|
||||
#include "components/gfx/Gfx.h"
|
||||
#include "drivers/St7789.h"
|
||||
using namespace Pinetime::Components;
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
C++ port Copyright (C) 2021 Jean-François Milants
|
||||
*/
|
||||
|
||||
#include "Biquad.h"
|
||||
#include "components/heartrate/Biquad.h"
|
||||
|
||||
using namespace Pinetime::Controllers;
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include "HeartRateController.h"
|
||||
#include "components/heartrate/HeartRateController.h"
|
||||
#include <heartratetask/HeartRateTask.h>
|
||||
#include <systemtask/SystemTask.h>
|
||||
|
||||
|
|
|
@ -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 "Ppg.h"
|
||||
using namespace Pinetime::Controllers;
|
||||
|
||||
/** Original implementation from wasp-os : https://github.com/daniel-thompson/wasp-os/blob/master/wasp/ppg.py */
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
#pragma once
|
||||
|
||||
#include <array>
|
||||
#include "Biquad.h"
|
||||
#include "Ptagc.h"
|
||||
#include "components/heartrate/Biquad.h"
|
||||
#include "components/heartrate/Ptagc.h"
|
||||
|
||||
namespace Pinetime {
|
||||
namespace Controllers {
|
||||
|
|
|
@ -4,8 +4,8 @@
|
|||
C++ port Copyright (C) 2021 Jean-François Milants
|
||||
*/
|
||||
|
||||
#include "components/heartrate/Ptagc.h"
|
||||
#include <cmath>
|
||||
#include "Ptagc.h"
|
||||
|
||||
using namespace Pinetime::Controllers;
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include "MotionController.h"
|
||||
#include "components/motion/MotionController.h"
|
||||
|
||||
using namespace Pinetime::Controllers;
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include "MotorController.h"
|
||||
#include "components/motor/MotorController.h"
|
||||
#include <hal/nrf_gpio.h>
|
||||
#include "systemtask/SystemTask.h"
|
||||
#include "app_timer.h"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include "RleDecoder.h"
|
||||
#include "components/rle/RleDecoder.h"
|
||||
|
||||
using namespace Pinetime::Tools;
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include "Settings.h"
|
||||
#include "components/settings/Settings.h"
|
||||
#include <cstdlib>
|
||||
#include <cstring>
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
// Created by florian on 16.05.21.
|
||||
//
|
||||
|
||||
#include "TimerController.h"
|
||||
#include "components/timer/TimerController.h"
|
||||
#include "systemtask/SystemTask.h"
|
||||
#include "app_timer.h"
|
||||
#include "task.h"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include "Colors.h"
|
||||
#include "displayapp/Colors.h"
|
||||
|
||||
using namespace Pinetime::Applications;
|
||||
using namespace Pinetime::Controllers;
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#pragma once
|
||||
|
||||
#include <lvgl/src/lv_misc/lv_color.h>
|
||||
#include <components/settings/Settings.h>
|
||||
#include "components/settings/Settings.h"
|
||||
|
||||
namespace Pinetime {
|
||||
namespace Applications {
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
#include "DisplayApp.h"
|
||||
#include "displayapp/DisplayApp.h"
|
||||
#include <libraries/log/nrf_log.h>
|
||||
#include <displayapp/screens/HeartRate.h>
|
||||
#include <displayapp/screens/Motion.h>
|
||||
#include <displayapp/screens/Timer.h>
|
||||
#include <displayapp/screens/Alarm.h>
|
||||
#include "displayapp/screens/HeartRate.h"
|
||||
#include "displayapp/screens/Motion.h"
|
||||
#include "displayapp/screens/Timer.h"
|
||||
#include "displayapp/screens/Alarm.h"
|
||||
#include "components/battery/BatteryController.h"
|
||||
#include "components/ble/BleController.h"
|
||||
#include "components/datetime/DateTimeController.h"
|
||||
|
|
|
@ -5,9 +5,9 @@
|
|||
#include <task.h>
|
||||
#include <memory>
|
||||
#include <systemtask/Messages.h>
|
||||
#include "Apps.h"
|
||||
#include "LittleVgl.h"
|
||||
#include "TouchEvents.h"
|
||||
#include "displayapp/Apps.h"
|
||||
#include "displayapp/LittleVgl.h"
|
||||
#include "displayapp/TouchEvents.h"
|
||||
#include "components/brightness/BrightnessController.h"
|
||||
#include "components/motor/MotorController.h"
|
||||
#include "components/firmwarevalidator/FirmwareValidator.h"
|
||||
|
@ -17,7 +17,7 @@
|
|||
#include "components/alarm/AlarmController.h"
|
||||
#include "touchhandler/TouchHandler.h"
|
||||
|
||||
#include "Messages.h"
|
||||
#include "displayapp/Messages.h"
|
||||
#include "BootErrors.h"
|
||||
|
||||
namespace Pinetime {
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
#include "DisplayAppRecovery.h"
|
||||
#include "displayapp/DisplayAppRecovery.h"
|
||||
#include <FreeRTOS.h>
|
||||
#include <task.h>
|
||||
#include <libraries/log/nrf_log.h>
|
||||
#include <components/rle/RleDecoder.h>
|
||||
#include <touchhandler/TouchHandler.h>
|
||||
#include "components/rle/RleDecoder.h"
|
||||
#include "touchhandler/TouchHandler.h"
|
||||
#include "displayapp/icons/infinitime/infinitime-nb.c"
|
||||
#include "components/ble/BleController.h"
|
||||
|
||||
|
|
|
@ -11,10 +11,10 @@
|
|||
#include <drivers/Watchdog.h>
|
||||
#include <components/motor/MotorController.h>
|
||||
#include "BootErrors.h"
|
||||
#include "TouchEvents.h"
|
||||
#include "Apps.h"
|
||||
#include "Messages.h"
|
||||
#include "DummyLittleVgl.h"
|
||||
#include "displayapp/TouchEvents.h"
|
||||
#include "displayapp/Apps.h"
|
||||
#include "displayapp/Messages.h"
|
||||
#include "displayapp/DummyLittleVgl.h"
|
||||
|
||||
namespace Pinetime {
|
||||
namespace Drivers {
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
#pragma once
|
||||
|
||||
#include <libs/lvgl/src/lv_core/lv_style.h>
|
||||
#include <libs/lvgl/src/lv_themes/lv_theme.h>
|
||||
#include <libs/lvgl/src/lv_hal/lv_hal.h>
|
||||
#include <lvgl/src/lv_core/lv_style.h>
|
||||
#include <lvgl/src/lv_themes/lv_theme.h>
|
||||
#include <lvgl/src/lv_hal/lv_hal.h>
|
||||
#include <drivers/St7789.h>
|
||||
#include <drivers/Cst816s.h>
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#include "LittleVgl.h"
|
||||
#include "lv_pinetime_theme.h"
|
||||
#include "displayapp/LittleVgl.h"
|
||||
#include "displayapp/lv_pinetime_theme.h"
|
||||
|
||||
#include <FreeRTOS.h>
|
||||
#include <task.h>
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
#pragma once
|
||||
#include <cstdint>
|
||||
namespace Pinetime {
|
||||
namespace Applications {
|
||||
namespace Display {
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
/*********************
|
||||
* INCLUDES
|
||||
*********************/
|
||||
#include "lv_pinetime_theme.h"
|
||||
#include "displayapp/lv_pinetime_theme.h"
|
||||
|
||||
/*********************
|
||||
* DEFINES
|
||||
|
|
|
@ -15,9 +15,9 @@
|
|||
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 "Alarm.h"
|
||||
#include "Screen.h"
|
||||
#include "Symbols.h"
|
||||
#include "displayapp/screens/Alarm.h"
|
||||
#include "displayapp/screens/Screen.h"
|
||||
#include "displayapp/screens/Symbols.h"
|
||||
|
||||
using namespace Pinetime::Applications::Screens;
|
||||
using Pinetime::Controllers::AlarmController;
|
||||
|
|
|
@ -17,9 +17,9 @@
|
|||
*/
|
||||
#pragma once
|
||||
|
||||
#include "Screen.h"
|
||||
#include "displayapp/screens/Screen.h"
|
||||
#include "systemtask/SystemTask.h"
|
||||
#include "../LittleVgl.h"
|
||||
#include "displayapp/LittleVgl.h"
|
||||
#include "components/alarm/AlarmController.h"
|
||||
|
||||
namespace Pinetime {
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
#include "ApplicationList.h"
|
||||
#include "displayapp/screens/ApplicationList.h"
|
||||
#include <lvgl/lvgl.h>
|
||||
#include <array>
|
||||
#include "Symbols.h"
|
||||
#include "Tile.h"
|
||||
#include "displayapp/screens/Symbols.h"
|
||||
#include "displayapp/screens/Tile.h"
|
||||
#include "displayapp/Apps.h"
|
||||
#include "../DisplayApp.h"
|
||||
#include "displayapp/DisplayApp.h"
|
||||
|
||||
using namespace Pinetime::Applications::Screens;
|
||||
|
||||
|
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
#include <memory>
|
||||
|
||||
#include "Screen.h"
|
||||
#include "ScreenList.h"
|
||||
#include "displayapp/screens/Screen.h"
|
||||
#include "displayapp/screens/ScreenList.h"
|
||||
#include "components/datetime/DateTimeController.h"
|
||||
#include "components/settings/Settings.h"
|
||||
#include "components/battery/BatteryController.h"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#include "displayapp/screens/BatteryIcon.h"
|
||||
#include <cstdint>
|
||||
#include "BatteryIcon.h"
|
||||
#include "Symbols.h"
|
||||
#include "displayapp/screens/Symbols.h"
|
||||
|
||||
using namespace Pinetime::Applications::Screens;
|
||||
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
#pragma once
|
||||
#include <cstdint>
|
||||
|
||||
namespace Pinetime {
|
||||
namespace Applications {
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#include "BatteryInfo.h"
|
||||
#include "../DisplayApp.h"
|
||||
#include "displayapp/screens/BatteryInfo.h"
|
||||
#include "displayapp/DisplayApp.h"
|
||||
#include "components/battery/BatteryController.h"
|
||||
|
||||
using namespace Pinetime::Applications::Screens;
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#pragma once
|
||||
|
||||
#include <cstdint>
|
||||
#include "Screen.h"
|
||||
#include "displayapp/screens/Screen.h"
|
||||
#include <lvgl/lvgl.h>
|
||||
|
||||
namespace Pinetime {
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#include "BleIcon.h"
|
||||
#include "Symbols.h"
|
||||
#include "displayapp/screens/BleIcon.h"
|
||||
#include "displayapp/screens/Symbols.h"
|
||||
using namespace Pinetime::Applications::Screens;
|
||||
|
||||
const char* BleIcon::GetIcon(bool isConnected) {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include "Brightness.h"
|
||||
#include "displayapp/screens/Brightness.h"
|
||||
#include <lvgl/lvgl.h>
|
||||
|
||||
using namespace Pinetime::Applications::Screens;
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
#include <lvgl/src/lv_core/lv_obj.h>
|
||||
#include <cstdint>
|
||||
#include "Screen.h"
|
||||
#include "displayapp/screens/Screen.h"
|
||||
#include "components/brightness/BrightnessController.h"
|
||||
|
||||
namespace Pinetime {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include "Clock.h"
|
||||
#include "displayapp/screens/Clock.h"
|
||||
|
||||
#include <date/date.h>
|
||||
#include <lvgl/lvgl.h>
|
||||
|
@ -6,10 +6,10 @@
|
|||
#include "components/motion/MotionController.h"
|
||||
#include "components/ble/BleController.h"
|
||||
#include "components/ble/NotificationManager.h"
|
||||
#include "../DisplayApp.h"
|
||||
#include "WatchFaceDigital.h"
|
||||
#include "WatchFaceAnalog.h"
|
||||
#include "PineTimeStyle.h"
|
||||
#include "displayapp/DisplayApp.h"
|
||||
#include "displayapp/screens/WatchFaceDigital.h"
|
||||
#include "displayapp/screens/WatchFaceAnalog.h"
|
||||
#include "displayapp/screens/PineTimeStyle.h"
|
||||
|
||||
using namespace Pinetime::Applications::Screens;
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
#include <cstdint>
|
||||
#include <memory>
|
||||
#include <components/heartrate/HeartRateController.h>
|
||||
#include "Screen.h"
|
||||
#include "displayapp/screens/Screen.h"
|
||||
#include "components/datetime/DateTimeController.h"
|
||||
|
||||
namespace Pinetime {
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#include "DropDownDemo.h"
|
||||
#include "displayapp/screens/DropDownDemo.h"
|
||||
#include <lvgl/lvgl.h>
|
||||
#include <libraries/log/nrf_log.h>
|
||||
#include "../DisplayApp.h"
|
||||
#include "displayapp/DisplayApp.h"
|
||||
|
||||
using namespace Pinetime::Applications::Screens;
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#pragma once
|
||||
|
||||
#include <cstdint>
|
||||
#include "Screen.h"
|
||||
#include "displayapp/screens/Screen.h"
|
||||
#include <lvgl/src/lv_core/lv_obj.h>
|
||||
|
||||
namespace Pinetime {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include "Error.h"
|
||||
#include "displayapp/screens/Error.h"
|
||||
|
||||
using namespace Pinetime::Applications::Screens;
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#pragma once
|
||||
|
||||
#include "Screen.h"
|
||||
#include "displayapp/screens/Screen.h"
|
||||
#include "BootErrors.h"
|
||||
#include <lvgl/lvgl.h>
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#include "FirmwareUpdate.h"
|
||||
#include "displayapp/screens/FirmwareUpdate.h"
|
||||
#include <lvgl/lvgl.h>
|
||||
#include "components/ble/BleController.h"
|
||||
#include "../DisplayApp.h"
|
||||
#include "displayapp/DisplayApp.h"
|
||||
|
||||
using namespace Pinetime::Applications::Screens;
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#pragma once
|
||||
|
||||
#include "Screen.h"
|
||||
#include "displayapp/screens/Screen.h"
|
||||
#include <lvgl/src/lv_core/lv_obj.h>
|
||||
#include "FreeRTOS.h"
|
||||
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
#include "FirmwareValidation.h"
|
||||
#include "displayapp/screens/FirmwareValidation.h"
|
||||
#include <lvgl/lvgl.h>
|
||||
#include "Version.h"
|
||||
#include "components/firmwarevalidator/FirmwareValidator.h"
|
||||
#include "../DisplayApp.h"
|
||||
#include "displayapp/DisplayApp.h"
|
||||
|
||||
using namespace Pinetime::Applications::Screens;
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#pragma once
|
||||
|
||||
#include "Screen.h"
|
||||
#include "displayapp/screens/Screen.h"
|
||||
#include <lvgl/src/lv_core/lv_obj.h>
|
||||
|
||||
namespace Pinetime {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#include "FlashLight.h"
|
||||
#include "../DisplayApp.h"
|
||||
#include "Symbols.h"
|
||||
#include "displayapp/screens/FlashLight.h"
|
||||
#include "displayapp/DisplayApp.h"
|
||||
#include "displayapp/screens/Symbols.h"
|
||||
|
||||
using namespace Pinetime::Applications::Screens;
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#pragma once
|
||||
|
||||
#include "Screen.h"
|
||||
#include "displayapp/screens/Screen.h"
|
||||
#include "components/brightness/BrightnessController.h"
|
||||
#include "systemtask/SystemTask.h"
|
||||
#include <cstdint>
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
#include <libs/lvgl/lvgl.h>
|
||||
#include "HeartRate.h"
|
||||
#include "displayapp/screens/HeartRate.h"
|
||||
#include <lvgl/lvgl.h>
|
||||
#include <components/heartrate/HeartRateController.h>
|
||||
|
||||
#include "../DisplayApp.h"
|
||||
#include "displayapp/DisplayApp.h"
|
||||
|
||||
using namespace Pinetime::Applications::Screens;
|
||||
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
#include <cstdint>
|
||||
#include <chrono>
|
||||
#include "Screen.h"
|
||||
#include "displayapp/screens/Screen.h"
|
||||
#include <bits/unique_ptr.h>
|
||||
#include "systemtask/SystemTask.h"
|
||||
#include <libs/lvgl/src/lv_core/lv_style.h>
|
||||
#include <libs/lvgl/src/lv_core/lv_obj.h>
|
||||
#include <lvgl/src/lv_core/lv_style.h>
|
||||
#include <lvgl/src/lv_core/lv_obj.h>
|
||||
|
||||
namespace Pinetime {
|
||||
namespace Controllers {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#include "InfiniPaint.h"
|
||||
#include "../DisplayApp.h"
|
||||
#include "../LittleVgl.h"
|
||||
#include "displayapp/screens/InfiniPaint.h"
|
||||
#include "displayapp/DisplayApp.h"
|
||||
#include "displayapp/LittleVgl.h"
|
||||
|
||||
using namespace Pinetime::Applications::Screens;
|
||||
|
||||
|
|
|
@ -2,7 +2,8 @@
|
|||
|
||||
#include <lvgl/lvgl.h>
|
||||
#include <cstdint>
|
||||
#include "Screen.h"
|
||||
#include <algorithm> // std::fill
|
||||
#include "displayapp/screens/Screen.h"
|
||||
|
||||
namespace Pinetime {
|
||||
namespace Components {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include "Label.h"
|
||||
#include "displayapp/screens/Label.h"
|
||||
|
||||
using namespace Pinetime::Applications::Screens;
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#pragma once
|
||||
|
||||
#include "Screen.h"
|
||||
#include "displayapp/screens/Screen.h"
|
||||
#include <lvgl/lvgl.h>
|
||||
|
||||
namespace Pinetime {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#include "List.h"
|
||||
#include "../DisplayApp.h"
|
||||
#include "Symbols.h"
|
||||
#include "displayapp/screens/List.h"
|
||||
#include "displayapp/DisplayApp.h"
|
||||
#include "displayapp/screens/Symbols.h"
|
||||
|
||||
using namespace Pinetime::Applications::Screens;
|
||||
|
||||
|
|
|
@ -3,8 +3,8 @@
|
|||
#include <lvgl/lvgl.h>
|
||||
#include <cstdint>
|
||||
#include <memory>
|
||||
#include "Screen.h"
|
||||
#include "../Apps.h"
|
||||
#include "displayapp/screens/Screen.h"
|
||||
#include "displayapp/Apps.h"
|
||||
#include "components/settings/Settings.h"
|
||||
|
||||
#define MAXLISTITEMS 4
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#include "Meter.h"
|
||||
#include "displayapp/screens/Meter.h"
|
||||
#include <lvgl/lvgl.h>
|
||||
#include "../DisplayApp.h"
|
||||
#include "displayapp/DisplayApp.h"
|
||||
|
||||
using namespace Pinetime::Applications::Screens;
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#pragma once
|
||||
|
||||
#include <cstdint>
|
||||
#include "Screen.h"
|
||||
#include "displayapp/screens/Screen.h"
|
||||
#include <lvgl/src/lv_core/lv_style.h>
|
||||
#include <lvgl/src/lv_core/lv_obj.h>
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#include "Metronome.h"
|
||||
#include "Symbols.h"
|
||||
#include "displayapp/screens/Metronome.h"
|
||||
#include "displayapp/screens/Symbols.h"
|
||||
|
||||
using namespace Pinetime::Applications::Screens;
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#include <libs/lvgl/lvgl.h>
|
||||
#include "Motion.h"
|
||||
#include "../DisplayApp.h"
|
||||
#include "displayapp/screens/Motion.h"
|
||||
#include <lvgl/lvgl.h>
|
||||
#include "displayapp/DisplayApp.h"
|
||||
|
||||
using namespace Pinetime::Applications::Screens;
|
||||
|
||||
|
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
#include <cstdint>
|
||||
#include <chrono>
|
||||
#include "Screen.h"
|
||||
#include "displayapp/screens/Screen.h"
|
||||
#include <bits/unique_ptr.h>
|
||||
#include <libs/lvgl/src/lv_core/lv_style.h>
|
||||
#include <libs/lvgl/src/lv_core/lv_obj.h>
|
||||
#include <lvgl/src/lv_core/lv_style.h>
|
||||
#include <lvgl/src/lv_core/lv_obj.h>
|
||||
#include <components/motion/MotionController.h>
|
||||
|
||||
namespace Pinetime {
|
||||
|
|
|
@ -15,10 +15,10 @@
|
|||
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 "Music.h"
|
||||
#include "Symbols.h"
|
||||
#include "displayapp/screens/Music.h"
|
||||
#include "displayapp/screens/Symbols.h"
|
||||
#include <cstdint>
|
||||
#include "../DisplayApp.h"
|
||||
#include "displayapp/DisplayApp.h"
|
||||
#include "components/ble/MusicService.h"
|
||||
#include "displayapp/icons/music/disc.cpp"
|
||||
#include "displayapp/icons/music/disc_f_1.cpp"
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
#include <FreeRTOS.h>
|
||||
#include <lvgl/src/lv_core/lv_obj.h>
|
||||
#include <string>
|
||||
#include "Screen.h"
|
||||
#include "displayapp/screens/Screen.h"
|
||||
|
||||
namespace Pinetime {
|
||||
namespace Controllers {
|
||||
|
|
|
@ -15,9 +15,9 @@
|
|||
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 "Navigation.h"
|
||||
#include "displayapp/screens/Navigation.h"
|
||||
#include <cstdint>
|
||||
#include "../DisplayApp.h"
|
||||
#include "displayapp/DisplayApp.h"
|
||||
#include "components/ble/NavigationService.h"
|
||||
|
||||
using namespace Pinetime::Applications::Screens;
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
#include <FreeRTOS.h>
|
||||
#include <lvgl/src/lv_core/lv_obj.h>
|
||||
#include <string>
|
||||
#include "Screen.h"
|
||||
#include "displayapp/screens/Screen.h"
|
||||
#include <array>
|
||||
|
||||
namespace Pinetime {
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#include "NotificationIcon.h"
|
||||
#include "Symbols.h"
|
||||
#include "displayapp/screens/NotificationIcon.h"
|
||||
#include "displayapp/screens/Symbols.h"
|
||||
using namespace Pinetime::Applications::Screens;
|
||||
|
||||
const char* NotificationIcon::GetIcon(bool newNotificationAvailable) {
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
#include "Notifications.h"
|
||||
#include <displayapp/DisplayApp.h>
|
||||
#include "displayapp/screens/Notifications.h"
|
||||
#include "displayapp/DisplayApp.h"
|
||||
#include "components/ble/MusicService.h"
|
||||
#include "components/ble/AlertNotificationService.h"
|
||||
#include "Symbols.h"
|
||||
#include "displayapp/screens/Symbols.h"
|
||||
|
||||
using namespace Pinetime::Applications::Screens;
|
||||
extern lv_font_t jetbrains_mono_extrabold_compressed;
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
#include <lvgl/lvgl.h>
|
||||
#include <cstdint>
|
||||
#include <memory>
|
||||
#include "Screen.h"
|
||||
#include "displayapp/screens/Screen.h"
|
||||
#include "components/ble/NotificationManager.h"
|
||||
#include "components/motor/MotorController.h"
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#include "Paddle.h"
|
||||
#include "../DisplayApp.h"
|
||||
#include "../LittleVgl.h"
|
||||
#include "displayapp/screens/Paddle.h"
|
||||
#include "displayapp/DisplayApp.h"
|
||||
#include "displayapp/LittleVgl.h"
|
||||
|
||||
using namespace Pinetime::Applications::Screens;
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
#include <lvgl/lvgl.h>
|
||||
#include <cstdint>
|
||||
#include "Screen.h"
|
||||
#include "displayapp/screens/Screen.h"
|
||||
|
||||
namespace Pinetime {
|
||||
namespace Components {
|
||||
|
|
|
@ -19,21 +19,21 @@
|
|||
* 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 <lvgl/lvgl.h>
|
||||
#include <cstdio>
|
||||
#include <displayapp/Colors.h>
|
||||
#include "BatteryIcon.h"
|
||||
#include "BleIcon.h"
|
||||
#include "NotificationIcon.h"
|
||||
#include "Symbols.h"
|
||||
#include "displayapp/screens/BatteryIcon.h"
|
||||
#include "displayapp/screens/BleIcon.h"
|
||||
#include "displayapp/screens/NotificationIcon.h"
|
||||
#include "displayapp/screens/Symbols.h"
|
||||
#include "components/battery/BatteryController.h"
|
||||
#include "components/ble/BleController.h"
|
||||
#include "components/ble/NotificationManager.h"
|
||||
#include "components/motion/MotionController.h"
|
||||
#include "components/settings/Settings.h"
|
||||
#include "../DisplayApp.h"
|
||||
#include "displayapp/DisplayApp.h"
|
||||
|
||||
using namespace Pinetime::Applications::Screens;
|
||||
|
||||
|
|
|
@ -4,8 +4,8 @@
|
|||
#include <chrono>
|
||||
#include <cstdint>
|
||||
#include <memory>
|
||||
#include "Screen.h"
|
||||
#include "ScreenList.h"
|
||||
#include "displayapp/screens/Screen.h"
|
||||
#include "displayapp/screens/ScreenList.h"
|
||||
#include "components/datetime/DateTimeController.h"
|
||||
|
||||
namespace Pinetime {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include "Screen.h"
|
||||
#include "displayapp/screens/Screen.h"
|
||||
using namespace Pinetime::Applications::Screens;
|
||||
|
||||
void Screen::RefreshTaskCallback(lv_task_t* task) {
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#pragma once
|
||||
|
||||
#include <cstdint>
|
||||
#include "../TouchEvents.h"
|
||||
#include "displayapp/TouchEvents.h"
|
||||
#include <lvgl/lvgl.h>
|
||||
|
||||
namespace Pinetime {
|
||||
|
|
|
@ -3,8 +3,8 @@
|
|||
#include <array>
|
||||
#include <functional>
|
||||
#include <memory>
|
||||
#include "Screen.h"
|
||||
#include "../DisplayApp.h"
|
||||
#include "displayapp/screens/Screen.h"
|
||||
#include "displayapp/DisplayApp.h"
|
||||
|
||||
namespace Pinetime {
|
||||
namespace Applications {
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user