scott/InfiniTime
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

LittleVgl: Remove unused Cst816S reference

Browse source
This commit is contained in:
Riku Isokoski 2023-02-23 23:33:09 +02:00
parent 05f404950a
commit 0d494136c9
4 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/displayapp/DummyLittleVgl.h
View file

@ -4,7 +4,6 @@
#include <lvgl/src/lv_themes/lv_theme.h> #include <lvgl/src/lv_themes/lv_theme.h>
#include <lvgl/src/lv_hal/lv_hal.h> #include <lvgl/src/lv_hal/lv_hal.h>
#include <drivers/St7789.h> #include <drivers/St7789.h>
#include <drivers/Cst816s.h>
namespace Pinetime { namespace Pinetime {
namespace Components { namespace Components {
@ -12,7 +11,7 @@ namespace Pinetime {
public: public:
enum class FullRefreshDirections { None, Up, Down }; enum class FullRefreshDirections { None, Up, Down };
LittleVgl(Pinetime::Drivers::St7789& lcd, Pinetime::Drivers::Cst816S& touchPanel) { LittleVgl(Pinetime::Drivers::St7789& lcd) {
} }
LittleVgl(const LittleVgl&) = delete; LittleVgl(const LittleVgl&) = delete;

3
src/displayapp/LittleVgl.cpp
View file

@ -3,7 +3,6 @@
#include <FreeRTOS.h> #include <FreeRTOS.h>
#include <task.h> #include <task.h>
#include "drivers/Cst816s.h"
#include "drivers/St7789.h" #include "drivers/St7789.h"
using namespace Pinetime::Components; 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); 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() { void LittleVgl::Init() {

4
src/displayapp/LittleVgl.h
View file

@ -4,7 +4,6 @@
namespace Pinetime { namespace Pinetime {
namespace Drivers { namespace Drivers {
class Cst816S;
class St7789; class St7789;
} }
@ -12,7 +11,7 @@ namespace Pinetime {
class LittleVgl { class LittleVgl {
public: public:
enum class FullRefreshDirections { None, Up, Down, Left, Right, LeftAnim, RightAnim }; 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(const LittleVgl&) = delete;
LittleVgl& operator=(const LittleVgl&) = delete; LittleVgl& operator=(const LittleVgl&) = delete;
@ -39,7 +38,6 @@ namespace Pinetime {
void InitTouchpad(); void InitTouchpad();
Pinetime::Drivers::St7789& lcd; Pinetime::Drivers::St7789& lcd;
Pinetime::Drivers::Cst816S& touchPanel;
lv_disp_buf_t disp_buf_2; lv_disp_buf_t disp_buf_2;
lv_color_t buf2_1[LV_HOR_RES_MAX * 4]; lv_color_t buf2_1[LV_HOR_RES_MAX * 4];

2
src/main.cpp
View file

@ -87,7 +87,7 @@ Pinetime::Drivers::Cst816S touchPanel {twiMaster, touchPanelTwiAddress};
#include "displayapp/LittleVgl.h" #include "displayapp/LittleVgl.h"
#include "displayapp/DisplayApp.h" #include "displayapp/DisplayApp.h"
#endif #endif
Pinetime::Components::LittleVgl lvgl {lcd, touchPanel}; Pinetime::Components::LittleVgl lvgl {lcd};
Pinetime::Drivers::Bma421 motionSensor {twiMaster, motionSensorTwiAddress}; Pinetime::Drivers::Bma421 motionSensor {twiMaster, motionSensorTwiAddress};
Pinetime::Drivers::Hrs3300 heartRateSensor {twiMaster, heartRateSensorTwiAddress}; Pinetime::Drivers::Hrs3300 heartRateSensor {twiMaster, heartRateSensorTwiAddress};