diff options
| author | JF002 <JF002@users.noreply.github.com> | 2020-10-04 10:21:22 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-04 10:21:22 (GMT) |
| commit | 39954bbd3afb592a0c3109e3479594183e8d0778 (patch) | |
| tree | 58efd04aa38b8dc7989c51fe3c9cdb9a3fb46a54 /src/main.cpp | |
| parent | 5adc97702c326d0252df6da75ce4ac244a4b3553 (diff) | |
| parent | 6c86d1d9d706706fcb6f214aba8259e61ed68755 (diff) | |
Merge pull request #68 from Avamander/patch-1
Rename folders to follow a consistent style
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/main.cpp b/src/main.cpp index fe41358..e324336 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,29 +1,29 @@ #include <FreeRTOS.h> #include <task.h> +#include <timers.h> #include <legacy/nrf_drv_clock.h> +#include <hal/nrf_rtc.h> +#include <hal/nrf_wdt.h> +#include <os/os_cputime.h> #include <libraries/timer/app_timer.h> #include <libraries/gpiote/app_gpiote.h> -#include <DisplayApp/DisplayApp.h> +#include "displayapp/DisplayApp.h" #include <softdevice/common/nrf_sdh.h> -#include <hal/nrf_rtc.h> -#include <timers.h> -#include <Components/DateTime/DateTimeController.h> -#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 <drivers/St7789.h> #include <drivers/SpiMaster.h> #include <drivers/Spi.h> -#include <DisplayApp/LittleVgl.h> -#include <SystemTask/SystemTask.h> -#include <Components/Ble/NotificationManager.h> +#include "displayapp/LittleVgl.h" +#include <systemtask/SystemTask.h> #include <nimble/nimble_port_freertos.h> #include <nimble/npl_freertos.h> #include <nimble/nimble_port.h> #include <host/ble_hs.h> #include <controller/ble_ll.h> -#include <os/os_cputime.h> #include <transport/ram/ble_hci_ram.h> -#include <hal/nrf_wdt.h> #include <host/util/util.h> #include <services/gap/ble_svc_gap.h> @@ -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 |