summaryrefslogtreecommitdiff
path: root/src/DisplayApp
diff options
context:
space:
mode:
Diffstat (limited to 'src/DisplayApp')
-rw-r--r--src/DisplayApp/DisplayApp.cpp20
-rw-r--r--src/DisplayApp/DisplayApp.h1
-rw-r--r--src/DisplayApp/Screens/Message.cpp11
-rw-r--r--src/DisplayApp/lv_port_disp.cpp206
-rw-r--r--src/DisplayApp/lv_port_disp.h45
5 files changed, 276 insertions, 7 deletions
diff --git a/src/DisplayApp/DisplayApp.cpp b/src/DisplayApp/DisplayApp.cpp
index ca139423..d2bf1bc3 100644
--- a/src/DisplayApp/DisplayApp.cpp
+++ b/src/DisplayApp/DisplayApp.cpp
@@ -11,6 +11,8 @@
#include <drivers/Cst816s.h>
#include <chrono>
#include <string>
+#include <lvgl/lvgl.h>
+#include "lv_port_disp.h"
using namespace Pinetime::Applications;
@@ -26,13 +28,14 @@ DisplayApp::DisplayApp(Pinetime::Drivers::St7789& lcd,
batteryController{batteryController},
bleController{bleController},
dateTimeController{dateTimeController},
- clockScreen{gfx} {
+ clockScreen{gfx},
+ messageScreen{gfx}{
msgQueue = xQueueCreate(queueSize, itemSize);
- currentScreen = &clockScreen;
+ currentScreen = &messageScreen;
}
void DisplayApp::Start() {
- if (pdPASS != xTaskCreate(DisplayApp::Process, "DisplayApp", 256, this, 0, &taskHandle))
+ if (pdPASS != xTaskCreate(DisplayApp::Process, "DisplayApp", 1024, this, 0, &taskHandle))
APP_ERROR_HANDLER(NRF_ERROR_NO_MEM);
}
@@ -40,7 +43,11 @@ void DisplayApp::Process(void *instance) {
auto *app = static_cast<DisplayApp *>(instance);
NRF_LOG_INFO("DisplayApp task started!");
app->InitHw();
+ lv_init();
+ lv_port_disp_init();
+
while (1) {
+ lv_task_handler();
app->Refresh();
}
}
@@ -53,7 +60,7 @@ void DisplayApp::InitHw() {
nrf_gpio_pin_clear(pinLcdBacklight2);
nrf_gpio_pin_clear(pinLcdBacklight3);
- currentScreen->Refresh(true);
+
}
uint32_t acc = 0;
@@ -112,11 +119,14 @@ void DisplayApp::Refresh() {
}
}
+bool first = true;
+
void DisplayApp::RunningState() {
clockScreen.SetCurrentDateTime(dateTimeController.CurrentDateTime());
if(currentScreen != nullptr) {
- currentScreen->Refresh(false);
+ currentScreen->Refresh(first);
+ first = false;
}
}
diff --git a/src/DisplayApp/DisplayApp.h b/src/DisplayApp/DisplayApp.h
index 5a5d3ee6..00637a05 100644
--- a/src/DisplayApp/DisplayApp.h
+++ b/src/DisplayApp/DisplayApp.h
@@ -58,6 +58,7 @@ namespace Pinetime {
void OnTouchEvent();
Screens::Clock clockScreen;
+ Screens::Message messageScreen;
Screens::Screen* currentScreen = nullptr;
static constexpr uint8_t pinLcdBacklight1 = 14;
static constexpr uint8_t pinLcdBacklight2 = 22;
diff --git a/src/DisplayApp/Screens/Message.cpp b/src/DisplayApp/Screens/Message.cpp
index 121e34b9..7b1ed9ae 100644
--- a/src/DisplayApp/Screens/Message.cpp
+++ b/src/DisplayApp/Screens/Message.cpp
@@ -2,13 +2,20 @@
#include <libs/date/includes/date/date.h>
#include <Components/DateTime/DateTimeController.h>
#include <Version.h>
+#include <libs/lvgl/src/lv_core/lv_obj.h>
+#include <libs/lvgl/lvgl.h>
#include "Message.h"
using namespace Pinetime::Applications::Screens;
+lv_obj_t * label;
void Message::Refresh(bool fullRefresh) {
if(fullRefresh) {
- gfx.FillRectangle(0,0,240,240,0xffff);
- gfx.DrawString(120, 10, 0x5555, "COUCOU", &smallFont, false);
+ lv_obj_t * btn = lv_btn_create(lv_scr_act(), NULL); /*Add a button the current screen*/
+ lv_obj_set_pos(btn, 10, 10); /*Set its position*/
+ lv_obj_set_size(btn, 100, 50); /*Set its size*/
+ label = lv_label_create(btn, NULL); /*Add a label to the button*/
+ lv_label_set_text(label, "Button"); /*Set the labels text*/
}
+
}
diff --git a/src/DisplayApp/lv_port_disp.cpp b/src/DisplayApp/lv_port_disp.cpp
new file mode 100644
index 00000000..6f6acc44
--- /dev/null
+++ b/src/DisplayApp/lv_port_disp.cpp
@@ -0,0 +1,206 @@
+/**
+ * @file lv_port_disp_templ.c
+ *
+ */
+
+/*Copy this file as "lv_port_disp.c" and set this value to "1" to enable content*/
+#if 1
+
+/*********************
+ * INCLUDES
+ *********************/
+#include <FreeRTOS.h>
+#include <projdefs.h>
+#include <task.h>
+#include "lv_port_disp.h"
+#include "../drivers/St7789.h"
+/*********************
+ * DEFINES
+ *********************/
+
+/**********************
+ * TYPEDEFS
+ **********************/
+
+/**********************
+ * STATIC PROTOTYPES
+ **********************/
+static void disp_init(void);
+
+static void disp_flush(lv_disp_drv_t * disp_drv, const lv_area_t * area, lv_color_t * color_p);
+#if LV_USE_GPU
+static void gpu_blend(lv_color_t * dest, const lv_color_t * src, uint32_t length, lv_opa_t opa);
+static void gpu_fill(lv_color_t * dest, uint32_t length, lv_color_t color);
+#endif
+
+/**********************
+ * STATIC VARIABLES
+ **********************/
+
+/**********************
+ * MACROS
+ **********************/
+
+/**********************
+ * GLOBAL FUNCTIONS
+ **********************/
+
+void lv_port_disp_init(void)
+{
+ /*-------------------------
+ * Initialize your display
+ * -----------------------*/
+ disp_init();
+
+ /*-----------------------------
+ * Create a buffer for drawing
+ *----------------------------*/
+
+ /* LittlevGL requires a buffer where it draws the objects. The buffer's has to be greater than 1 display row
+ *
+ * There are three buffering configurations:
+ * 1. Create ONE buffer with some rows:
+ * LittlevGL will draw the display's content here and writes it to your display
+ *
+ * 2. Create TWO buffer with some rows:
+ * LittlevGL will draw the display's content to a buffer and writes it your display.
+ * You should use DMA to write the buffer's content to the display.
+ * It will enable LittlevGL to draw the next part of the screen to the other buffer while
+ * the data is being sent form the first buffer. It makes rendering and flushing parallel.
+ *
+ * 3. Create TWO screen-sized buffer:
+ * Similar to 2) but the buffer have to be screen sized. When LittlevGL is ready it will give the
+ * whole frame to display. This way you only need to change the frame buffer's address instead of
+ * copying the pixels.
+ * */
+
+ /* Example for 1) */
+#if 0
+ static lv_disp_buf_t disp_buf_1;
+ static lv_color_t buf1_1[LV_HOR_RES_MAX * 10]; /*A buffer for 10 rows*/
+ lv_disp_buf_init(&disp_buf_1, buf1_1, NULL, LV_HOR_RES_MAX * 10); /*Initialize the display buffer*/
+#endif
+ /* Example for 2) */
+ static lv_disp_buf_t disp_buf_2;
+ static lv_color_t buf2_1[LV_HOR_RES_MAX * 2]; /*A buffer for 10 rows*/
+ static lv_color_t buf2_2[LV_HOR_RES_MAX * 2]; /*An other buffer for 10 rows*/
+ lv_disp_buf_init(&disp_buf_2, buf2_1, buf2_2, LV_HOR_RES_MAX * 2); /*Initialize the display buffer*/
+
+ /* Example for 3) */
+#if 0
+ static lv_disp_buf_t disp_buf_3;
+ static lv_color_t buf3_1[LV_HOR_RES_MAX * LV_VER_RES_MAX]; /*A screen sized buffer*/
+ static lv_color_t buf3_2[LV_HOR_RES_MAX * LV_VER_RES_MAX]; /*An other screen sized buffer*/
+ lv_disp_buf_init(&disp_buf_3, buf3_1, buf3_2, LV_HOR_RES_MAX * LV_VER_RES_MAX); /*Initialize the display buffer*/
+#endif
+
+ /*-----------------------------------
+ * Register the display in LittlevGL
+ *----------------------------------*/
+
+ lv_disp_drv_t disp_drv; /*Descriptor of a display driver*/
+ lv_disp_drv_init(&disp_drv); /*Basic initialization*/
+
+ /*Set up the functions to access to your display*/
+
+ /*Set the resolution of the display*/
+ disp_drv.hor_res = 240;
+ disp_drv.ver_res = 240;
+
+ /*Used to copy the buffer's content to the display*/
+ disp_drv.flush_cb = disp_flush;
+ /*Set a display buffer*/
+ disp_drv.buffer = &disp_buf_2;
+
+#if LV_USE_GPU
+ /*Optionally add functions to access the GPU. (Only in buffered mode, LV_VDB_SIZE != 0)*/
+
+ /*Blend two color array using opacity*/
+ disp_drv.gpu_blend = gpu_blend;
+
+ /*Fill a memory array with a color*/
+ disp_drv.gpu_fill = gpu_fill;
+#endif
+
+ /*Finally register the driver*/
+ lv_disp_drv_register(&disp_drv);
+}
+
+/**********************
+ * STATIC FUNCTIONS
+ **********************/
+
+/* Initialize your display and the required peripherals. */
+extern Pinetime::Drivers::St7789* ptrLcd;
+static void disp_init(void)
+{
+ /*You code here*/
+}
+
+void NotifyEndOfTransfert(TaskHandle_t task) {
+ if(task != nullptr) {
+ BaseType_t xHigherPriorityTaskWoken = pdFALSE;
+ vTaskNotifyGiveFromISR(task, &xHigherPriorityTaskWoken);
+ portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
+ }
+}
+
+/* Flush the content of the internal buffer the specific area on the display
+ * You can use DMA or any hardware acceleration to do this operation in the background but
+ * 'lv_disp_flush_ready()' has to be called when finished. */
+static void disp_flush(lv_disp_drv_t * disp_drv, const lv_area_t * area, lv_color_t * color_p)
+{
+ /*The most simple case (but also the slowest) to put all pixels to the screen one-by-one*/
+ auto x = area->x1;
+ auto y = area->y1;
+ auto width = (area->x2-area->x1)+1;
+ auto height = (area->y2-area->y1)+1;
+ ptrLcd->BeginDrawBuffer(x, y, width, height);
+ ptrLcd->NextDrawBuffer(reinterpret_cast<const uint8_t *>(color_p), width * height*2) ;
+
+ ulTaskNotifyTake(pdTRUE, 500);
+
+ /* IMPORTANT!!!
+ * Inform the graphics library that you are ready with the flushing*/
+ lv_disp_flush_ready(disp_drv);
+}
+
+
+/*OPTIONAL: GPU INTERFACE*/
+#if LV_USE_GPU
+
+/* If your MCU has hardware accelerator (GPU) then you can use it to blend to memories using opacity
+ * It can be used only in buffered mode (LV_VDB_SIZE != 0 in lv_conf.h)*/
+static void gpu_blend(lv_disp_drv_t * disp_drv, lv_color_t * dest, const lv_color_t * src, uint32_t length, lv_opa_t opa)
+{
+ /*It's an example code which should be done by your GPU*/
+ uint32_t i;
+ for(i = 0; i < length; i++) {
+ dest[i] = lv_color_mix(dest[i], src[i], opa);
+ }
+}
+
+/* If your MCU has hardware accelerator (GPU) then you can use it to fill a memory with a color
+ * It can be used only in buffered mode (LV_VDB_SIZE != 0 in lv_conf.h)*/
+static void gpu_fill_cb(lv_disp_drv_t * disp_drv, lv_color_t * dest_buf, lv_coord_t dest_width,
+ const lv_area_t * fill_area, lv_color_t color);
+{
+ /*It's an example code which should be done by your GPU*/
+ uint32_t x, y;
+ dest_buf += dest_width * fill_area->y1; /*Go to the first line*/
+
+ for(y = fill_area->y1; y < fill_area->y2; y++) {
+ for(x = fill_area->x1; x < fill_area->x2; x++) {
+ dest_buf[x] = color;
+ }
+ dest_buf+=dest_width; /*Go to the next line*/
+ }
+}
+
+#endif /*LV_USE_GPU*/
+
+#else /* Enable this file at the top */
+
+/* This dummy typedef exists purely to silence -Wpedantic. */
+typedef int keep_pedantic_happy;
+#endif
diff --git a/src/DisplayApp/lv_port_disp.h b/src/DisplayApp/lv_port_disp.h
new file mode 100644
index 00000000..e0d70506
--- /dev/null
+++ b/src/DisplayApp/lv_port_disp.h
@@ -0,0 +1,45 @@
+/**
+ * @file lv_port_disp_templ.h
+ *
+ */
+
+ /*Copy this file as "lv_port_disp.h" and set this value to "1" to enable content*/
+#if 1
+
+#ifndef LV_PORT_DISP_TEMPL_H
+#define LV_PORT_DISP_TEMPL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*********************
+ * INCLUDES
+ *********************/
+#include "lvgl/lvgl.h"
+
+/*********************
+ * DEFINES
+ *********************/
+
+/**********************
+ * TYPEDEFS
+ **********************/
+
+/**********************
+ * GLOBAL PROTOTYPES
+ **********************/
+void lv_port_disp_init(void);
+
+/**********************
+ * MACROS
+ **********************/
+
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /*LV_PORT_DISP_TEMPL_H*/
+
+#endif /*Disable/Enable content*/
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-20 17:30:45 +0000