aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/displayapp/DummyLittleVgl.h3
-rw-r--r--src/displayapp/LittleVgl.cpp3
-rw-r--r--src/displayapp/LittleVgl.h4
-rw-r--r--src/main.cpp2
4 files changed, 4 insertions, 8 deletions
diff --git a/src/displayapp/DummyLittleVgl.h b/src/displayapp/DummyLittleVgl.h
index 7a8ae999..268705da 100644
--- a/src/displayapp/DummyLittleVgl.h
+++ b/src/displayapp/DummyLittleVgl.h
@@ -4,7 +4,6 @@
#include <lvgl/src/lv_themes/lv_theme.h>
#include <lvgl/src/lv_hal/lv_hal.h>
#include <drivers/St7789.h>
-#include <drivers/Cst816s.h>
namespace Pinetime {
namespace Components {
@@ -12,7 +11,7 @@ namespace Pinetime {
public:
enum class FullRefreshDirections { None, Up, Down };
- LittleVgl(Pinetime::Drivers::St7789& lcd, Pinetime::Drivers::Cst816S& touchPanel) {
+ LittleVgl(Pinetime::Drivers::St7789& lcd) {
}
LittleVgl(const LittleVgl&) = delete;
diff --git a/src/displayapp/LittleVgl.cpp b/src/displayapp/LittleVgl.cpp
index e3d564a3..cc1223fb 100644
--- a/src/displayapp/LittleVgl.cpp
+++ b/src/displayapp/LittleVgl.cpp
@@ -3,7 +3,6 @@
#include <FreeRTOS.h>
#include <task.h>
-#include "drivers/Cst816s.h"
#include "drivers/St7789.h"
using namespace Pinetime::Components;
@@ -35,7 +34,7 @@ bool touchpad_read(lv_indev_drv_t* indev_drv, lv_indev_data_t* data) {
return lvgl->GetTouchPadInfo(data);
}
-LittleVgl::LittleVgl(Pinetime::Drivers::St7789& lcd, Pinetime::Drivers::Cst816S& touchPanel) : lcd {lcd}, touchPanel {touchPanel} {
+LittleVgl::LittleVgl(Pinetime::Drivers::St7789& lcd) : lcd {lcd} {
}
void LittleVgl::Init() {
diff --git a/src/displayapp/LittleVgl.h b/src/displayapp/LittleVgl.h
index 7bd0198c..0a45b438 100644
--- a/src/displayapp/LittleVgl.h
+++ b/src/displayapp/LittleVgl.h
@@ -4,7 +4,6 @@
namespace Pinetime {
namespace Drivers {
- class Cst816S;
class St7789;
}
@@ -12,7 +11,7 @@ namespace Pinetime {
class LittleVgl {
public:
enum class FullRefreshDirections { None, Up, Down, Left, Right, LeftAnim, RightAnim };
- LittleVgl(Pinetime::Drivers::St7789& lcd, Pinetime::Drivers::Cst816S& touchPanel);
+ LittleVgl(Pinetime::Drivers::St7789& lcd);
LittleVgl(const LittleVgl&) = delete;
LittleVgl& operator=(const LittleVgl&) = delete;
@@ -39,7 +38,6 @@ namespace Pinetime {
void InitTouchpad();
Pinetime::Drivers::St7789& lcd;
- Pinetime::Drivers::Cst816S& touchPanel;
lv_disp_buf_t disp_buf_2;
lv_color_t buf2_1[LV_HOR_RES_MAX * 4];
diff --git a/src/main.cpp b/src/main.cpp
index b205f1e6..95708531 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -87,7 +87,7 @@ Pinetime::Drivers::Cst816S touchPanel {twiMaster, touchPanelTwiAddress};
#include "displayapp/LittleVgl.h"
#include "displayapp/DisplayApp.h"
#endif
-Pinetime::Components::LittleVgl lvgl {lcd, touchPanel};
+Pinetime::Components::LittleVgl lvgl {lcd};
Pinetime::Drivers::Bma421 motionSensor {twiMaster, motionSensorTwiAddress};
Pinetime::Drivers::Hrs3300 heartRateSensor {twiMaster, heartRateSensorTwiAddress};