Skip to content

Commit a825fcb

Browse files
committed
Remove lcd from DisplayApp
1 parent 6f9f0e8 commit a825fcb

4 files changed

Lines changed: 7 additions & 14 deletions

File tree

src/displayapp/DisplayApp.cpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,7 @@ namespace {
7777
}
7878
}
7979

80-
DisplayApp::DisplayApp(Drivers::St7789& lcd,
81-
Components::LittleVgl& lvgl,
80+
DisplayApp::DisplayApp(Components::LittleVgl& lvgl,
8281
Drivers::Cst816S& touchPanel,
8382
Controllers::Battery& batteryController,
8483
Controllers::Ble& bleController,
@@ -91,8 +90,7 @@ DisplayApp::DisplayApp(Drivers::St7789& lcd,
9190
Pinetime::Controllers::MotionController& motionController,
9291
Pinetime::Controllers::TimerController& timerController,
9392
Pinetime::Controllers::TouchHandler& touchHandler)
94-
: lcd {lcd},
95-
lvgl {lvgl},
93+
: lvgl {lvgl},
9694
touchPanel {touchPanel},
9795
batteryController {batteryController},
9896
bleController {bleController},
@@ -178,12 +176,10 @@ void DisplayApp::Refresh() {
178176
brightnessController.Lower();
179177
vTaskDelay(100);
180178
}
181-
lcd.DisplayOff();
182179
PushMessageToSystemTask(Pinetime::System::Messages::OnDisplayTaskSleeping);
183180
state = States::Idle;
184181
break;
185182
case Messages::GoToRunning:
186-
lcd.DisplayOn();
187183
brightnessController.Restore();
188184
state = States::Running;
189185
break;

src/displayapp/DisplayApp.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ namespace Pinetime {
4444
enum class States { Idle, Running };
4545
enum class FullRefreshDirections { None, Up, Down, Left, Right, LeftAnim, RightAnim };
4646

47-
DisplayApp(Drivers::St7789& lcd,
48-
Components::LittleVgl& lvgl,
47+
DisplayApp(Components::LittleVgl& lvgl,
4948
Drivers::Cst816S&,
5049
Controllers::Battery& batteryController,
5150
Controllers::Ble& bleController,
@@ -68,7 +67,6 @@ namespace Pinetime {
6867
void Register(Pinetime::System::SystemTask* systemTask);
6968

7069
private:
71-
Pinetime::Drivers::St7789& lcd;
7270
Pinetime::Components::LittleVgl& lvgl;
7371
Pinetime::Drivers::Cst816S& touchPanel;
7472
Pinetime::Controllers::Battery& batteryController;

src/drivers/St7789.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ namespace Pinetime {
2222

2323
void DrawBuffer(uint16_t x, uint16_t y, uint16_t width, uint16_t height, const uint8_t* data, size_t size);
2424

25-
void DisplayOn();
26-
void DisplayOff();
27-
2825
void Sleep();
2926
void Wakeup();
3027

@@ -42,6 +39,9 @@ namespace Pinetime {
4239
void DisplayInversionOn();
4340
void NormalModeOn();
4441
void WriteToRam();
42+
void DisplayOn();
43+
void DisplayOff();
44+
4545
void SetAddrWindow(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1);
4646
void WriteCommand(uint8_t cmd);
4747
void WriteSpi(const uint8_t* data, size_t size);

src/main.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,7 @@ Pinetime::Controllers::Settings settingsController {fs};
126126
Pinetime::Controllers::MotorController motorController {settingsController};
127127

128128

129-
Pinetime::Applications::DisplayApp displayApp(lcd,
130-
lvgl,
129+
Pinetime::Applications::DisplayApp displayApp(lvgl,
131130
touchPanel,
132131
batteryController,
133132
bleController,

0 commit comments

Comments
 (0)