From 6c86d1d9d706706fcb6f214aba8259e61ed68755 Mon Sep 17 00:00:00 2001 From: Avamander Date: Fri, 2 Oct 2020 22:16:48 +0300 Subject: [PATCH] Fixed all the includes that were broken due to the renames --- README.md | 2 +- src/CMakeLists.txt | 116 +++++++++--------- .../BatteryController.cpp | 0 .../{Battery => battery}/BatteryController.h | 0 .../{Ble => ble}/AlertNotificationClient.cpp | 2 +- .../{Ble => ble}/AlertNotificationClient.h | 0 .../{Ble => ble}/AlertNotificationService.cpp | 2 +- .../{Ble => ble}/AlertNotificationService.h | 0 .../BatteryInformationService.cpp | 2 +- .../{Ble => ble}/BatteryInformationService.h | 0 src/components/{Ble => ble}/BleController.cpp | 0 src/components/{Ble => ble}/BleController.h | 0 .../{Ble => ble}/CurrentTimeClient.cpp | 0 .../{Ble => ble}/CurrentTimeClient.h | 3 +- .../{Ble => ble}/CurrentTimeService.cpp | 0 .../{Ble => ble}/CurrentTimeService.h | 3 +- .../{Ble => ble}/DeviceInformationService.cpp | 0 .../{Ble => ble}/DeviceInformationService.h | 0 src/components/{Ble => ble}/DfuService.cpp | 5 +- src/components/{Ble => ble}/DfuService.h | 0 .../{Ble => ble}/ImmediateAlertService.cpp | 2 +- .../{Ble => ble}/ImmediateAlertService.h | 0 src/components/{Ble => ble}/MusicService.cpp | 2 +- src/components/{Ble => ble}/MusicService.h | 0 .../{Ble => ble}/NimbleController.cpp | 6 +- .../{Ble => ble}/NimbleController.h | 1 + .../{Ble => ble}/NotificationManager.cpp | 0 .../{Ble => ble}/NotificationManager.h | 0 .../BrightnessController.cpp | 0 .../BrightnessController.h | 0 .../DateTimeController.cpp | 0 .../DateTimeController.h | 0 .../FirmwareValidator.cpp | 0 .../FirmwareValidator.h | 0 src/components/{Gfx => gfx}/Gfx.cpp | 0 src/components/{Gfx => gfx}/Gfx.h | 0 src/displayapp/DisplayApp.cpp | 31 ++--- src/displayapp/DisplayApp.h | 20 +-- src/displayapp/{Fonts => fonts}/Readme.md | 0 .../{Fonts => fonts}/jetbrains_mono_bold_20.c | 0 .../jetbrains_mono_extrabold_compressed.c | 0 .../{Icons => icons}/battery/os_battery_005.c | 0 .../battery/os_battery_005.png | Bin .../{Icons => icons}/battery/os_battery_010.c | 0 .../battery/os_battery_010.png | Bin .../{Icons => icons}/battery/os_battery_020.c | 0 .../battery/os_battery_020.png | Bin .../{Icons => icons}/battery/os_battery_030.c | 0 .../battery/os_battery_030.png | Bin .../{Icons => icons}/battery/os_battery_040.c | 0 .../battery/os_battery_040.png | Bin .../{Icons => icons}/battery/os_battery_050.c | 0 .../battery/os_battery_050.png | Bin .../{Icons => icons}/battery/os_battery_060.c | 0 .../battery/os_battery_060.png | Bin .../{Icons => icons}/battery/os_battery_070.c | 0 .../battery/os_battery_070.png | Bin .../{Icons => icons}/battery/os_battery_080.c | 0 .../battery/os_battery_080.png | Bin .../{Icons => icons}/battery/os_battery_090.c | 0 .../battery/os_battery_090.png | Bin .../{Icons => icons}/battery/os_battery_100.c | 0 .../battery/os_battery_100.png | Bin .../battery/os_battery_error.c | 0 .../battery/os_battery_error.png | Bin .../battery/os_batterycharging_005.c | 0 .../battery/os_batterycharging_005.png | Bin .../battery/os_batterycharging_010.c | 0 .../battery/os_batterycharging_010.png | Bin .../battery/os_batterycharging_020.c | 0 .../battery/os_batterycharging_020.png | Bin .../battery/os_batterycharging_030.c | 0 .../battery/os_batterycharging_030.png | Bin .../battery/os_batterycharging_040.c | 0 .../battery/os_batterycharging_040.png | Bin .../battery/os_batterycharging_050.c | 0 .../battery/os_batterycharging_050.png | Bin .../battery/os_batterycharging_060.c | 0 .../battery/os_batterycharging_060.png | Bin .../battery/os_batterycharging_070.c | 0 .../battery/os_batterycharging_070.png | Bin .../battery/os_batterycharging_080.c | 0 .../battery/os_batterycharging_080.png | Bin .../battery/os_batterycharging_090.c | 0 .../battery/os_batterycharging_090.png | Bin .../battery/os_batterycharging_100.c | 0 .../battery/os_batterycharging_100.png | Bin .../bluetooth/ck_os_bt_connected.png | Bin .../bluetooth/ck_os_bt_disconnected.png | Bin .../bluetooth/os_bt_connected.c | 0 .../bluetooth/os_bt_connected.png | Bin .../bluetooth/os_bt_disconnected.c | 0 .../bluetooth/os_bt_disconnected.png | Bin src/displayapp/screens/ApplicationList.cpp | 2 +- src/displayapp/screens/ApplicationList.h | 5 +- src/displayapp/screens/Brightness.h | 2 +- src/displayapp/screens/Clock.cpp | 3 +- src/displayapp/screens/Clock.h | 5 +- src/displayapp/screens/FirmwareUpdate.h | 3 +- src/displayapp/screens/FirmwareValidation.cpp | 2 +- src/displayapp/screens/InfiniPaint.h | 2 +- src/displayapp/screens/Music.h | 11 +- src/displayapp/screens/ScreenList.h | 2 +- src/displayapp/screens/SystemInfo.cpp | 2 +- src/displayapp/screens/SystemInfo.h | 5 +- src/displayapp/screens/Tile.cpp | 3 +- src/displayapp/screens/Tile.h | 2 +- src/main.cpp | 24 ++-- src/systemtask/SystemTask.cpp | 6 +- src/systemtask/SystemTask.h | 9 +- 110 files changed, 149 insertions(+), 136 deletions(-) rename src/components/{Battery => battery}/BatteryController.cpp (100%) rename src/components/{Battery => battery}/BatteryController.h (100%) rename src/components/{Ble => ble}/AlertNotificationClient.cpp (99%) rename src/components/{Ble => ble}/AlertNotificationClient.h (100%) rename src/components/{Ble => ble}/AlertNotificationService.cpp (98%) rename src/components/{Ble => ble}/AlertNotificationService.h (100%) rename src/components/{Ble => ble}/BatteryInformationService.cpp (97%) rename src/components/{Ble => ble}/BatteryInformationService.h (100%) rename src/components/{Ble => ble}/BleController.cpp (100%) rename src/components/{Ble => ble}/BleController.h (100%) rename src/components/{Ble => ble}/CurrentTimeClient.cpp (100%) rename src/components/{Ble => ble}/CurrentTimeClient.h (97%) rename src/components/{Ble => ble}/CurrentTimeService.cpp (100%) rename src/components/{Ble => ble}/CurrentTimeService.h (95%) rename src/components/{Ble => ble}/DeviceInformationService.cpp (100%) rename src/components/{Ble => ble}/DeviceInformationService.h (100%) rename src/components/{Ble => ble}/DfuService.cpp (99%) rename src/components/{Ble => ble}/DfuService.h (100%) rename src/components/{Ble => ble}/ImmediateAlertService.cpp (98%) rename src/components/{Ble => ble}/ImmediateAlertService.h (100%) rename src/components/{Ble => ble}/MusicService.cpp (99%) rename src/components/{Ble => ble}/MusicService.h (100%) rename src/components/{Ble => ble}/NimbleController.cpp (99%) rename src/components/{Ble => ble}/NimbleController.h (99%) rename src/components/{Ble => ble}/NotificationManager.cpp (100%) rename src/components/{Ble => ble}/NotificationManager.h (100%) rename src/components/{Brightness => brightness}/BrightnessController.cpp (100%) rename src/components/{Brightness => brightness}/BrightnessController.h (100%) rename src/components/{DateTime => datetime}/DateTimeController.cpp (100%) rename src/components/{DateTime => datetime}/DateTimeController.h (100%) rename src/components/{FirmwareValidator => firmwarevalidator}/FirmwareValidator.cpp (100%) rename src/components/{FirmwareValidator => firmwarevalidator}/FirmwareValidator.h (100%) rename src/components/{Gfx => gfx}/Gfx.cpp (100%) rename src/components/{Gfx => gfx}/Gfx.h (100%) rename src/displayapp/{Fonts => fonts}/Readme.md (100%) rename src/displayapp/{Fonts => fonts}/jetbrains_mono_bold_20.c (100%) rename src/displayapp/{Fonts => fonts}/jetbrains_mono_extrabold_compressed.c (100%) rename src/displayapp/{Icons => icons}/battery/os_battery_005.c (100%) rename src/displayapp/{Icons => icons}/battery/os_battery_005.png (100%) rename src/displayapp/{Icons => icons}/battery/os_battery_010.c (100%) rename src/displayapp/{Icons => icons}/battery/os_battery_010.png (100%) rename src/displayapp/{Icons => icons}/battery/os_battery_020.c (100%) rename src/displayapp/{Icons => icons}/battery/os_battery_020.png (100%) rename src/displayapp/{Icons => icons}/battery/os_battery_030.c (100%) rename src/displayapp/{Icons => icons}/battery/os_battery_030.png (100%) rename src/displayapp/{Icons => icons}/battery/os_battery_040.c (100%) rename src/displayapp/{Icons => icons}/battery/os_battery_040.png (100%) rename src/displayapp/{Icons => icons}/battery/os_battery_050.c (100%) rename src/displayapp/{Icons => icons}/battery/os_battery_050.png (100%) rename src/displayapp/{Icons => icons}/battery/os_battery_060.c (100%) rename src/displayapp/{Icons => icons}/battery/os_battery_060.png (100%) rename src/displayapp/{Icons => icons}/battery/os_battery_070.c (100%) rename src/displayapp/{Icons => icons}/battery/os_battery_070.png (100%) rename src/displayapp/{Icons => icons}/battery/os_battery_080.c (100%) rename src/displayapp/{Icons => icons}/battery/os_battery_080.png (100%) rename src/displayapp/{Icons => icons}/battery/os_battery_090.c (100%) rename src/displayapp/{Icons => icons}/battery/os_battery_090.png (100%) rename src/displayapp/{Icons => icons}/battery/os_battery_100.c (100%) rename src/displayapp/{Icons => icons}/battery/os_battery_100.png (100%) rename src/displayapp/{Icons => icons}/battery/os_battery_error.c (100%) rename src/displayapp/{Icons => icons}/battery/os_battery_error.png (100%) rename src/displayapp/{Icons => icons}/battery/os_batterycharging_005.c (100%) rename src/displayapp/{Icons => icons}/battery/os_batterycharging_005.png (100%) rename src/displayapp/{Icons => icons}/battery/os_batterycharging_010.c (100%) rename src/displayapp/{Icons => icons}/battery/os_batterycharging_010.png (100%) rename src/displayapp/{Icons => icons}/battery/os_batterycharging_020.c (100%) rename src/displayapp/{Icons => icons}/battery/os_batterycharging_020.png (100%) rename src/displayapp/{Icons => icons}/battery/os_batterycharging_030.c (100%) rename src/displayapp/{Icons => icons}/battery/os_batterycharging_030.png (100%) rename src/displayapp/{Icons => icons}/battery/os_batterycharging_040.c (100%) rename src/displayapp/{Icons => icons}/battery/os_batterycharging_040.png (100%) rename src/displayapp/{Icons => icons}/battery/os_batterycharging_050.c (100%) rename src/displayapp/{Icons => icons}/battery/os_batterycharging_050.png (100%) rename src/displayapp/{Icons => icons}/battery/os_batterycharging_060.c (100%) rename src/displayapp/{Icons => icons}/battery/os_batterycharging_060.png (100%) rename src/displayapp/{Icons => icons}/battery/os_batterycharging_070.c (100%) rename src/displayapp/{Icons => icons}/battery/os_batterycharging_070.png (100%) rename src/displayapp/{Icons => icons}/battery/os_batterycharging_080.c (100%) rename src/displayapp/{Icons => icons}/battery/os_batterycharging_080.png (100%) rename src/displayapp/{Icons => icons}/battery/os_batterycharging_090.c (100%) rename src/displayapp/{Icons => icons}/battery/os_batterycharging_090.png (100%) rename src/displayapp/{Icons => icons}/battery/os_batterycharging_100.c (100%) rename src/displayapp/{Icons => icons}/battery/os_batterycharging_100.png (100%) rename src/displayapp/{Icons => icons}/bluetooth/ck_os_bt_connected.png (100%) rename src/displayapp/{Icons => icons}/bluetooth/ck_os_bt_disconnected.png (100%) rename src/displayapp/{Icons => icons}/bluetooth/os_bt_connected.c (100%) rename src/displayapp/{Icons => icons}/bluetooth/os_bt_connected.png (100%) rename src/displayapp/{Icons => icons}/bluetooth/os_bt_disconnected.c (100%) rename src/displayapp/{Icons => icons}/bluetooth/os_bt_disconnected.png (100%) diff --git a/README.md b/README.md index 3a1b7b56..a3a589f7 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ As of now, here is the list of achievements of this project: ## Documentation ### Develop - - [Generate the fonts and symbols](src/DisplayApp/Fonts/Readme.md) + - [Generate the fonts and symbols](src/displayapp/fonts/Readme.md) ### Build, flash and debug - [Project branches](doc/branches.md) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9d03e904..2f38ec58 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -292,33 +292,33 @@ set(LVGL_SRC ) list(APPEND IMAGE_FILES - displayapp/Icons/battery/os_battery_error.c - displayapp/Icons/battery/os_battery_100.c - displayapp/Icons/battery/os_battery_090.c - displayapp/Icons/battery/os_battery_080.c - displayapp/Icons/battery/os_battery_070.c - displayapp/Icons/battery/os_battery_060.c - displayapp/Icons/battery/os_battery_050.c - displayapp/Icons/battery/os_battery_040.c - displayapp/Icons/battery/os_battery_030.c - displayapp/Icons/battery/os_battery_020.c - displayapp/Icons/battery/os_battery_010.c - displayapp/Icons/battery/os_battery_005.c + displayapp/icons/battery/os_battery_error.c + displayapp/icons/battery/os_battery_100.c + displayapp/icons/battery/os_battery_090.c + displayapp/icons/battery/os_battery_080.c + displayapp/icons/battery/os_battery_070.c + displayapp/icons/battery/os_battery_060.c + displayapp/icons/battery/os_battery_050.c + displayapp/icons/battery/os_battery_040.c + displayapp/icons/battery/os_battery_030.c + displayapp/icons/battery/os_battery_020.c + displayapp/icons/battery/os_battery_010.c + displayapp/icons/battery/os_battery_005.c - displayapp/Icons/battery/os_batterycharging_100.c - displayapp/Icons/battery/os_batterycharging_090.c - displayapp/Icons/battery/os_batterycharging_080.c - displayapp/Icons/battery/os_batterycharging_070.c - displayapp/Icons/battery/os_batterycharging_060.c - displayapp/Icons/battery/os_batterycharging_050.c - displayapp/Icons/battery/os_batterycharging_040.c - displayapp/Icons/battery/os_batterycharging_030.c - displayapp/Icons/battery/os_batterycharging_020.c - displayapp/Icons/battery/os_batterycharging_010.c - displayapp/Icons/battery/os_batterycharging_005.c + displayapp/icons/battery/os_batterycharging_100.c + displayapp/icons/battery/os_batterycharging_090.c + displayapp/icons/battery/os_batterycharging_080.c + displayapp/icons/battery/os_batterycharging_070.c + displayapp/icons/battery/os_batterycharging_060.c + displayapp/icons/battery/os_batterycharging_050.c + displayapp/icons/battery/os_batterycharging_040.c + displayapp/icons/battery/os_batterycharging_030.c + displayapp/icons/battery/os_batterycharging_020.c + displayapp/icons/battery/os_batterycharging_010.c + displayapp/icons/battery/os_batterycharging_005.c - displayapp/Icons/bluetooth/os_bt_connected.c - displayapp/Icons/bluetooth/os_bt_disconnected.c + displayapp/icons/bluetooth/os_bt_connected.c + displayapp/icons/bluetooth/os_bt_disconnected.c ) list(APPEND SOURCE_FILES @@ -349,30 +349,30 @@ list(APPEND SOURCE_FILES drivers/Watchdog.cpp drivers/DebugPins.cpp drivers/InternalFlash.cpp - components/Battery/BatteryController.cpp - components/Ble/BleController.cpp - components/Ble/NotificationManager.cpp - components/DateTime/DateTimeController.cpp - components/Brightness/BrightnessController.cpp - components/Ble/NimbleController.cpp - components/Ble/DeviceInformationService.cpp - components/Ble/CurrentTimeClient.cpp - components/Ble/AlertNotificationClient.cpp - components/Ble/DfuService.cpp - components/Ble/CurrentTimeService.cpp - components/Ble/AlertNotificationService.cpp - components/Ble/MusicService.cpp - components/Ble/BatteryInformationService.cpp - components/Ble/ImmediateAlertService.cpp - components/FirmwareValidator/FirmwareValidator.cpp + components/battery/BatteryController.cpp + components/ble/BleController.cpp + components/ble/NotificationManager.cpp + components/datetime/DateTimeController.cpp + components/brightness/BrightnessController.cpp + components/ble/NimbleController.cpp + components/ble/DeviceInformationService.cpp + components/ble/CurrentTimeClient.cpp + components/ble/AlertNotificationClient.cpp + components/ble/DfuService.cpp + components/ble/CurrentTimeService.cpp + components/ble/AlertNotificationService.cpp + components/ble/MusicService.cpp + components/ble/BatteryInformationService.cpp + components/ble/ImmediateAlertService.cpp + components/firmwarevalidator/FirmwareValidator.cpp drivers/Cst816s.cpp FreeRTOS/port.c FreeRTOS/port_cmsis_systick.c FreeRTOS/port_cmsis.c displayapp/LittleVgl.cpp - displayapp/Fonts/jetbrains_mono_extrabold_compressed.c - displayapp/Fonts/jetbrains_mono_bold_20.c + displayapp/fonts/jetbrains_mono_extrabold_compressed.c + displayapp/fonts/jetbrains_mono_bold_20.c systemtask/SystemTask.cpp drivers/TwiMaster.cpp @@ -389,9 +389,9 @@ list(APPEND GRAPHICS_SOURCE_FILES drivers/Spi.cpp logging/NrfLogger.cpp - components/Gfx/Gfx.cpp + components/gfx/Gfx.cpp drivers/St7789.cpp - components/Brightness/BrightnessController.cpp + components/brightness/BrightnessController.cpp graphics.cpp ) @@ -426,19 +426,19 @@ set(INCLUDE_FILES drivers/Watchdog.h drivers/DebugPins.h drivers/InternalFlash.h - components/Battery/BatteryController.h - components/Ble/BleController.h - components/Ble/NotificationManager.h - components/DateTime/DateTimeController.h - components/Brightness/BrightnessController.h - components/Ble/NimbleController.h - components/Ble/DeviceInformationService.h - components/Ble/CurrentTimeClient.h - components/Ble/AlertNotificationClient.h - components/Ble/DfuService.h - components/FirmwareValidator/FirmwareValidator.h - components/Ble/BatteryInformationService.h - components/Ble/ImmediateAlertService.h + components/battery/BatteryController.h + components/ble/BleController.h + components/ble/NotificationManager.h + components/datetime/DateTimeController.h + components/brightness/BrightnessController.h + components/ble/NimbleController.h + components/ble/DeviceInformationService.h + components/ble/CurrentTimeClient.h + components/ble/AlertNotificationClient.h + components/ble/DfuService.h + components/firmwarevalidator/FirmwareValidator.h + components/ble/BatteryInformationService.h + components/ble/ImmediateAlertService.h drivers/Cst816s.h FreeRTOS/portmacro.h FreeRTOS/portmacro_cmsis.h diff --git a/src/components/Battery/BatteryController.cpp b/src/components/battery/BatteryController.cpp similarity index 100% rename from src/components/Battery/BatteryController.cpp rename to src/components/battery/BatteryController.cpp diff --git a/src/components/Battery/BatteryController.h b/src/components/battery/BatteryController.h similarity index 100% rename from src/components/Battery/BatteryController.h rename to src/components/battery/BatteryController.h diff --git a/src/components/Ble/AlertNotificationClient.cpp b/src/components/ble/AlertNotificationClient.cpp similarity index 99% rename from src/components/Ble/AlertNotificationClient.cpp rename to src/components/ble/AlertNotificationClient.cpp index 3e4b495f..ddc72967 100644 --- a/src/components/Ble/AlertNotificationClient.cpp +++ b/src/components/ble/AlertNotificationClient.cpp @@ -1,4 +1,4 @@ -#include +#include #include "NotificationManager.h" #include "AlertNotificationClient.h" diff --git a/src/components/Ble/AlertNotificationClient.h b/src/components/ble/AlertNotificationClient.h similarity index 100% rename from src/components/Ble/AlertNotificationClient.h rename to src/components/ble/AlertNotificationClient.h diff --git a/src/components/Ble/AlertNotificationService.cpp b/src/components/ble/AlertNotificationService.cpp similarity index 98% rename from src/components/Ble/AlertNotificationService.cpp rename to src/components/ble/AlertNotificationService.cpp index ce2f7dd7..9a9b535d 100644 --- a/src/components/Ble/AlertNotificationService.cpp +++ b/src/components/ble/AlertNotificationService.cpp @@ -1,7 +1,7 @@ #include #include "NotificationManager.h" -#include +#include #include "AlertNotificationService.h" #include diff --git a/src/components/Ble/AlertNotificationService.h b/src/components/ble/AlertNotificationService.h similarity index 100% rename from src/components/Ble/AlertNotificationService.h rename to src/components/ble/AlertNotificationService.h diff --git a/src/components/Ble/BatteryInformationService.cpp b/src/components/ble/BatteryInformationService.cpp similarity index 97% rename from src/components/Ble/BatteryInformationService.cpp rename to src/components/ble/BatteryInformationService.cpp index c86830b8..f7d895c2 100644 --- a/src/components/Ble/BatteryInformationService.cpp +++ b/src/components/ble/BatteryInformationService.cpp @@ -1,5 +1,5 @@ #include "BatteryInformationService.h" -#include "../Battery/BatteryController.h" +#include "components/battery/BatteryController.h" using namespace Pinetime::Controllers; diff --git a/src/components/Ble/BatteryInformationService.h b/src/components/ble/BatteryInformationService.h similarity index 100% rename from src/components/Ble/BatteryInformationService.h rename to src/components/ble/BatteryInformationService.h diff --git a/src/components/Ble/BleController.cpp b/src/components/ble/BleController.cpp similarity index 100% rename from src/components/Ble/BleController.cpp rename to src/components/ble/BleController.cpp diff --git a/src/components/Ble/BleController.h b/src/components/ble/BleController.h similarity index 100% rename from src/components/Ble/BleController.h rename to src/components/ble/BleController.h diff --git a/src/components/Ble/CurrentTimeClient.cpp b/src/components/ble/CurrentTimeClient.cpp similarity index 100% rename from src/components/Ble/CurrentTimeClient.cpp rename to src/components/ble/CurrentTimeClient.cpp diff --git a/src/components/Ble/CurrentTimeClient.h b/src/components/ble/CurrentTimeClient.h similarity index 97% rename from src/components/Ble/CurrentTimeClient.h rename to src/components/ble/CurrentTimeClient.h index fabcdaca..639ec831 100644 --- a/src/components/Ble/CurrentTimeClient.h +++ b/src/components/ble/CurrentTimeClient.h @@ -1,7 +1,8 @@ #pragma once #include #include -#include + +#include "components/datetime/DateTimeController.h" #include namespace Pinetime { diff --git a/src/components/Ble/CurrentTimeService.cpp b/src/components/ble/CurrentTimeService.cpp similarity index 100% rename from src/components/Ble/CurrentTimeService.cpp rename to src/components/ble/CurrentTimeService.cpp diff --git a/src/components/Ble/CurrentTimeService.h b/src/components/ble/CurrentTimeService.h similarity index 95% rename from src/components/Ble/CurrentTimeService.h rename to src/components/ble/CurrentTimeService.h index 58bc5ba6..a6be9647 100644 --- a/src/components/Ble/CurrentTimeService.h +++ b/src/components/ble/CurrentTimeService.h @@ -1,7 +1,8 @@ #pragma once #include #include -#include + +#include "components/datetime/DateTimeController.h" #include namespace Pinetime { diff --git a/src/components/Ble/DeviceInformationService.cpp b/src/components/ble/DeviceInformationService.cpp similarity index 100% rename from src/components/Ble/DeviceInformationService.cpp rename to src/components/ble/DeviceInformationService.cpp diff --git a/src/components/Ble/DeviceInformationService.h b/src/components/ble/DeviceInformationService.h similarity index 100% rename from src/components/Ble/DeviceInformationService.h rename to src/components/ble/DeviceInformationService.h diff --git a/src/components/Ble/DfuService.cpp b/src/components/ble/DfuService.cpp similarity index 99% rename from src/components/Ble/DfuService.cpp rename to src/components/ble/DfuService.cpp index fcbefdd0..4dec5141 100644 --- a/src/components/Ble/DfuService.cpp +++ b/src/components/ble/DfuService.cpp @@ -1,6 +1,7 @@ -#include -#include #include + +#include "components/ble/BleController.h" +#include "systemtask/SystemTask.h" #include "DfuService.h" using namespace Pinetime::Controllers; diff --git a/src/components/Ble/DfuService.h b/src/components/ble/DfuService.h similarity index 100% rename from src/components/Ble/DfuService.h rename to src/components/ble/DfuService.h diff --git a/src/components/Ble/ImmediateAlertService.cpp b/src/components/ble/ImmediateAlertService.cpp similarity index 98% rename from src/components/Ble/ImmediateAlertService.cpp rename to src/components/ble/ImmediateAlertService.cpp index d2c4cffb..3b7f47bf 100644 --- a/src/components/Ble/ImmediateAlertService.cpp +++ b/src/components/ble/ImmediateAlertService.cpp @@ -1,5 +1,5 @@ +#include #include "ImmediateAlertService.h" -#include #include "AlertNotificationService.h" using namespace Pinetime::Controllers; diff --git a/src/components/Ble/ImmediateAlertService.h b/src/components/ble/ImmediateAlertService.h similarity index 100% rename from src/components/Ble/ImmediateAlertService.h rename to src/components/ble/ImmediateAlertService.h diff --git a/src/components/Ble/MusicService.cpp b/src/components/ble/MusicService.cpp similarity index 99% rename from src/components/Ble/MusicService.cpp rename to src/components/ble/MusicService.cpp index b5fa5356..9105a8e6 100644 --- a/src/components/Ble/MusicService.cpp +++ b/src/components/ble/MusicService.cpp @@ -1,4 +1,4 @@ -#include +#include #include "MusicService.h" int MSCallback(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_access_ctxt *ctxt, void *arg) { diff --git a/src/components/Ble/MusicService.h b/src/components/ble/MusicService.h similarity index 100% rename from src/components/Ble/MusicService.h rename to src/components/ble/MusicService.h diff --git a/src/components/Ble/NimbleController.cpp b/src/components/ble/NimbleController.cpp similarity index 99% rename from src/components/Ble/NimbleController.cpp rename to src/components/ble/NimbleController.cpp index b13f9ce3..022cc510 100644 --- a/src/components/Ble/NimbleController.cpp +++ b/src/components/ble/NimbleController.cpp @@ -1,8 +1,8 @@ -#include +#include "components/datetime/DateTimeController.h" -#include -#include +#include +#include "components/ble/NotificationManager.h" #include #include "NimbleController.h" diff --git a/src/components/Ble/NimbleController.h b/src/components/ble/NimbleController.h similarity index 99% rename from src/components/Ble/NimbleController.h rename to src/components/ble/NimbleController.h index 89fa4250..9d20caff 100644 --- a/src/components/Ble/NimbleController.h +++ b/src/components/ble/NimbleController.h @@ -1,6 +1,7 @@ #pragma once #include + #include "AlertNotificationService.h" #include "AlertNotificationClient.h" #include "DeviceInformationService.h" diff --git a/src/components/Ble/NotificationManager.cpp b/src/components/ble/NotificationManager.cpp similarity index 100% rename from src/components/Ble/NotificationManager.cpp rename to src/components/ble/NotificationManager.cpp diff --git a/src/components/Ble/NotificationManager.h b/src/components/ble/NotificationManager.h similarity index 100% rename from src/components/Ble/NotificationManager.h rename to src/components/ble/NotificationManager.h diff --git a/src/components/Brightness/BrightnessController.cpp b/src/components/brightness/BrightnessController.cpp similarity index 100% rename from src/components/Brightness/BrightnessController.cpp rename to src/components/brightness/BrightnessController.cpp diff --git a/src/components/Brightness/BrightnessController.h b/src/components/brightness/BrightnessController.h similarity index 100% rename from src/components/Brightness/BrightnessController.h rename to src/components/brightness/BrightnessController.h diff --git a/src/components/DateTime/DateTimeController.cpp b/src/components/datetime/DateTimeController.cpp similarity index 100% rename from src/components/DateTime/DateTimeController.cpp rename to src/components/datetime/DateTimeController.cpp diff --git a/src/components/DateTime/DateTimeController.h b/src/components/datetime/DateTimeController.h similarity index 100% rename from src/components/DateTime/DateTimeController.h rename to src/components/datetime/DateTimeController.h diff --git a/src/components/FirmwareValidator/FirmwareValidator.cpp b/src/components/firmwarevalidator/FirmwareValidator.cpp similarity index 100% rename from src/components/FirmwareValidator/FirmwareValidator.cpp rename to src/components/firmwarevalidator/FirmwareValidator.cpp diff --git a/src/components/FirmwareValidator/FirmwareValidator.h b/src/components/firmwarevalidator/FirmwareValidator.h similarity index 100% rename from src/components/FirmwareValidator/FirmwareValidator.h rename to src/components/firmwarevalidator/FirmwareValidator.h diff --git a/src/components/Gfx/Gfx.cpp b/src/components/gfx/Gfx.cpp similarity index 100% rename from src/components/Gfx/Gfx.cpp rename to src/components/gfx/Gfx.cpp diff --git a/src/components/Gfx/Gfx.h b/src/components/gfx/Gfx.h similarity index 100% rename from src/components/Gfx/Gfx.h rename to src/components/gfx/Gfx.h diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp index 46e81f1d..d65e4f92 100644 --- a/src/displayapp/DisplayApp.cpp +++ b/src/displayapp/DisplayApp.cpp @@ -1,24 +1,25 @@ +#include + #include "DisplayApp.h" #include #include #include #include #include -#include +#include "components/datetime/DateTimeController.h" #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "../SystemTask/SystemTask.h" +#include "displayapp/screens/Tile.h" +#include "displayapp/screens/Meter.h" +#include "displayapp/screens/Gauge.h" +#include "displayapp/screens/Brightness.h" +#include "displayapp/screens/SystemInfo.h" +#include "displayapp/screens/Music.h" +#include "components/ble/NotificationManager.h" +#include "displayapp/screens/FirmwareUpdate.h" +#include "displayapp/screens/ApplicationList.h" +#include "displayapp/screens/FirmwareValidation.h" +#include "displayapp/screens/InfiniPaint.h" +#include "systemtask/SystemTask.h" using namespace Pinetime::Applications; @@ -148,7 +149,7 @@ void DisplayApp::Refresh() { } } -// lvgl.SetFullRefresh(Components::LittleVgl::FullRefreshDirections::Down); +// lvgl.SetFullRefresh(components::LittleVgl::FullRefreshDirections::Down); // currentScreen.reset(nullptr); // if(toggle) { // currentScreen.reset(new Screens::Tile(this)); diff --git a/src/displayapp/DisplayApp.h b/src/displayapp/DisplayApp.h index 345e06d4..2a0efde3 100644 --- a/src/displayapp/DisplayApp.h +++ b/src/displayapp/DisplayApp.h @@ -3,21 +3,21 @@ #include #include #include -#include #include #include -#include -#include -#include -#include -#include "../drivers/Cst816s.h" +#include "components/gfx/Gfx.h" +#include "components/battery/BatteryController.h" +#include "components/brightness/BrightnessController.h" +#include "components/ble/BleController.h" +#include "components/datetime/DateTimeController.h" +#include "components/ble/NotificationManager.h" +#include "components/firmwarevalidator/FirmwareValidator.h" +#include "drivers/Cst816s.h" #include "LittleVgl.h" #include -#include +#include "displayapp/screens/Clock.h" +#include "displayapp/screens/Modal.h" #include -#include -#include -#include #include "TouchEvents.h" #include "Apps.h" diff --git a/src/displayapp/Fonts/Readme.md b/src/displayapp/fonts/Readme.md similarity index 100% rename from src/displayapp/Fonts/Readme.md rename to src/displayapp/fonts/Readme.md diff --git a/src/displayapp/Fonts/jetbrains_mono_bold_20.c b/src/displayapp/fonts/jetbrains_mono_bold_20.c similarity index 100% rename from src/displayapp/Fonts/jetbrains_mono_bold_20.c rename to src/displayapp/fonts/jetbrains_mono_bold_20.c diff --git a/src/displayapp/Fonts/jetbrains_mono_extrabold_compressed.c b/src/displayapp/fonts/jetbrains_mono_extrabold_compressed.c similarity index 100% rename from src/displayapp/Fonts/jetbrains_mono_extrabold_compressed.c rename to src/displayapp/fonts/jetbrains_mono_extrabold_compressed.c diff --git a/src/displayapp/Icons/battery/os_battery_005.c b/src/displayapp/icons/battery/os_battery_005.c similarity index 100% rename from src/displayapp/Icons/battery/os_battery_005.c rename to src/displayapp/icons/battery/os_battery_005.c diff --git a/src/displayapp/Icons/battery/os_battery_005.png b/src/displayapp/icons/battery/os_battery_005.png similarity index 100% rename from src/displayapp/Icons/battery/os_battery_005.png rename to src/displayapp/icons/battery/os_battery_005.png diff --git a/src/displayapp/Icons/battery/os_battery_010.c b/src/displayapp/icons/battery/os_battery_010.c similarity index 100% rename from src/displayapp/Icons/battery/os_battery_010.c rename to src/displayapp/icons/battery/os_battery_010.c diff --git a/src/displayapp/Icons/battery/os_battery_010.png b/src/displayapp/icons/battery/os_battery_010.png similarity index 100% rename from src/displayapp/Icons/battery/os_battery_010.png rename to src/displayapp/icons/battery/os_battery_010.png diff --git a/src/displayapp/Icons/battery/os_battery_020.c b/src/displayapp/icons/battery/os_battery_020.c similarity index 100% rename from src/displayapp/Icons/battery/os_battery_020.c rename to src/displayapp/icons/battery/os_battery_020.c diff --git a/src/displayapp/Icons/battery/os_battery_020.png b/src/displayapp/icons/battery/os_battery_020.png similarity index 100% rename from src/displayapp/Icons/battery/os_battery_020.png rename to src/displayapp/icons/battery/os_battery_020.png diff --git a/src/displayapp/Icons/battery/os_battery_030.c b/src/displayapp/icons/battery/os_battery_030.c similarity index 100% rename from src/displayapp/Icons/battery/os_battery_030.c rename to src/displayapp/icons/battery/os_battery_030.c diff --git a/src/displayapp/Icons/battery/os_battery_030.png b/src/displayapp/icons/battery/os_battery_030.png similarity index 100% rename from src/displayapp/Icons/battery/os_battery_030.png rename to src/displayapp/icons/battery/os_battery_030.png diff --git a/src/displayapp/Icons/battery/os_battery_040.c b/src/displayapp/icons/battery/os_battery_040.c similarity index 100% rename from src/displayapp/Icons/battery/os_battery_040.c rename to src/displayapp/icons/battery/os_battery_040.c diff --git a/src/displayapp/Icons/battery/os_battery_040.png b/src/displayapp/icons/battery/os_battery_040.png similarity index 100% rename from src/displayapp/Icons/battery/os_battery_040.png rename to src/displayapp/icons/battery/os_battery_040.png diff --git a/src/displayapp/Icons/battery/os_battery_050.c b/src/displayapp/icons/battery/os_battery_050.c similarity index 100% rename from src/displayapp/Icons/battery/os_battery_050.c rename to src/displayapp/icons/battery/os_battery_050.c diff --git a/src/displayapp/Icons/battery/os_battery_050.png b/src/displayapp/icons/battery/os_battery_050.png similarity index 100% rename from src/displayapp/Icons/battery/os_battery_050.png rename to src/displayapp/icons/battery/os_battery_050.png diff --git a/src/displayapp/Icons/battery/os_battery_060.c b/src/displayapp/icons/battery/os_battery_060.c similarity index 100% rename from src/displayapp/Icons/battery/os_battery_060.c rename to src/displayapp/icons/battery/os_battery_060.c diff --git a/src/displayapp/Icons/battery/os_battery_060.png b/src/displayapp/icons/battery/os_battery_060.png similarity index 100% rename from src/displayapp/Icons/battery/os_battery_060.png rename to src/displayapp/icons/battery/os_battery_060.png diff --git a/src/displayapp/Icons/battery/os_battery_070.c b/src/displayapp/icons/battery/os_battery_070.c similarity index 100% rename from src/displayapp/Icons/battery/os_battery_070.c rename to src/displayapp/icons/battery/os_battery_070.c diff --git a/src/displayapp/Icons/battery/os_battery_070.png b/src/displayapp/icons/battery/os_battery_070.png similarity index 100% rename from src/displayapp/Icons/battery/os_battery_070.png rename to src/displayapp/icons/battery/os_battery_070.png diff --git a/src/displayapp/Icons/battery/os_battery_080.c b/src/displayapp/icons/battery/os_battery_080.c similarity index 100% rename from src/displayapp/Icons/battery/os_battery_080.c rename to src/displayapp/icons/battery/os_battery_080.c diff --git a/src/displayapp/Icons/battery/os_battery_080.png b/src/displayapp/icons/battery/os_battery_080.png similarity index 100% rename from src/displayapp/Icons/battery/os_battery_080.png rename to src/displayapp/icons/battery/os_battery_080.png diff --git a/src/displayapp/Icons/battery/os_battery_090.c b/src/displayapp/icons/battery/os_battery_090.c similarity index 100% rename from src/displayapp/Icons/battery/os_battery_090.c rename to src/displayapp/icons/battery/os_battery_090.c diff --git a/src/displayapp/Icons/battery/os_battery_090.png b/src/displayapp/icons/battery/os_battery_090.png similarity index 100% rename from src/displayapp/Icons/battery/os_battery_090.png rename to src/displayapp/icons/battery/os_battery_090.png diff --git a/src/displayapp/Icons/battery/os_battery_100.c b/src/displayapp/icons/battery/os_battery_100.c similarity index 100% rename from src/displayapp/Icons/battery/os_battery_100.c rename to src/displayapp/icons/battery/os_battery_100.c diff --git a/src/displayapp/Icons/battery/os_battery_100.png b/src/displayapp/icons/battery/os_battery_100.png similarity index 100% rename from src/displayapp/Icons/battery/os_battery_100.png rename to src/displayapp/icons/battery/os_battery_100.png diff --git a/src/displayapp/Icons/battery/os_battery_error.c b/src/displayapp/icons/battery/os_battery_error.c similarity index 100% rename from src/displayapp/Icons/battery/os_battery_error.c rename to src/displayapp/icons/battery/os_battery_error.c diff --git a/src/displayapp/Icons/battery/os_battery_error.png b/src/displayapp/icons/battery/os_battery_error.png similarity index 100% rename from src/displayapp/Icons/battery/os_battery_error.png rename to src/displayapp/icons/battery/os_battery_error.png diff --git a/src/displayapp/Icons/battery/os_batterycharging_005.c b/src/displayapp/icons/battery/os_batterycharging_005.c similarity index 100% rename from src/displayapp/Icons/battery/os_batterycharging_005.c rename to src/displayapp/icons/battery/os_batterycharging_005.c diff --git a/src/displayapp/Icons/battery/os_batterycharging_005.png b/src/displayapp/icons/battery/os_batterycharging_005.png similarity index 100% rename from src/displayapp/Icons/battery/os_batterycharging_005.png rename to src/displayapp/icons/battery/os_batterycharging_005.png diff --git a/src/displayapp/Icons/battery/os_batterycharging_010.c b/src/displayapp/icons/battery/os_batterycharging_010.c similarity index 100% rename from src/displayapp/Icons/battery/os_batterycharging_010.c rename to src/displayapp/icons/battery/os_batterycharging_010.c diff --git a/src/displayapp/Icons/battery/os_batterycharging_010.png b/src/displayapp/icons/battery/os_batterycharging_010.png similarity index 100% rename from src/displayapp/Icons/battery/os_batterycharging_010.png rename to src/displayapp/icons/battery/os_batterycharging_010.png diff --git a/src/displayapp/Icons/battery/os_batterycharging_020.c b/src/displayapp/icons/battery/os_batterycharging_020.c similarity index 100% rename from src/displayapp/Icons/battery/os_batterycharging_020.c rename to src/displayapp/icons/battery/os_batterycharging_020.c diff --git a/src/displayapp/Icons/battery/os_batterycharging_020.png b/src/displayapp/icons/battery/os_batterycharging_020.png similarity index 100% rename from src/displayapp/Icons/battery/os_batterycharging_020.png rename to src/displayapp/icons/battery/os_batterycharging_020.png diff --git a/src/displayapp/Icons/battery/os_batterycharging_030.c b/src/displayapp/icons/battery/os_batterycharging_030.c similarity index 100% rename from src/displayapp/Icons/battery/os_batterycharging_030.c rename to src/displayapp/icons/battery/os_batterycharging_030.c diff --git a/src/displayapp/Icons/battery/os_batterycharging_030.png b/src/displayapp/icons/battery/os_batterycharging_030.png similarity index 100% rename from src/displayapp/Icons/battery/os_batterycharging_030.png rename to src/displayapp/icons/battery/os_batterycharging_030.png diff --git a/src/displayapp/Icons/battery/os_batterycharging_040.c b/src/displayapp/icons/battery/os_batterycharging_040.c similarity index 100% rename from src/displayapp/Icons/battery/os_batterycharging_040.c rename to src/displayapp/icons/battery/os_batterycharging_040.c diff --git a/src/displayapp/Icons/battery/os_batterycharging_040.png b/src/displayapp/icons/battery/os_batterycharging_040.png similarity index 100% rename from src/displayapp/Icons/battery/os_batterycharging_040.png rename to src/displayapp/icons/battery/os_batterycharging_040.png diff --git a/src/displayapp/Icons/battery/os_batterycharging_050.c b/src/displayapp/icons/battery/os_batterycharging_050.c similarity index 100% rename from src/displayapp/Icons/battery/os_batterycharging_050.c rename to src/displayapp/icons/battery/os_batterycharging_050.c diff --git a/src/displayapp/Icons/battery/os_batterycharging_050.png b/src/displayapp/icons/battery/os_batterycharging_050.png similarity index 100% rename from src/displayapp/Icons/battery/os_batterycharging_050.png rename to src/displayapp/icons/battery/os_batterycharging_050.png diff --git a/src/displayapp/Icons/battery/os_batterycharging_060.c b/src/displayapp/icons/battery/os_batterycharging_060.c similarity index 100% rename from src/displayapp/Icons/battery/os_batterycharging_060.c rename to src/displayapp/icons/battery/os_batterycharging_060.c diff --git a/src/displayapp/Icons/battery/os_batterycharging_060.png b/src/displayapp/icons/battery/os_batterycharging_060.png similarity index 100% rename from src/displayapp/Icons/battery/os_batterycharging_060.png rename to src/displayapp/icons/battery/os_batterycharging_060.png diff --git a/src/displayapp/Icons/battery/os_batterycharging_070.c b/src/displayapp/icons/battery/os_batterycharging_070.c similarity index 100% rename from src/displayapp/Icons/battery/os_batterycharging_070.c rename to src/displayapp/icons/battery/os_batterycharging_070.c diff --git a/src/displayapp/Icons/battery/os_batterycharging_070.png b/src/displayapp/icons/battery/os_batterycharging_070.png similarity index 100% rename from src/displayapp/Icons/battery/os_batterycharging_070.png rename to src/displayapp/icons/battery/os_batterycharging_070.png diff --git a/src/displayapp/Icons/battery/os_batterycharging_080.c b/src/displayapp/icons/battery/os_batterycharging_080.c similarity index 100% rename from src/displayapp/Icons/battery/os_batterycharging_080.c rename to src/displayapp/icons/battery/os_batterycharging_080.c diff --git a/src/displayapp/Icons/battery/os_batterycharging_080.png b/src/displayapp/icons/battery/os_batterycharging_080.png similarity index 100% rename from src/displayapp/Icons/battery/os_batterycharging_080.png rename to src/displayapp/icons/battery/os_batterycharging_080.png diff --git a/src/displayapp/Icons/battery/os_batterycharging_090.c b/src/displayapp/icons/battery/os_batterycharging_090.c similarity index 100% rename from src/displayapp/Icons/battery/os_batterycharging_090.c rename to src/displayapp/icons/battery/os_batterycharging_090.c diff --git a/src/displayapp/Icons/battery/os_batterycharging_090.png b/src/displayapp/icons/battery/os_batterycharging_090.png similarity index 100% rename from src/displayapp/Icons/battery/os_batterycharging_090.png rename to src/displayapp/icons/battery/os_batterycharging_090.png diff --git a/src/displayapp/Icons/battery/os_batterycharging_100.c b/src/displayapp/icons/battery/os_batterycharging_100.c similarity index 100% rename from src/displayapp/Icons/battery/os_batterycharging_100.c rename to src/displayapp/icons/battery/os_batterycharging_100.c diff --git a/src/displayapp/Icons/battery/os_batterycharging_100.png b/src/displayapp/icons/battery/os_batterycharging_100.png similarity index 100% rename from src/displayapp/Icons/battery/os_batterycharging_100.png rename to src/displayapp/icons/battery/os_batterycharging_100.png diff --git a/src/displayapp/Icons/bluetooth/ck_os_bt_connected.png b/src/displayapp/icons/bluetooth/ck_os_bt_connected.png similarity index 100% rename from src/displayapp/Icons/bluetooth/ck_os_bt_connected.png rename to src/displayapp/icons/bluetooth/ck_os_bt_connected.png diff --git a/src/displayapp/Icons/bluetooth/ck_os_bt_disconnected.png b/src/displayapp/icons/bluetooth/ck_os_bt_disconnected.png similarity index 100% rename from src/displayapp/Icons/bluetooth/ck_os_bt_disconnected.png rename to src/displayapp/icons/bluetooth/ck_os_bt_disconnected.png diff --git a/src/displayapp/Icons/bluetooth/os_bt_connected.c b/src/displayapp/icons/bluetooth/os_bt_connected.c similarity index 100% rename from src/displayapp/Icons/bluetooth/os_bt_connected.c rename to src/displayapp/icons/bluetooth/os_bt_connected.c diff --git a/src/displayapp/Icons/bluetooth/os_bt_connected.png b/src/displayapp/icons/bluetooth/os_bt_connected.png similarity index 100% rename from src/displayapp/Icons/bluetooth/os_bt_connected.png rename to src/displayapp/icons/bluetooth/os_bt_connected.png diff --git a/src/displayapp/Icons/bluetooth/os_bt_disconnected.c b/src/displayapp/icons/bluetooth/os_bt_disconnected.c similarity index 100% rename from src/displayapp/Icons/bluetooth/os_bt_disconnected.c rename to src/displayapp/icons/bluetooth/os_bt_disconnected.c diff --git a/src/displayapp/Icons/bluetooth/os_bt_disconnected.png b/src/displayapp/icons/bluetooth/os_bt_disconnected.png similarity index 100% rename from src/displayapp/Icons/bluetooth/os_bt_disconnected.png rename to src/displayapp/icons/bluetooth/os_bt_disconnected.png diff --git a/src/displayapp/screens/ApplicationList.cpp b/src/displayapp/screens/ApplicationList.cpp index eb85be4f..71ba91c4 100644 --- a/src/displayapp/screens/ApplicationList.cpp +++ b/src/displayapp/screens/ApplicationList.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include "ApplicationList.h" #include "Tile.h" diff --git a/src/displayapp/screens/ApplicationList.h b/src/displayapp/screens/ApplicationList.h index a1e6811b..9c95acb8 100644 --- a/src/displayapp/screens/ApplicationList.h +++ b/src/displayapp/screens/ApplicationList.h @@ -1,13 +1,14 @@ #pragma once +#include #include -#include + +#include "components/ble/NimbleController.h" #include "Screen.h" #include "Label.h" #include "ScreenList.h" #include "Gauge.h" #include "Meter.h" -#include namespace Pinetime { namespace Applications { diff --git a/src/displayapp/screens/Brightness.h b/src/displayapp/screens/Brightness.h index 37cbcd7e..7d599acf 100644 --- a/src/displayapp/screens/Brightness.h +++ b/src/displayapp/screens/Brightness.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include "components/brightness/BrightnessController.h" #include "Screen.h" namespace Pinetime { diff --git a/src/displayapp/screens/Clock.cpp b/src/displayapp/screens/Clock.cpp index 06fab9aa..243d4c04 100644 --- a/src/displayapp/screens/Clock.cpp +++ b/src/displayapp/screens/Clock.cpp @@ -1,6 +1,7 @@ #include + #include -#include +#include "components/datetime/DateTimeController.h" #include #include "Clock.h" #include "../DisplayApp.h" diff --git a/src/displayapp/screens/Clock.h b/src/displayapp/screens/Clock.h index 7363fdaf..5753f6a3 100644 --- a/src/displayapp/screens/Clock.h +++ b/src/displayapp/screens/Clock.h @@ -2,12 +2,13 @@ #include #include + #include "Screen.h" #include #include #include -#include -#include +#include "components/battery/BatteryController.h" +#include "components/ble/BleController.h" namespace Pinetime { namespace Applications { diff --git a/src/displayapp/screens/FirmwareUpdate.h b/src/displayapp/screens/FirmwareUpdate.h index faaf3953..893fe68c 100644 --- a/src/displayapp/screens/FirmwareUpdate.h +++ b/src/displayapp/screens/FirmwareUpdate.h @@ -2,11 +2,12 @@ #include #include + #include "Screen.h" #include #include #include -#include +#include "components/ble/BleController.h" namespace Pinetime { namespace Applications { diff --git a/src/displayapp/screens/FirmwareValidation.cpp b/src/displayapp/screens/FirmwareValidation.cpp index fb2dd956..2300b41d 100644 --- a/src/displayapp/screens/FirmwareValidation.cpp +++ b/src/displayapp/screens/FirmwareValidation.cpp @@ -2,7 +2,7 @@ #include "FirmwareValidation.h" #include "../DisplayApp.h" #include "../../Version.h" -#include "../../Components/FirmwareValidator/FirmwareValidator.h" +#include "components/firmwarevalidator/FirmwareValidator.h" using namespace Pinetime::Applications::Screens; extern lv_font_t jetbrains_mono_extrabold_compressed; diff --git a/src/displayapp/screens/InfiniPaint.h b/src/displayapp/screens/InfiniPaint.h index a1592f97..fb4f979b 100644 --- a/src/displayapp/screens/InfiniPaint.h +++ b/src/displayapp/screens/InfiniPaint.h @@ -6,7 +6,7 @@ #include #include #include -#include +#include "displayapp/LittleVgl.h" namespace Pinetime { namespace Applications { diff --git a/src/displayapp/screens/Music.h b/src/displayapp/screens/Music.h index 95cac0f0..d43d31cc 100644 --- a/src/displayapp/screens/Music.h +++ b/src/displayapp/screens/Music.h @@ -2,16 +2,17 @@ #include #include -#include +#include + +#include "components/gfx/Gfx.h" +#include "components/battery/BatteryController.h" +#include "components/ble/BleController.h" +#include "components/ble/MusicService.h" #include "Screen.h" #include #include #include -#include -#include #include "../../Version.h" -#include -#include namespace Pinetime { namespace Applications { diff --git a/src/displayapp/screens/ScreenList.h b/src/displayapp/screens/ScreenList.h index d873336d..b198634f 100644 --- a/src/displayapp/screens/ScreenList.h +++ b/src/displayapp/screens/ScreenList.h @@ -1,8 +1,8 @@ #pragma once #include -#include #include +#include "components/ble/NimbleController.h" #include "Screen.h" #include "Label.h" diff --git a/src/displayapp/screens/SystemInfo.cpp b/src/displayapp/screens/SystemInfo.cpp index fcafcf7d..8a3b8dbb 100644 --- a/src/displayapp/screens/SystemInfo.cpp +++ b/src/displayapp/screens/SystemInfo.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include "SystemInfo.h" #include "../../Version.h" diff --git a/src/displayapp/screens/SystemInfo.h b/src/displayapp/screens/SystemInfo.h index ac8abae5..987a584b 100644 --- a/src/displayapp/screens/SystemInfo.h +++ b/src/displayapp/screens/SystemInfo.h @@ -1,13 +1,14 @@ #pragma once +#include #include -#include + +#include "components/ble/NimbleController.h" #include "Screen.h" #include "Label.h" #include "ScreenList.h" #include "Gauge.h" #include "Meter.h" -#include namespace Pinetime { namespace Applications { diff --git a/src/displayapp/screens/Tile.cpp b/src/displayapp/screens/Tile.cpp index 1447d789..deb88472 100644 --- a/src/displayapp/screens/Tile.cpp +++ b/src/displayapp/screens/Tile.cpp @@ -1,8 +1,9 @@ #include #include #include + #include "Tile.h" -#include +#include "displayapp/DisplayApp.h" #include "Symbols.h" #include "../../Version.h" diff --git a/src/displayapp/screens/Tile.h b/src/displayapp/screens/Tile.h index 3136d892..cf5fcf15 100644 --- a/src/displayapp/screens/Tile.h +++ b/src/displayapp/screens/Tile.h @@ -5,7 +5,7 @@ #include #include "Modal.h" #include -#include +#include namespace Pinetime { namespace Applications { diff --git a/src/main.cpp b/src/main.cpp index fe413585..e3243362 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,29 +1,29 @@ #include #include +#include #include +#include +#include +#include #include #include -#include +#include "displayapp/DisplayApp.h" #include -#include -#include -#include -#include "Components/Battery/BatteryController.h" -#include "Components/Ble/BleController.h" +#include "components/datetime/DateTimeController.h" +#include "components/battery/BatteryController.h" +#include "components/ble/BleController.h" +#include "components/ble/NotificationManager.h" #include #include #include -#include -#include -#include +#include "displayapp/LittleVgl.h" +#include #include #include #include #include #include -#include #include -#include #include #include @@ -32,7 +32,7 @@ #include "Logging/NrfLogger.h" Pinetime::Logging::NrfLogger logger; #else -#include "Logging/DummyLogger.h" +#include "logging/DummyLogger.h" Pinetime::Logging::DummyLogger logger; #endif diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp index 24f688e2..68f8ab53 100644 --- a/src/systemtask/SystemTask.cpp +++ b/src/systemtask/SystemTask.cpp @@ -1,9 +1,9 @@ #include #include #include -#include +#include "displayapp/LittleVgl.h" #include -#include +#include "components/ble/NotificationManager.h" #include #include #include "SystemTask.h" @@ -12,7 +12,7 @@ #include #include #include "../main.h" -#include "Components/Ble/NimbleController.h" +#include "components/ble/NimbleController.h" using namespace Pinetime::System; diff --git a/src/systemtask/SystemTask.h b/src/systemtask/SystemTask.h index 40277cf3..1be28e3f 100644 --- a/src/systemtask/SystemTask.h +++ b/src/systemtask/SystemTask.h @@ -1,16 +1,17 @@ #pragma once +#include + #include #include -#include #include #include -#include -#include +#include "components/battery/BatteryController.h" +#include "displayapp/DisplayApp.h" #include #include #include "SystemMonitor.h" -#include "Components/Ble/NimbleController.h" +#include "components/ble/NimbleController.h" #include "timers.h" namespace Pinetime {