summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt114
-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
-rw-r--r--src/FreeRTOSConfig.h4
-rw-r--r--src/drivers/SpiMaster.cpp31
-rw-r--r--src/drivers/SpiMaster.h7
-rw-r--r--src/libs/lv_conf.h587
m---------src/libs/lvgl0
-rw-r--r--src/main.cpp21
12 files changed, 1015 insertions, 32 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 580c4653..3395ebef 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -26,6 +26,115 @@ add_definitions(-DDEBUG)
include_directories(.)
+include_directories(libs/)
+
+set(LVGL_SRC
+ libs/lv_conf.h
+ libs/lvgl/lvgl.h
+ libs/lvgl/src/lv_core/lv_obj.c
+ libs/lvgl/src/lv_core/lv_obj.h
+ libs/lvgl/src/lv_core/lv_group.c
+ libs/lvgl/src/lv_core/lv_group.h
+ libs/lvgl/src/lv_core/lv_disp.c
+ libs/lvgl/src/lv_core/lv_disp.h
+ libs/lvgl/src/lv_core/lv_debug.h
+ libs/lvgl/src/lv_core/lv_debug.c
+ libs/lvgl/src/lv_core/lv_indev.c
+ libs/lvgl/src/lv_core/lv_indev.h
+ libs/lvgl/src/lv_core/lv_refr.c
+ libs/lvgl/src/lv_core/lv_refr.h
+ libs/lvgl/src/lv_core/lv_style.c
+ libs/lvgl/src/lv_core/lv_style.h
+
+ libs/lvgl/src/lv_misc/lv_anim.c
+ libs/lvgl/src/lv_misc/lv_anim.h
+ libs/lvgl/src/lv_misc/lv_fs.c
+ libs/lvgl/src/lv_misc/lv_fs.h
+ libs/lvgl/src/lv_misc/lv_task.c
+ libs/lvgl/src/lv_misc/lv_task.h
+ libs/lvgl/src/lv_misc/lv_area.c
+ libs/lvgl/src/lv_misc/lv_area.h
+ libs/lvgl/src/lv_misc/lv_bidi.c
+ libs/lvgl/src/lv_misc/lv_bidi.h
+ libs/lvgl/src/lv_misc/lv_circ.c
+ libs/lvgl/src/lv_misc/lv_circ.h
+ libs/lvgl/src/lv_misc/lv_color.c
+ libs/lvgl/src/lv_misc/lv_color.h
+ libs/lvgl/src/lv_misc/lv_fs.c
+ libs/lvgl/src/lv_misc/lv_fs.h
+ libs/lvgl/src/lv_misc/lv_gc.c
+ libs/lvgl/src/lv_misc/lv_gc.h
+ libs/lvgl/src/lv_misc/lv_ll.c
+ libs/lvgl/src/lv_misc/lv_ll.h
+ libs/lvgl/src/lv_misc/lv_log.c
+ libs/lvgl/src/lv_misc/lv_log.h
+ libs/lvgl/src/lv_misc/lv_math.c
+ libs/lvgl/src/lv_misc/lv_math.h
+ libs/lvgl/src/lv_misc/lv_mem.c
+ libs/lvgl/src/lv_misc/lv_mem.h
+ libs/lvgl/src/lv_misc/lv_printf.c
+ libs/lvgl/src/lv_misc/lv_printf.h
+ libs/lvgl/src/lv_misc/lv_task.c
+ libs/lvgl/src/lv_misc/lv_task.h
+ libs/lvgl/src/lv_misc/lv_templ.c
+ libs/lvgl/src/lv_misc/lv_templ.h
+ libs/lvgl/src/lv_misc/lv_txt.c
+ libs/lvgl/src/lv_misc/lv_txt.h
+ libs/lvgl/src/lv_misc/lv_types.h
+ libs/lvgl/src/lv_misc/lv_utils.c
+ libs/lvgl/src/lv_misc/lv_utils.h
+
+ libs/lvgl/src/lv_draw/lv_draw.c
+ libs/lvgl/src/lv_draw/lv_draw.h
+ libs/lvgl/src/lv_draw/lv_draw_arc.c
+ libs/lvgl/src/lv_draw/lv_draw_arc.h
+ libs/lvgl/src/lv_draw/lv_draw_basic.c
+ libs/lvgl/src/lv_draw/lv_draw_basic.h
+ libs/lvgl/src/lv_draw/lv_draw_img.c
+ libs/lvgl/src/lv_draw/lv_draw_img.h
+ libs/lvgl/src/lv_draw/lv_draw_label.c
+ libs/lvgl/src/lv_draw/lv_draw_label.h
+ libs/lvgl/src/lv_draw/lv_draw_line.c
+ libs/lvgl/src/lv_draw/lv_draw_line.h
+ libs/lvgl/src/lv_draw/lv_draw_rect.c
+ libs/lvgl/src/lv_draw/lv_draw_rect.h
+ libs/lvgl/src/lv_draw/lv_draw_triangle.c
+ libs/lvgl/src/lv_draw/lv_draw_triangle.h
+ libs/lvgl/src/lv_draw/lv_img_cache.c
+ libs/lvgl/src/lv_draw/lv_img_cache.h
+ libs/lvgl/src/lv_draw/lv_img_decoder.c
+ libs/lvgl/src/lv_draw/lv_img_decoder.h
+
+ libs/lvgl/src/lv_hal/lv_hal.h
+ libs/lvgl/src/lv_hal/lv_hal_disp.c
+ libs/lvgl/src/lv_hal/lv_hal_disp.h
+ libs/lvgl/src/lv_hal/lv_hal_indev.c
+ libs/lvgl/src/lv_hal/lv_hal_indev.h
+ libs/lvgl/src/lv_hal/lv_hal_tick.c
+ libs/lvgl/src/lv_hal/lv_hal_tick.h
+
+ libs/lvgl/src/lv_font/lv_font.c
+ libs/lvgl/src/lv_font/lv_font.h
+ libs/lvgl/src/lv_font/lv_font_fmt_txt.c
+ libs/lvgl/src/lv_font/lv_font_fmt_txt.h
+ libs/lvgl/src/lv_font/lv_font_roboto_16.c
+ libs/lvgl/src/lv_font/lv_font_roboto_28_compressed.c
+ libs/lvgl/src/lv_font/lv_symbol_def.h
+
+ libs/lvgl/src/lv_themes/lv_theme.c
+ libs/lvgl/src/lv_themes/lv_theme.h
+
+ libs/lvgl/src/lv_objx/lv_btn.h
+ libs/lvgl/src/lv_objx/lv_btn.c
+
+ libs/lvgl/src/lv_objx/lv_cont.h
+ libs/lvgl/src/lv_objx/lv_cont.c
+
+ libs/lvgl/src/lv_objx/lv_label.h
+ libs/lvgl/src/lv_objx/lv_label.c
+
+
+ )
list(APPEND SOURCE_FILES
Logging/NrfLogger.cpp
@@ -48,6 +157,9 @@ list(APPEND SOURCE_FILES
FreeRTOS/port.c
FreeRTOS/port_cmsis_systick.c
FreeRTOS/port_cmsis.c
+ ${LVGL_SRC}
+
+ DisplayApp/lv_port_disp.cpp
)
set(INCLUDE_FILES
@@ -78,6 +190,8 @@ set(INCLUDE_FILES
libs/date/includes/date/julian.h
libs/date/includes/date/ptz.h
libs/date/includes/date/tz_private.h
+
+ DisplayApp/lv_port_disp.h
)
include_directories(
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*/
diff --git a/src/FreeRTOSConfig.h b/src/FreeRTOSConfig.h
index ecc631bb..609c3f2b 100644
--- a/src/FreeRTOSConfig.h
+++ b/src/FreeRTOSConfig.h
@@ -63,7 +63,7 @@
#define configTICK_RATE_HZ 1024
#define configMAX_PRIORITIES ( 3 )
#define configMINIMAL_STACK_SIZE ( 120 )
-#define configTOTAL_HEAP_SIZE ( 24000 )
+#define configTOTAL_HEAP_SIZE ( 1024*10 )
#define configMAX_TASK_NAME_LEN ( 4 )
#define configUSE_16_BIT_TICKS 0
#define configIDLE_SHOULD_YIELD 1
@@ -78,7 +78,7 @@
#define configENABLE_BACKWARD_COMPATIBILITY 1
/* Hook function related definitions. */
-#define configUSE_IDLE_HOOK 0
+#define configUSE_IDLE_HOOK 1
#define configUSE_TICK_HOOK 0
#define configCHECK_FOR_STACK_OVERFLOW 0
#define configUSE_MALLOC_FAILED_HOOK 0
diff --git a/src/drivers/SpiMaster.cpp b/src/drivers/SpiMaster.cpp
index 4a875b9e..71986054 100644
--- a/src/drivers/SpiMaster.cpp
+++ b/src/drivers/SpiMaster.cpp
@@ -1,7 +1,10 @@
+#include <FreeRTOS.h>
#include <hal/nrf_gpio.h>
#include <hal/nrf_spim.h>
#include "SpiMaster.h"
#include <algorithm>
+#include <task.h>
+
using namespace Pinetime::Drivers;
SpiMaster::SpiMaster(const SpiMaster::SpiModule spi, const SpiMaster::Parameters &params) :
@@ -96,7 +99,7 @@ void SpiMaster::DisableWorkaroundForFtpan58(NRF_SPIM_Type *spim, uint32_t ppi_ch
spim->INTENSET = (1<<19);
}
-void SpiMaster::OnEndEvent(BufferProvider& provider) {
+void SpiMaster::OnEndEvent() {
if(!busy) return;
auto s = currentBufferSize;
@@ -110,24 +113,20 @@ void SpiMaster::OnEndEvent(BufferProvider& provider) {
} else {
uint8_t* buffer = nullptr;
size_t size = 0;
- if(provider.GetNextBuffer(&buffer, size)) {
- currentBufferAddr = (uint32_t) buffer;
- currentBufferSize = size;
- auto s = currentBufferSize;
- auto currentSize = std::min((size_t)255, s);
- PrepareTx(currentBufferAddr, currentSize);
- currentBufferAddr += currentSize;
- currentBufferSize -= currentSize;
-
- spiBaseAddress->TASKS_START = 1;
- } else {
- busy = false;
- nrf_gpio_pin_set(pinCsn);
+ busy = false;
+
+
+ if(taskToNotify != nullptr) {
+ BaseType_t xHigherPriorityTaskWoken = pdFALSE;
+ vTaskNotifyGiveFromISR(taskToNotify, &xHigherPriorityTaskWoken);
+ portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
}
+
+ nrf_gpio_pin_set(pinCsn);
}
}
-void SpiMaster::OnStartedEvent(BufferProvider& provider) {
+void SpiMaster::OnStartedEvent() {
if(!busy) return;
}
@@ -143,7 +142,7 @@ void SpiMaster::PrepareTx(const volatile uint32_t bufferAddress, const volatile
bool SpiMaster::Write(const uint8_t *data, size_t size) {
if(data == nullptr) return false;
-
+ taskToNotify = xTaskGetCurrentTaskHandle();
while(busy) {
asm("nop");
}
diff --git a/src/drivers/SpiMaster.h b/src/drivers/SpiMaster.h
index 60013242..82042bdf 100644
--- a/src/drivers/SpiMaster.h
+++ b/src/drivers/SpiMaster.h
@@ -1,8 +1,10 @@
#pragma once
+#include <FreeRTOS.h>
#include <cstdint>
#include <cstddef>
#include <array>
#include <atomic>
+#include <task.h>
#include "BufferProvider.h"
namespace Pinetime {
@@ -27,8 +29,8 @@ namespace Pinetime {
bool Init();
bool Write(const uint8_t* data, size_t size);
- void OnStartedEvent(BufferProvider& provider);
- void OnEndEvent(BufferProvider& provider);
+ void OnStartedEvent();
+ void OnEndEvent();
void Sleep();
void Wakeup();
@@ -47,6 +49,7 @@ namespace Pinetime {
volatile bool busy = false;
volatile uint32_t currentBufferAddr = 0;
volatile size_t currentBufferSize = 0;
+ volatile TaskHandle_t taskToNotify;
};
}
}
diff --git a/src/libs/lv_conf.h b/src/libs/lv_conf.h
new file mode 100644
index 00000000..49a3072d
--- /dev/null
+++ b/src/libs/lv_conf.h
@@ -0,0 +1,587 @@
+/**
+ * @file lv_conf.h
+ *
+ */
+
+#if 1 /*Set it to "1" to enable content*/
+
+#ifndef LV_CONF_H
+#define LV_CONF_H
+/* clang-format off */
+
+#include <stdint.h>
+
+/*====================
+ Graphical settings
+ *====================*/
+
+/* Maximal horizontal and vertical resolution to support by the library.*/
+#define LV_HOR_RES_MAX (240)
+#define LV_VER_RES_MAX (240)
+
+/* Color depth:
+ * - 1: 1 byte per pixel
+ * - 8: RGB233
+ * - 16: RGB565
+ * - 32: ARGB8888
+ */
+#define LV_COLOR_DEPTH 16
+
+/* Swap the 2 bytes of RGB565 color.
+ * Useful if the display has a 8 bit interface (e.g. SPI)*/
+#define LV_COLOR_16_SWAP 1
+
+/* 1: Enable screen transparency.
+ * Useful for OSD or other overlapping GUIs.
+ * Requires `LV_COLOR_DEPTH = 32` colors and the screen's style should be modified: `style.body.opa = ...`*/
+#define LV_COLOR_SCREEN_TRANSP 0
+
+/*Images pixels with this color will not be drawn (with chroma keying)*/
+#define LV_COLOR_TRANSP LV_COLOR_LIME /*LV_COLOR_LIME: pure green*/
+
+/* Enable chroma keying for indexed images. */
+#define LV_INDEXED_CHROMA 1
+
+/* Enable anti-aliasing (lines, and radiuses will be smoothed) */
+#define LV_ANTIALIAS 1
+
+/* Default display refresh period.
+ * Can be changed in the display driver (`lv_disp_drv_t`).*/
+#define LV_DISP_DEF_REFR_PERIOD 30 /*[ms]*/
+
+/* Dot Per Inch: used to initialize default sizes.
+ * E.g. a button with width = LV_DPI / 2 -> half inch wide
+ * (Not so important, you can adjust it to modify default sizes and spaces)*/
+#define LV_DPI 100 /*[px]*/
+
+/* Type of coordinates. Should be `int16_t` (or `int32_t` for extreme cases) */
+typedef int16_t lv_coord_t;
+
+/*=========================
+ Memory manager settings
+ *=========================*/
+
+/* LittelvGL's internal memory manager's settings.
+ * The graphical objects and other related data are stored here. */
+
+/* 1: use custom malloc/free, 0: use the built-in `lv_mem_alloc` and `lv_mem_free` */
+#define LV_MEM_CUSTOM 0
+#if LV_MEM_CUSTOM == 0
+/* Size of the memory used by `lv_mem_alloc` in bytes (>= 2kB)*/
+# define LV_MEM_SIZE (4U * 1024U)
+
+/* Complier prefix for a big array declaration */
+# define LV_MEM_ATTR
+
+/* Set an address for the memory pool instead of allocating it as an array.
+ * Can be in external SRAM too. */
+# define LV_MEM_ADR 0
+
+/* Automatically defrag. on free. Defrag. means joining the adjacent free cells. */
+# define LV_MEM_AUTO_DEFRAG 1
+#else /*LV_MEM_CUSTOM*/
+# define LV_MEM_CUSTOM_INCLUDE <stdlib.h> /*Header for the dynamic memory function*/
+# define LV_MEM_CUSTOM_ALLOC malloc /*Wrapper to malloc*/
+# define LV_MEM_CUSTOM_FREE free /*Wrapper to free*/
+#endif /*LV_MEM_CUSTOM*/
+
+/* Garbage Collector settings
+ * Used if lvgl is binded to higher level language and the memory is managed by that language */
+#define LV_ENABLE_GC 0
+#if LV_ENABLE_GC != 0
+# define LV_GC_INCLUDE "gc.h" /*Include Garbage Collector related things*/
+# define LV_MEM_CUSTOM_REALLOC your_realloc /*Wrapper to realloc*/
+# define LV_MEM_CUSTOM_GET_SIZE your_mem_get_size /*Wrapper to lv_mem_get_size*/
+#endif /* LV_ENABLE_GC */
+
+/*=======================
+ Input device settings
+ *=======================*/
+
+/* Input device default settings.
+ * Can be changed in the Input device driver (`lv_indev_drv_t`)*/
+
+/* Input device read period in milliseconds */
+#define LV_INDEV_DEF_READ_PERIOD 30
+
+/* Drag threshold in pixels */
+#define LV_INDEV_DEF_DRAG_LIMIT 10
+
+/* Drag throw slow-down in [%]. Greater value -> faster slow-down */
+#define LV_INDEV_DEF_DRAG_THROW 20
+
+/* Long press time in milliseconds.
+ * Time to send `LV_EVENT_LONG_PRESSSED`) */
+#define LV_INDEV_DEF_LONG_PRESS_TIME 400
+
+/* Repeated trigger period in long press [ms]
+ * Time between `LV_EVENT_LONG_PRESSED_REPEAT */
+#define LV_INDEV_DEF_LONG_PRESS_REP_TIME 100
+
+/*==================
+ * Feature usage
+ *==================*/
+
+/*1: Enable the Animations */
+#define LV_USE_ANIMATION 1
+#if LV_USE_ANIMATION
+
+/*Declare the type of the user data of animations (can be e.g. `void *`, `int`, `struct`)*/
+typedef void * lv_anim_user_data_t;
+
+#endif
+
+/* 1: Enable shadow drawing*/
+#define LV_USE_SHADOW 1
+
+/* 1: Enable object groups (for keyboard/encoder navigation) */
+#define LV_USE_GROUP 0
+#if LV_USE_GROUP
+typedef void * lv_group_user_data_t;
+#endif /*LV_USE_GROUP*/
+
+/* 1: Enable GPU interface*/
+#define LV_USE_GPU 0
+
+/* 1: Enable file system (might be required for images */
+#define LV_USE_FILESYSTEM 0
+#if LV_USE_FILESYSTEM
+/*Declare the type of the user data of file system drivers (can be e.g. `void *`, `int`, `struct`)*/
+typedef void * lv_fs_drv_user_data_t;
+#endif
+
+/*1: Add a `user_data` to drivers and objects*/
+#define LV_USE_USER_DATA 1
+
+/*========================
+ * Image decoder and cache
+ *========================*/
+
+/* 1: Enable indexed (palette) images */
+#define LV_IMG_CF_INDEXED 1
+
+/* 1: Enable alpha indexed images */
+#define LV_IMG_CF_ALPHA 1
+
+/* Default image cache size. Image caching keeps the images opened.
+ * If only the built-in image formats are used there is no real advantage of caching.
+ * (I.e. no new image decoder is added)
+ * With complex image decoders (e.g. PNG or JPG) caching can save the continuous open/decode of images.
+ * However the opened images might consume additional RAM.
+ * LV_IMG_CACHE_DEF_SIZE must be >= 1 */
+#define LV_IMG_CACHE_DEF_SIZE 1
+
+/*Declare the type of the user data of image decoder (can be e.g. `void *`, `int`, `struct`)*/
+typedef void * lv_img_decoder_user_data_t;
+
+/*=====================
+ * Compiler settings
+ *====================*/
+/* Define a custom attribute to `lv_tick_inc` function */
+#define LV_ATTRIBUTE_TICK_INC
+
+/* Define a custom attribute to `lv_task_handler` function */
+#define LV_ATTRIBUTE_TASK_HANDLER
+
+/* With size optimization (-Os) the compiler might not align data to
+ * 4 or 8 byte boundary. This alignment will be explicitly applied where needed.
+ * E.g. __attribute__((aligned(4))) */
+#define LV_ATTRIBUTE_MEM_ALIGN
+
+/* Attribute to mark large constant arrays for example
+ * font's bitmaps */
+#define LV_ATTRIBUTE_LARGE_CONST
+
+/* Export integer constant to binding.
+ * This macro is used with constants in the form of LV_<CONST> that
+ * should also appear on lvgl binding API such as Micropython
+ *
+ * The default value just prevents a GCC warning.
+ */
+#define LV_EXPORT_CONST_INT(int_value) struct _silence_gcc_warning
+
+/*===================
+ * HAL settings
+ *==================*/
+
+/* 1: use a custom tick source.
+ * It removes the need to manually update the tick with `lv_tick_inc`) */
+#define LV_TICK_CUSTOM 0
+#if LV_TICK_CUSTOM == 1
+#define LV_TICK_CUSTOM_INCLUDE "something.h" /*Header for the sys time function*/
+#define LV_TICK_CUSTOM_SYS_TIME_EXPR (millis()) /*Expression evaluating to current systime in ms*/
+#endif /*LV_TICK_CUSTOM*/
+
+typedef void * lv_disp_drv_user_data_t; /*Type of user data in the display driver*/
+typedef void * lv_indev_drv_user_data_t; /*Type of user data in the input device driver*/
+
+/*================
+ * Log settings
+ *===============*/
+
+/*1: Enable the log module*/
+#define LV_USE_LOG 0
+#if LV_USE_LOG
+/* How important log should be added:
+ * LV_LOG_LEVEL_TRACE A lot of logs to give detailed information
+ * LV_LOG_LEVEL_INFO Log important events
+ * LV_LOG_LEVEL_WARN Log if something unwanted happened but didn't cause a problem
+ * LV_LOG_LEVEL_ERROR Only critical issue, when the system may fail
+ * LV_LOG_LEVEL_NONE Do not log anything
+ */
+# define LV_LOG_LEVEL LV_LOG_LEVEL_WARN
+
+/* 1: Print the log with 'printf';
+ * 0: user need to register a callback with `lv_log_register_print_cb`*/
+# define LV_LOG_PRINTF 0
+#endif /*LV_USE_LOG*/
+
+/*=================
+ * Debug settings
+ *================*/
+
+/* If Debug is enabled LittelvGL validates the parameters of the functions.
+ * If an invalid parameter is found an error log message is printed and
+ * the MCU halts at the error. (`LV_USE_LOG` should be enabled)
+ * If you are debugging the MCU you can pause
+ * the debugger to see exactly where the issue is.
+ *
+ * The behavior of asserts can be overwritten by redefining them here.
+ * E.g. #define LV_ASSERT_MEM(p) <my_assert_code>
+ */
+#define LV_USE_DEBUG 1
+#if LV_USE_DEBUG
+
+/*Check if the parameter is NULL. (Quite fast) */
+#define LV_USE_ASSERT_NULL 1
+
+/*Checks is the memory is successfully allocated or no. (Quite fast)*/
+#define LV_USE_ASSERT_MEM 1
+
+/* Check the strings.
+ * Search for NULL, very long strings, invalid characters, and unnatural repetitions. (Slow)
+ * If disabled `LV_USE_ASSERT_NULL` will be performed instead (if it's enabled) */
+#define LV_USE_ASSERT_STR 0
+
+/* Check NULL, the object's type and existence (e.g. not deleted). (Quite slow)
+ * If disabled `LV_USE_ASSERT_NULL` will be performed instead (if it's enabled) */
+#define LV_USE_ASSERT_OBJ 0
+
+/*Check if the styles are properly initialized. (Fast)*/
+#define LV_USE_ASSERT_STYLE 1
+
+#endif /*LV_USE_DEBUG*/
+
+/*================
+ * THEME USAGE
+ *================*/
+#define LV_THEME_LIVE_UPDATE 0 /*1: Allow theme switching at run time. Uses 8..10 kB of RAM*/
+
+#define LV_USE_THEME_TEMPL 0 /*Just for test*/
+#define LV_USE_THEME_DEFAULT 0 /*Built mainly from the built-in styles. Consumes very few RAM*/
+#define LV_USE_THEME_ALIEN 0 /*Dark futuristic theme*/
+#define LV_USE_THEME_NIGHT 0 /*Dark elegant theme*/
+#define LV_USE_THEME_MONO 0 /*Mono color theme for monochrome displays*/
+#define LV_USE_THEME_MATERIAL 0 /*Flat theme with bold colors and light shadows*/
+#define LV_USE_THEME_ZEN 0 /*Peaceful, mainly light theme */
+#define LV_USE_THEME_NEMO 0 /*Water-like theme based on the movie "Finding Nemo"*/
+
+/*==================
+ * FONT USAGE
+ *===================*/
+
+/* The built-in fonts contains the ASCII range and some Symbols with 4 bit-per-pixel.
+ * The symbols are available via `LV_SYMBOL_...` defines
+ * More info about fonts: https://docs.littlevgl.com/#Fonts
+ * To create a new font go to: https://littlevgl.com/ttf-font-to-c-array
+ */
+
+/* Robot fonts with bpp = 4
+ * https://fonts.google.com/specimen/Roboto */
+#define LV_FONT_ROBOTO_12 0
+#define LV_FONT_ROBOTO_16 1
+#define LV_FONT_ROBOTO_22 0
+#define LV_FONT_ROBOTO_28 0
+
+/* Demonstrate special features */
+#define LV_FONT_ROBOTO_12_SUBPX 1
+#define LV_FONT_ROBOTO_28_COMPRESSED 1 /*bpp = 3*/
+
+/*Pixel perfect monospace font
+ * http://pelulamu.net/unscii/ */
+#define LV_FONT_UNSCII_8 0
+
+/* Optionally declare your custom fonts here.
+ * You can use these fonts as default font too
+ * and they will be available globally. E.g.
+ * #define LV_FONT_CUSTOM_DECLARE LV_FONT_DECLARE(my_font_1) \
+ * LV_FONT_DECLARE(my_font_2)
+ */
+#define LV_FONT_CUSTOM_DECLARE
+
+/*Always set a default font from the built-in fonts*/
+#define LV_FONT_DEFAULT &lv_font_roboto_16
+
+/* Enable it if you have fonts with a lot of characters.
+ * The limit depends on the font size, font face and bpp
+ * but with > 10,000 characters if you see issues probably you need to enable it.*/
+#define LV_FONT_FMT_TXT_LARGE 0
+
+/* Set the pixel order of the display.
+ * Important only if "subpx fonts" are used.
+ * With "normal" font it doesn't matter.
+ */
+#define LV_FONT_SUBPX_BGR 0
+
+/*Declare the type of the user data of fonts (can be e.g. `void *`, `int`, `struct`)*/
+typedef void * lv_font_user_data_t;
+
+/*=================
+ * Text settings
+ *=================*/
+
+/* Select a character encoding for strings.
+ * Your IDE or editor should have the same character encoding
+ * - LV_TXT_ENC_UTF8
+ * - LV_TXT_ENC_ASCII
+ * */
+#define LV_TXT_ENC LV_TXT_ENC_UTF8
+
+ /*Can break (wrap) texts on these chars*/
+#define LV_TXT_BREAK_CHARS " ,.;:-_"
+
+/* If a word is at least this long, will break wherever "prettiest"
+ * To disable, set to a value <= 0 */
+#define LV_TXT_LINE_BREAK_LONG_LEN 12
+
+/* Minimum number of characters in a long word to put on a line before a break.
+ * Depends on LV_TXT_LINE_BREAK_LONG_LEN. */
+#define LV_TXT_LINE_BREAK_LONG_PRE_MIN_LEN 3
+
+/* Minimum number of characters in a long word to put on a line after a break.
+ * Depends on LV_TXT_LINE_BREAK_LONG_LEN. */
+#define LV_TXT_LINE_BREAK_LONG_POST_MIN_LEN 3
+
+/* The control character to use for signalling text recoloring. */
+#define LV_TXT_COLOR_CMD "#"
+
+/* Support bidirectional texts.
+ * Allows mixing Left-to-Right and Right-to-Left texts.
+ * The direction will be processed according to the Unicode Bidirectioanl Algorithm:
+ * https://www.w3.org/International/articles/inline-bidi-markup/uba-basics*/
+#define LV_USE_BIDI 0
+#if LV_USE_BIDI
+/* Set the default direction. Supported values:
+ * `LV_BIDI_DIR_LTR` Left-to-Right
+ * `LV_BIDI_DIR_RTL` Right-to-Left
+ * `LV_BIDI_DIR_AUTO` detect texts base direction */
+#define LV_BIDI_BASE_DIR_DEF LV_BIDI_DIR_AUTO
+#endif
+
+/*Change the built in (v)snprintf functions*/
+#define LV_SPRINTF_CUSTOM 0
+#if LV_SPRINTF_CUSTOM
+# define LV_SPRINTF_INCLUDE <stdio.h>
+# define lv_snprintf snprintf
+# define lv_vsnprintf vsnprintf
+#endif /*LV_SPRINTF_CUSTOM*/
+
+/*===================
+ * LV_OBJ SETTINGS
+ *==================*/
+
+/*Declare the type of the user data of object (can be e.g. `void *`, `int`, `struct`)*/
+typedef void * lv_obj_user_data_t;
+
+/*1: enable `lv_obj_realaign()` based on `lv_obj_align()` parameters*/
+#define LV_USE_OBJ_REALIGN 1
+
+/* Enable to make the object clickable on a larger area.
+ * LV_EXT_CLICK_AREA_OFF or 0: Disable this feature
+ * LV_EXT_CLICK_AREA_TINY: The extra area can be adjusted horizontally and vertically (0..255 px)
+ * LV_EXT_CLICK_AREA_FULL: The extra area can be adjusted in all 4 directions (-32k..+32k px)
+ */
+#define LV_USE_EXT_CLICK_AREA LV_EXT_CLICK_AREA_OFF
+
+/*==================
+ * LV OBJ X USAGE
+ *================*/
+/*
+ * Documentation of the object types: https://docs.littlevgl.com/#Object-types
+ */
+
+/*Arc (dependencies: -)*/
+#define LV_USE_ARC 1
+
+/*Bar (dependencies: -)*/
+#define LV_USE_BAR 1
+
+/*Button (dependencies: lv_cont*/
+#define LV_USE_BTN 1
+#if LV_USE_BTN != 0
+/*Enable button-state animations - draw a circle on click (dependencies: LV_USE_ANIMATION)*/
+# define LV_BTN_INK_EFFECT 0
+#endif
+
+/*Button matrix (dependencies: -)*/
+#define LV_USE_BTNM 1
+
+/*Calendar (dependencies: -)*/
+#define LV_USE_CALENDAR 1
+
+/*Canvas (dependencies: lv_img)*/
+#define LV_USE_CANVAS 1
+
+/*Check box (dependencies: lv_btn, lv_label)*/
+#define LV_USE_CB 1
+
+/*Chart (dependencies: -)*/
+#define LV_USE_CHART 1
+#if LV_USE_CHART
+# define LV_CHART_AXIS_TICK_LABEL_MAX_LEN 20
+#endif
+
+/*Container (dependencies: -*/
+#define LV_USE_CONT 1
+
+/*Color picker (dependencies: -*/
+#define LV_USE_CPICKER 1
+
+/*Drop down list (dependencies: lv_page, lv_label, lv_symbol_def.h)*/
+#define LV_USE_DDLIST 1
+#if LV_USE_DDLIST != 0
+/*Open and close default animation time [ms] (0: no animation)*/
+# define LV_DDLIST_DEF_ANIM_TIME 200
+#endif
+
+/*Gauge (dependencies:lv_bar, lv_lmeter)*/
+#define LV_USE_GAUGE 1
+
+/*Image (dependencies: lv_label*/
+#define LV_USE_IMG 1
+
+/*Image Button (dependencies: lv_btn*/
+#define LV_USE_IMGBTN 1
+#if LV_USE_IMGBTN
+/*1: The imgbtn requires left, mid and right parts and the width can be set freely*/
+# define LV_IMGBTN_TILED 0
+#endif
+
+/*Keyboard (dependencies: lv_btnm)*/
+#define LV_USE_KB 1
+
+/*Label (dependencies: -*/
+#define LV_USE_LABEL 1
+#if LV_USE_LABEL != 0
+/*Hor, or ver. scroll speed [px/sec] in 'LV_LABEL_LONG_ROLL/ROLL_CIRC' mode*/
+# define LV_LABEL_DEF_SCROLL_SPEED 25
+
+/* Waiting period at beginning/end of animation cycle */
+# define LV_LABEL_WAIT_CHAR_COUNT 3
+
+/*Enable selecting text of the label */
+# define LV_LABEL_TEXT_SEL 0
+
+/*Store extra some info in labels (12 bytes) to speed up drawing of very long texts*/
+# define LV_LABEL_LONG_TXT_HINT 0
+#endif
+
+/*LED (dependencies: -)*/
+#define LV_USE_LED 1
+
+/*Line (dependencies: -*/
+#define LV_USE_LINE 1
+
+/*List (dependencies: lv_page, lv_btn, lv_label, (lv_img optionally for icons ))*/
+#define LV_USE_LIST 1
+#if LV_USE_LIST != 0
+/*Default animation time of focusing to a list element [ms] (0: no animation) */
+# define LV_LIST_DEF_ANIM_TIME 100
+#endif
+
+/*Line meter (dependencies: *;)*/
+#define LV_USE_LMETER 1
+
+/*Message box (dependencies: lv_rect, lv_btnm, lv_label)*/
+#define LV_USE_MBOX 1
+
+/*Page (dependencies: lv_cont)*/
+#define LV_USE_PAGE 1
+#if LV_USE_PAGE != 0
+/*Focus default animation time [ms] (0: no animation)*/
+# define LV_PAGE_DEF_ANIM_TIME 400
+#endif
+
+/*Preload (dependencies: lv_arc, lv_anim)*/
+#define LV_USE_PRELOAD 1
+#if LV_USE_PRELOAD != 0
+# define LV_PRELOAD_DEF_ARC_LENGTH 60 /*[deg]*/
+# define LV_PRELOAD_DEF_SPIN_TIME 1000 /*[ms]*/
+# define LV_PRELOAD_DEF_ANIM LV_PRELOAD_TYPE_SPINNING_ARC
+#endif
+
+/*Roller (dependencies: lv_ddlist)*/
+#define LV_USE_ROLLER 1
+#if LV_USE_ROLLER != 0
+/*Focus animation time [ms] (0: no animation)*/
+# define LV_ROLLER_DEF_ANIM_TIME 200
+
+/*Number of extra "pages" when the roller is infinite*/
+# define LV_ROLLER_INF_PAGES 7
+#endif
+
+/*Slider (dependencies: lv_bar)*/
+#define LV_USE_SLIDER 1
+
+/*Spinbox (dependencies: lv_ta)*/
+#define LV_USE_SPINBOX 1
+
+/*Switch (dependencies: lv_slider)*/
+#define LV_USE_SW 1
+
+/*Text area (dependencies: lv_label, lv_page)*/
+#define LV_USE_TA 1
+#if LV_USE_TA != 0
+# define LV_TA_DEF_CURSOR_BLINK_TIME 400 /*ms*/
+# define LV_TA_DEF_PWD_SHOW_TIME 1500 /*ms*/
+#endif
+
+/*Table (dependencies: lv_label)*/
+#define LV_USE_TABLE 1
+#if LV_USE_TABLE
+# define LV_TABLE_COL_MAX 12
+#endif
+
+/*Tab (dependencies: lv_page, lv_btnm)*/
+#define LV_USE_TABVIEW 1
+# if LV_USE_TABVIEW != 0
+/*Time of slide animation [ms] (0: no animation)*/
+# define LV_TABVIEW_DEF_ANIM_TIME 300
+#endif
+
+/*Tileview (dependencies: lv_page) */
+#define LV_USE_TILEVIEW 1
+#if LV_USE_TILEVIEW
+/*Time of slide animation [ms] (0: no animation)*/
+# define LV_TILEVIEW_DEF_ANIM_TIME 300
+#endif
+
+/*Window (dependencies: lv_cont, lv_btn, lv_label, lv_img, lv_page)*/
+#define LV_USE_WIN 1
+
+/*==================
+ * Non-user section
+ *==================*/
+
+#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS) /* Disable warnings for Visual Studio*/
+# define _CRT_SECURE_NO_WARNINGS
+#endif
+
+/*--END OF LV_CONF_H--*/
+
+/*Be sure every define has a default value*/
+#include "lvgl/src/lv_conf_checker.h"
+
+#endif /*LV_CONF_H*/
+
+#endif /*End of "Content enable"*/
diff --git a/src/libs/lvgl b/src/libs/lvgl
new file mode 160000
+Subproject 10b9c9b2f5344e7b2f5cc00a19ed86ed56ae986
diff --git a/src/main.cpp b/src/main.cpp
index 13dddca6..4da92b27 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -20,6 +20,8 @@
#include <drivers/SpiMaster.h>
#include <Components/Gfx/Gfx.h>
+#include <lvgl/lvgl.h>
+
#if NRF_LOG_ENABLED
#include "Logging/NrfLogger.h"
Pinetime::Logging::NrfLogger logger;
@@ -30,6 +32,7 @@ Pinetime::Logging::DummyLogger logger;
std::unique_ptr<Pinetime::Drivers::SpiMaster> spi;
std::unique_ptr<Pinetime::Drivers::St7789> lcd;
+Pinetime::Drivers::St7789* ptrLcd;
std::unique_ptr<Pinetime::Components::Gfx> gfx;
std::unique_ptr<Pinetime::Drivers::Cst816S> touchPanel;
@@ -68,6 +71,13 @@ void nrfx_gpiote_evt_handler(nrfx_gpiote_pin_t pin, nrf_gpiote_polarity_t action
portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
}
+
+extern "C" {
+ void vApplicationIdleHook(void) {
+ lv_tick_inc(1);
+ }
+}
+
void DebounceTimerCallback(TimerHandle_t xTimer) {
xTimerStop(xTimer, 0);
if(isSleeping) {
@@ -100,7 +110,7 @@ void SystemTask_PushMessage(SystemTaskMessages message) {
void SystemTask(void *) {
APP_GPIOTE_INIT(2);
bool erase_bonds=false;
- nrf_sdh_freertos_init(ble_manager_start_advertising, &erase_bonds);
+// nrf_sdh_freertos_init(ble_manager_start_advertising, &erase_bonds);
spi.reset(new Pinetime::Drivers::SpiMaster {Pinetime::Drivers::SpiMaster::SpiModule::SPI0, {
Pinetime::Drivers::SpiMaster::BitOrder::Msb_Lsb,
@@ -115,6 +125,7 @@ void SystemTask(void *) {
lcd.reset(new Pinetime::Drivers::St7789(*spi, pinLcdDataCommand));
gfx.reset(new Pinetime::Components::Gfx(*lcd));
touchPanel.reset(new Pinetime::Drivers::Cst816S());
+ ptrLcd = lcd.get();
spi->Init();
lcd->Init();
@@ -197,12 +208,12 @@ void OnNewTime(current_time_char_t* currentTime) {
void SPIM0_SPIS0_TWIM0_TWIS0_SPI0_TWI0_IRQHandler(void) {
if(((NRF_SPIM0->INTENSET & (1<<6)) != 0) && NRF_SPIM0->EVENTS_END == 1) {
NRF_SPIM0->EVENTS_END = 0;
- spi->OnEndEvent(*gfx);
+ spi->OnEndEvent();
}
if(((NRF_SPIM0->INTENSET & (1<<19)) != 0) && NRF_SPIM0->EVENTS_STARTED == 1) {
NRF_SPIM0->EVENTS_STARTED = 0;
- spi->OnStartedEvent(*gfx);
+ spi->OnStartedEvent();
}
if(((NRF_SPIM0->INTENSET & (1<<1)) != 0) && NRF_SPIM0->EVENTS_STOPPED == 1) {
@@ -215,12 +226,12 @@ int main(void) {
if (pdPASS != xTaskCreate(SystemTask, "MAIN", 256, nullptr, 0, &systemThread))
APP_ERROR_HANDLER(NRF_ERROR_NO_MEM);
-
+/*
ble_manager_init();
ble_manager_set_new_time_callback(OnNewTime);
ble_manager_set_ble_connection_callback(OnBleConnection);
ble_manager_set_ble_disconnection_callback(OnBleDisconnection);
-
+*/
vTaskStartScheduler();
for (;;) {
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-20 17:43:13 +0000