Skip to content

Commit 4079086

Browse files
NeroBurnerJF002
authored andcommitted
Provide reference to BrightnessController in DisplayApp
For the simulator I need a way to get to the brightnessController object and handle the set brightness-levels accoringly. This is done by the constructor expecting a brightnessController object instead of initializing one itself
1 parent f829427 commit 4079086

5 files changed

Lines changed: 10 additions & 1 deletion

File tree

src/displayapp/DisplayApp.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ DisplayApp::DisplayApp(Drivers::St7789& lcd,
9797
Pinetime::Controllers::MotionController& motionController,
9898
Pinetime::Controllers::TimerController& timerController,
9999
Pinetime::Controllers::AlarmController& alarmController,
100+
Pinetime::Controllers::BrightnessController& brightnessController,
100101
Pinetime::Controllers::TouchHandler& touchHandler)
101102
: lcd {lcd},
102103
lvgl {lvgl},
@@ -112,6 +113,7 @@ DisplayApp::DisplayApp(Drivers::St7789& lcd,
112113
motionController {motionController},
113114
timerController {timerController},
114115
alarmController {alarmController},
116+
brightnessController {brightnessController},
115117
touchHandler {touchHandler} {
116118
}
117119

src/displayapp/DisplayApp.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ namespace Pinetime {
6161
Pinetime::Controllers::MotionController& motionController,
6262
Pinetime::Controllers::TimerController& timerController,
6363
Pinetime::Controllers::AlarmController& alarmController,
64+
Pinetime::Controllers::BrightnessController& brightnessController,
6465
Pinetime::Controllers::TouchHandler& touchHandler);
6566
void Start(System::BootErrors error);
6667
void PushMessage(Display::Messages msg);
@@ -87,10 +88,10 @@ namespace Pinetime {
8788
Pinetime::Controllers::MotionController& motionController;
8889
Pinetime::Controllers::TimerController& timerController;
8990
Pinetime::Controllers::AlarmController& alarmController;
91+
Pinetime::Controllers::BrightnessController &brightnessController;
9092
Pinetime::Controllers::TouchHandler& touchHandler;
9193

9294
Pinetime::Controllers::FirmwareValidator validator;
93-
Controllers::BrightnessController brightnessController;
9495

9596
TaskHandle_t taskHandle;
9697

src/displayapp/DisplayAppRecovery.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ DisplayApp::DisplayApp(Drivers::St7789& lcd,
2323
Pinetime::Controllers::MotionController& motionController,
2424
Pinetime::Controllers::TimerController& timerController,
2525
Pinetime::Controllers::AlarmController& alarmController,
26+
Pinetime::Controllers::BrightnessController& brightnessController,
2627
Pinetime::Controllers::TouchHandler& touchHandler)
2728
: lcd {lcd}, bleController {bleController} {
2829

src/displayapp/DisplayAppRecovery.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ namespace Pinetime {
3434
class MotorController;
3535
class TimerController;
3636
class AlarmController;
37+
class BrightnessController;
3738
}
3839

3940
namespace System {
@@ -57,6 +58,7 @@ namespace Pinetime {
5758
Pinetime::Controllers::MotionController& motionController,
5859
Pinetime::Controllers::TimerController& timerController,
5960
Pinetime::Controllers::AlarmController& alarmController,
61+
Pinetime::Controllers::BrightnessController& brightnessController,
6062
Pinetime::Controllers::TouchHandler& touchHandler);
6163
void Start();
6264
void Start(Pinetime::System::BootErrors){ Start(); };

src/main.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
#include "components/battery/BatteryController.h"
3434
#include "components/ble/BleController.h"
3535
#include "components/ble/NotificationManager.h"
36+
#include "components/brightness/BrightnessController.h"
3637
#include "components/motor/MotorController.h"
3738
#include "components/datetime/DateTimeController.h"
3839
#include "components/heartrate/HeartRateController.h"
@@ -114,6 +115,7 @@ Pinetime::Controllers::TimerController timerController;
114115
Pinetime::Controllers::AlarmController alarmController {dateTimeController};
115116
Pinetime::Controllers::TouchHandler touchHandler(touchPanel, lvgl);
116117
Pinetime::Controllers::ButtonHandler buttonHandler;
118+
Pinetime::Controllers::BrightnessController brightnessController {};
117119

118120
Pinetime::Applications::DisplayApp displayApp(lcd,
119121
lvgl,
@@ -129,6 +131,7 @@ Pinetime::Applications::DisplayApp displayApp(lcd,
129131
motionController,
130132
timerController,
131133
alarmController,
134+
brightnessController,
132135
touchHandler);
133136

134137
Pinetime::System::SystemTask systemTask(spi,

0 commit comments

Comments
 (0)