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

LVGL / FS : Initialize the LVGL FS driver in LittleVgl (instead of FS).

Browse Source 
Previously, the LVGL driver for the filesystem was initialized in the class FS. However, since 6f942e2, the order of the initializations was incorrect  : the driver was initialized (FS::LVGLFileSystemInit()) before LVGL (LittleVgl.Init()), which means that the driver registration was probably dropped when LVGL was initialized.

The LVGL driver is now initialized in LittleVgl.Init(), which seems to make much more sense, since all LVGL drivers are initialized there. This way, we ensure that the initialization of the drivers is consistent.
This commit is contained in:
Jean-François Milants
2023-02-26 20:33:34 +01:00
committed by Riku Isokoski
parent ce2277cbca
commit 9bbd2ddbc4
5 changed files with 62 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/displayapp/LittleVgl.h
View File

@@ -1,6 +1,7 @@
#pragma once
#include <lvgl/lvgl.h>
#include <components/fs/FS.h>
namespace Pinetime {
namespace Drivers {
@@ -11,7 +12,7 @@ namespace Pinetime {
class LittleVgl {
public:
enum class FullRefreshDirections { None, Up, Down, Left, Right, LeftAnim, RightAnim };
LittleVgl(Pinetime::Drivers::St7789& lcd);
LittleVgl(Pinetime::Drivers::St7789& lcd, Pinetime::Controllers::FS& filesystem);
LittleVgl(const LittleVgl&) = delete;
LittleVgl& operator=(const LittleVgl&) = delete;
@@ -37,8 +38,10 @@ namespace Pinetime {
private:
void InitDisplay();
void InitTouchpad();
void InitFileSystem();
Pinetime::Drivers::St7789& lcd;
Pinetime::Controllers::FS& filesystem;
lv_disp_buf_t disp_buf_2;
lv_color_t buf2_1[LV_HOR_RES_MAX * 4];