CCF_100/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of github.com:JF002/Pinetime into develop

Browse Source 
# Conflicts:
#	src/main.cpp
#	src/systemtask/SystemTask.h
This commit is contained in:
Jean-François Milants
2021-03-20 11:41:49 +01:00
parent e63596b291 9e9bb2085e
commit 405c85c160
27 changed files with 1326 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/systemtask/SystemTask.cpp
View File

@@ -40,13 +40,15 @@ SystemTask::SystemTask(Drivers::SpiMaster &spi, Drivers::St7789 &lcd,
Controllers::Battery &batteryController, Controllers::Ble &bleController,
Controllers::DateTime &dateTimeController,
Pinetime::Controllers::MotorController& motorController,
Pinetime::Drivers::Hrs3300& heartRateSensor) :
Pinetime::Drivers::Hrs3300& heartRateSensor,
Controllers::Settings &settingsController) :
spi{spi}, lcd{lcd}, spiNorFlash{spiNorFlash},
twiMaster{twiMaster}, touchPanel{touchPanel}, lvgl{lvgl}, batteryController{batteryController},
heartRateController{*this},
bleController{bleController}, dateTimeController{dateTimeController},
watchdog{}, watchdogView{watchdog},
motorController{motorController}, heartRateSensor{heartRateSensor},
settingsController{settingsController},
nimbleController(*this, bleController,dateTimeController, notificationManager, batteryController, spiNorFlash, heartRateController) {
systemTasksMsgQueue = xQueueCreate(10, 1);
}
@@ -81,10 +83,12 @@ void SystemTask::Work() {
batteryController.Init();
motorController.Init();
settingsController.Init();
displayApp.reset(new Pinetime::Applications::DisplayApp(lcd, lvgl, touchPanel, batteryController, bleController,
dateTimeController, watchdogView, *this, notificationManager,
heartRateController));
heartRateController, settingsController));
displayApp->Start();
batteryController.Update();

6
src/systemtask/SystemTask.h
View File

@@ -7,6 +7,7 @@
#include <timers.h>
#include <heartratetask/HeartRateTask.h>
#include <components/heartrate/HeartRateController.h>
#include <components/settings/Settings.h>
#include "SystemMonitor.h"
#include "components/battery/BatteryController.h"
@@ -17,6 +18,7 @@
#include "displayapp/DisplayAppRecovery.h"
#include "displayapp/DummyLittleVgl.h"
#else
#include "components/settings/Settings.h"
#include "displayapp/DisplayApp.h"
#include "displayapp/LittleVgl.h"
#endif
@@ -46,7 +48,8 @@ namespace Pinetime {
Controllers::Battery &batteryController, Controllers::Ble &bleController,
Controllers::DateTime &dateTimeController,
Pinetime::Controllers::MotorController& motorController,
Pinetime::Drivers::Hrs3300& heartRateSensor);
Pinetime::Drivers::Hrs3300& heartRateSensor,
Controllers::Settings &settingsController);
void Start();
@@ -84,6 +87,7 @@ namespace Pinetime {
Pinetime::Controllers::NotificationManager notificationManager;
Pinetime::Controllers::MotorController& motorController;
Pinetime::Drivers::Hrs3300& heartRateSensor;
Pinetime::Controllers::Settings& settingsController;
Pinetime::Controllers::NimbleController nimbleController;
Controllers::BrightnessController brightnessController;