Fixed all the includes that were broken due to the renames

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)

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_error.c
-        displayapp/Icons/battery/os_battery_100.c
+        displayapp/icons/battery/os_battery_100.c
-        displayapp/Icons/battery/os_battery_090.c
+        displayapp/icons/battery/os_battery_090.c
-        displayapp/Icons/battery/os_battery_080.c
+        displayapp/icons/battery/os_battery_080.c
-        displayapp/Icons/battery/os_battery_070.c
+        displayapp/icons/battery/os_battery_070.c
-        displayapp/Icons/battery/os_battery_060.c
+        displayapp/icons/battery/os_battery_060.c
-        displayapp/Icons/battery/os_battery_050.c
+        displayapp/icons/battery/os_battery_050.c
-        displayapp/Icons/battery/os_battery_040.c
+        displayapp/icons/battery/os_battery_040.c
-        displayapp/Icons/battery/os_battery_030.c
+        displayapp/icons/battery/os_battery_030.c
-        displayapp/Icons/battery/os_battery_020.c
+        displayapp/icons/battery/os_battery_020.c
-        displayapp/Icons/battery/os_battery_010.c
+        displayapp/icons/battery/os_battery_010.c
-        displayapp/Icons/battery/os_battery_005.c
+        displayapp/icons/battery/os_battery_005.c
 
-        displayapp/Icons/battery/os_batterycharging_100.c
+        displayapp/icons/battery/os_batterycharging_100.c
-        displayapp/Icons/battery/os_batterycharging_090.c
+        displayapp/icons/battery/os_batterycharging_090.c
-        displayapp/Icons/battery/os_batterycharging_080.c
+        displayapp/icons/battery/os_batterycharging_080.c
-        displayapp/Icons/battery/os_batterycharging_070.c
+        displayapp/icons/battery/os_batterycharging_070.c
-        displayapp/Icons/battery/os_batterycharging_060.c
+        displayapp/icons/battery/os_batterycharging_060.c
-        displayapp/Icons/battery/os_batterycharging_050.c
+        displayapp/icons/battery/os_batterycharging_050.c
-        displayapp/Icons/battery/os_batterycharging_040.c
+        displayapp/icons/battery/os_batterycharging_040.c
-        displayapp/Icons/battery/os_batterycharging_030.c
+        displayapp/icons/battery/os_batterycharging_030.c
-        displayapp/Icons/battery/os_batterycharging_020.c
+        displayapp/icons/battery/os_batterycharging_020.c
-        displayapp/Icons/battery/os_batterycharging_010.c
+        displayapp/icons/battery/os_batterycharging_010.c
-        displayapp/Icons/battery/os_batterycharging_005.c
+        displayapp/icons/battery/os_batterycharging_005.c
 
-        displayapp/Icons/bluetooth/os_bt_connected.c
+        displayapp/icons/bluetooth/os_bt_connected.c
-        displayapp/Icons/bluetooth/os_bt_disconnected.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/battery/BatteryController.cpp
-        components/Ble/BleController.cpp
+        components/ble/BleController.cpp
-        components/Ble/NotificationManager.cpp
+        components/ble/NotificationManager.cpp
-        components/DateTime/DateTimeController.cpp
+        components/datetime/DateTimeController.cpp
-        components/Brightness/BrightnessController.cpp
+        components/brightness/BrightnessController.cpp
-        components/Ble/NimbleController.cpp
+        components/ble/NimbleController.cpp
-        components/Ble/DeviceInformationService.cpp
+        components/ble/DeviceInformationService.cpp
-        components/Ble/CurrentTimeClient.cpp
+        components/ble/CurrentTimeClient.cpp
-        components/Ble/AlertNotificationClient.cpp
+        components/ble/AlertNotificationClient.cpp
-        components/Ble/DfuService.cpp
+        components/ble/DfuService.cpp
-        components/Ble/CurrentTimeService.cpp
+        components/ble/CurrentTimeService.cpp
-        components/Ble/AlertNotificationService.cpp
+        components/ble/AlertNotificationService.cpp
-        components/Ble/MusicService.cpp
+        components/ble/MusicService.cpp
-        components/Ble/BatteryInformationService.cpp
+        components/ble/BatteryInformationService.cpp
-        components/Ble/ImmediateAlertService.cpp
+        components/ble/ImmediateAlertService.cpp
-        components/FirmwareValidator/FirmwareValidator.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_extrabold_compressed.c
-        displayapp/Fonts/jetbrains_mono_bold_20.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/battery/BatteryController.h
-        components/Ble/BleController.h
+        components/ble/BleController.h
-        components/Ble/NotificationManager.h
+        components/ble/NotificationManager.h
-        components/DateTime/DateTimeController.h
+        components/datetime/DateTimeController.h
-        components/Brightness/BrightnessController.h
+        components/brightness/BrightnessController.h
-        components/Ble/NimbleController.h
+        components/ble/NimbleController.h
-        components/Ble/DeviceInformationService.h
+        components/ble/DeviceInformationService.h
-        components/Ble/CurrentTimeClient.h
+        components/ble/CurrentTimeClient.h
-        components/Ble/AlertNotificationClient.h
+        components/ble/AlertNotificationClient.h
-        components/Ble/DfuService.h
+        components/ble/DfuService.h
-        components/FirmwareValidator/FirmwareValidator.h
+        components/firmwarevalidator/FirmwareValidator.h
-        components/Ble/BatteryInformationService.h
+        components/ble/BatteryInformationService.h
-        components/Ble/ImmediateAlertService.h
+        components/ble/ImmediateAlertService.h
         drivers/Cst816s.h
         FreeRTOS/portmacro.h
         FreeRTOS/portmacro_cmsis.h

src/components/ble/AlertNotificationClient.cpp

@@ -1,4 +1,4 @@
-#include <SystemTask/SystemTask.h>
+#include <systemtask/SystemTask.h>
 #include "NotificationManager.h"
 
 #include "AlertNotificationClient.h"

src/components/ble/AlertNotificationService.cpp

@@ -1,7 +1,7 @@
 
 #include <hal/nrf_rtc.h>
 #include "NotificationManager.h"
-#include <SystemTask/SystemTask.h>
+#include <systemtask/SystemTask.h>
 
 #include "AlertNotificationService.h"
 #include <cstring>

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;
 

src/components/ble/CurrentTimeClient.h

@@ -1,7 +1,8 @@
 #pragma once
 #include <cstdint>
 #include <array>
-#include <Components/DateTime/DateTimeController.h>
+
+#include "components/datetime/DateTimeController.h"
 #include <host/ble_gap.h>
 
 namespace Pinetime {

src/components/ble/CurrentTimeService.h

@@ -1,7 +1,8 @@
 #pragma once
 #include <cstdint>
 #include <array>
-#include <Components/DateTime/DateTimeController.h>
+
+#include "components/datetime/DateTimeController.h"
 #include <host/ble_gap.h>
 
 namespace Pinetime {

src/components/ble/DfuService.cpp

@@ -1,6 +1,7 @@
-#include <Components/Ble/BleController.h>
-#include <SystemTask/SystemTask.h>
 #include <cstring>
+
+#include "components/ble/BleController.h"
+#include "systemtask/SystemTask.h"
 #include "DfuService.h"
 
 using namespace Pinetime::Controllers;

src/components/ble/ImmediateAlertService.cpp

@@ -1,5 +1,5 @@
+#include <systemtask/SystemTask.h>
 #include "ImmediateAlertService.h"
-#include <SystemTask/SystemTask.h>
 #include "AlertNotificationService.h"
 
 using namespace Pinetime::Controllers;

src/components/ble/MusicService.cpp

@@ -1,4 +1,4 @@
-#include <SystemTask/SystemTask.h>
+#include <systemtask/SystemTask.h>
 #include "MusicService.h"
 
 int MSCallback(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_access_ctxt *ctxt, void *arg) {

src/components/ble/NimbleController.cpp

@@ -1,8 +1,8 @@
 
-#include <Components/DateTime/DateTimeController.h>
+#include "components/datetime/DateTimeController.h"
 
-#include <SystemTask/SystemTask.h>
+#include <systemtask/SystemTask.h>
-#include <Components/Ble/NotificationManager.h>
+#include "components/ble/NotificationManager.h"
 #include <hal/nrf_rtc.h>
 
 #include "NimbleController.h"

src/components/ble/NimbleController.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <cstdint>
+
 #include "AlertNotificationService.h"
 #include "AlertNotificationClient.h"
 #include "DeviceInformationService.h"

src/displayapp/DisplayApp.cpp

@@ -1,24 +1,25 @@
+#include <string>
+
 #include "DisplayApp.h"
 #include <FreeRTOS.h>
 #include <task.h>
 #include <libraries/log/nrf_log.h>
 #include <nrf_font.h>
 #include <queue.h>
-#include <Components/DateTime/DateTimeController.h>
+#include "components/datetime/DateTimeController.h"
 #include <drivers/Cst816s.h>
-#include <string>
+#include "displayapp/screens/Tile.h"
-#include <DisplayApp/Screens/Tile.h>
+#include "displayapp/screens/Meter.h"
-#include <DisplayApp/Screens/Meter.h>
+#include "displayapp/screens/Gauge.h"
-#include <DisplayApp/Screens/Gauge.h>
+#include "displayapp/screens/Brightness.h"
-#include <DisplayApp/Screens/Brightness.h>
+#include "displayapp/screens/SystemInfo.h"
-#include <DisplayApp/Screens/SystemInfo.h>
+#include "displayapp/screens/Music.h"
-#include <DisplayApp/Screens/Music.h>
+#include "components/ble/NotificationManager.h"
-#include <Components/Ble/NotificationManager.h>
+#include "displayapp/screens/FirmwareUpdate.h"
-#include <DisplayApp/Screens/FirmwareUpdate.h>
+#include "displayapp/screens/ApplicationList.h"
-#include <DisplayApp/Screens/ApplicationList.h>
+#include "displayapp/screens/FirmwareValidation.h"
-#include <DisplayApp/Screens/FirmwareValidation.h>
+#include "displayapp/screens/InfiniPaint.h"
-#include <DisplayApp/Screens/InfiniPaint.h>
+#include "systemtask/SystemTask.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));

src/displayapp/DisplayApp.h

@@ -3,21 +3,21 @@
 #include <task.h>
 #include <drivers/St7789.h>
 #include <drivers/SpiMaster.h>
-#include <Components/Gfx/Gfx.h>
 #include <bits/unique_ptr.h>
 #include <queue.h>
-#include <Components/Battery/BatteryController.h>
+#include "components/gfx/Gfx.h"
-#include <Components/Brightness/BrightnessController.h>
+#include "components/battery/BatteryController.h"
-#include <Components/Ble/BleController.h>
+#include "components/brightness/BrightnessController.h"
-#include <Components/DateTime/DateTimeController.h>
+#include "components/ble/BleController.h"
-#include "../drivers/Cst816s.h"
+#include "components/datetime/DateTimeController.h"
+#include "components/ble/NotificationManager.h"
+#include "components/firmwarevalidator/FirmwareValidator.h"
+#include "drivers/Cst816s.h"
 #include "LittleVgl.h"
 #include <date/date.h>
-#include <DisplayApp/Screens/Clock.h>
+#include "displayapp/screens/Clock.h"
+#include "displayapp/screens/Modal.h"
 #include <drivers/Watchdog.h>
-#include <DisplayApp/Screens/Modal.h>
-#include <Components/Ble/NotificationManager.h>
-#include <Components/FirmwareValidator/FirmwareValidator.h>
 #include "TouchEvents.h"
 #include "Apps.h"
 

src/displayapp/screens/ApplicationList.cpp

@@ -1,5 +1,5 @@
 #include <libs/lvgl/lvgl.h>
-#include <DisplayApp/DisplayApp.h>
+#include <displayapp/DisplayApp.h>
 #include <functional>
 #include "ApplicationList.h"
 #include "Tile.h"

src/displayapp/screens/ApplicationList.h

@@ -1,13 +1,14 @@
 #pragma once
 
+#include <functional>
 #include <vector>
-#include <Components/Ble/NimbleController.h>
+
+#include "components/ble/NimbleController.h"
 #include "Screen.h"
 #include "Label.h"
 #include "ScreenList.h"
 #include "Gauge.h"
 #include "Meter.h"
-#include <functional>
 
 namespace Pinetime {
   namespace Applications {

src/displayapp/screens/Brightness.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <libs/lvgl/src/lv_core/lv_obj.h>
-#include <Components/Brightness/BrightnessController.h>
+#include "components/brightness/BrightnessController.h"
 #include "Screen.h"
 
 namespace Pinetime {

src/displayapp/screens/Clock.cpp

@@ -1,6 +1,7 @@
 #include <cstdio>
+
 #include <libs/date/includes/date/date.h>
-#include <Components/DateTime/DateTimeController.h>
+#include "components/datetime/DateTimeController.h"
 #include <libs/lvgl/lvgl.h>
 #include "Clock.h"
 #include "../DisplayApp.h"

src/displayapp/screens/Clock.h

@@ -2,12 +2,13 @@
 
 #include <cstdint>
 #include <chrono>
+
 #include "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 <Components/Battery/BatteryController.h>
+#include "components/battery/BatteryController.h"
-#include <Components/Ble/BleController.h>
+#include "components/ble/BleController.h"
 
 namespace Pinetime {
   namespace Applications {

src/displayapp/screens/FirmwareUpdate.h

@@ -2,11 +2,12 @@
 
 #include <cstdint>
 #include <chrono>
+
 #include "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 <Components/Ble/BleController.h>
+#include "components/ble/BleController.h"
 
 namespace Pinetime {
   namespace Applications {

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;