Merge pull request #68 from Avamander/patch-1

Rename folders to follow a consistent style
This commit is contained in:
JF002 2020-10-04 12:21:22 +02:00 committed by GitHub
commit 39954bbd3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
151 changed files with 562 additions and 521 deletions

View File

@ -4,7 +4,7 @@ project(pinetime VERSION 0.8.2 LANGUAGES C CXX ASM)
set(NRF_TARGET "nrf52") set(NRF_TARGET "nrf52")
if (NOT ARM_NONE_EABI_TOOLCHAIN_PATH) if (NOT ARM_NONE_EABI_TOOLCHAIN_PATH)
message(FATAL_ERROR "The path to the toolchain (arm-non-eabi) must be specified on the command line (add -DARM_NONE_EABI_TOOLCHAIN_PATH=<path>") message(FATAL_ERROR "The path to the toolchain (arm-none-eabi) must be specified on the command line (add -DARM_NONE_EABI_TOOLCHAIN_PATH=<path>")
endif () endif ()
if (NOT NRF5_SDK_PATH) if (NOT NRF5_SDK_PATH)

View File

@ -45,7 +45,7 @@ As of now, here is the list of achievements of this project:
## Documentation ## Documentation
### Develop ### 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 ### Build, flash and debug
- [Project branches](doc/branches.md) - [Project branches](doc/branches.md)

View File

Before

Width:  |  Height:  |  Size: 187 KiB

After

Width:  |  Height:  |  Size: 187 KiB

View File

Before

Width:  |  Height:  |  Size: 208 KiB

After

Width:  |  Height:  |  Size: 208 KiB

View File

Before

Width:  |  Height:  |  Size: 176 KiB

After

Width:  |  Height:  |  Size: 176 KiB

File diff suppressed because it is too large Load Diff

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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 <hal/nrf_rtc.h>
#include "NimbleController.h" #include "NimbleController.h"

View File

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

View File

@ -1,24 +1,25 @@
#include <string>
#include "DisplayApp.h" #include "DisplayApp.h"
#include <FreeRTOS.h> #include <FreeRTOS.h>
#include <task.h> #include <task.h>
#include <libraries/log/nrf_log.h> #include <libraries/log/nrf_log.h>
#include <nrf_font.h> #include <nrf_font.h>
#include <queue.h> #include <queue.h>
#include <Components/DateTime/DateTimeController.h> #include "components/datetime/DateTimeController.h"
#include <drivers/Cst816s.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; using namespace Pinetime::Applications;
@ -43,13 +44,13 @@ DisplayApp::DisplayApp(Drivers::St7789 &lcd, Components::LittleVgl &lvgl, Driver
} }
void DisplayApp::Start() { void DisplayApp::Start() {
if (pdPASS != xTaskCreate(DisplayApp::Process, "DisplayApp", 512, this, 0, &taskHandle)) if (pdPASS != xTaskCreate(DisplayApp::Process, "displayapp", 512, this, 0, &taskHandle))
APP_ERROR_HANDLER(NRF_ERROR_NO_MEM); APP_ERROR_HANDLER(NRF_ERROR_NO_MEM);
} }
void DisplayApp::Process(void *instance) { void DisplayApp::Process(void *instance) {
auto *app = static_cast<DisplayApp *>(instance); auto *app = static_cast<DisplayApp *>(instance);
NRF_LOG_INFO("DisplayApp task started!"); NRF_LOG_INFO("displayapp task started!");
app->InitHw(); app->InitHw();
// Send a dummy notification to unlock the lvgl display driver for the first iteration // Send a dummy notification to unlock the lvgl display driver for the first iteration
@ -148,7 +149,7 @@ void DisplayApp::Refresh() {
} }
} }
// lvgl.SetFullRefresh(Components::LittleVgl::FullRefreshDirections::Down); // lvgl.SetFullRefresh(components::LittleVgl::FullRefreshDirections::Down);
// currentScreen.reset(nullptr); // currentScreen.reset(nullptr);
// if(toggle) { // if(toggle) {
// currentScreen.reset(new Screens::Tile(this)); // currentScreen.reset(new Screens::Tile(this));

View File

@ -3,21 +3,21 @@
#include <task.h> #include <task.h>
#include <drivers/St7789.h> #include <drivers/St7789.h>
#include <drivers/SpiMaster.h> #include <drivers/SpiMaster.h>
#include <Components/Gfx/Gfx.h>
#include <bits/unique_ptr.h> #include <bits/unique_ptr.h>
#include <queue.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 "LittleVgl.h"
#include <date/date.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 <drivers/Watchdog.h>
#include <DisplayApp/Screens/Modal.h>
#include <Components/Ble/NotificationManager.h>
#include <Components/FirmwareValidator/FirmwareValidator.h>
#include "TouchEvents.h" #include "TouchEvents.h"
#include "Apps.h" #include "Apps.h"

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

View File

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

View File

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

View File

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

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