InfiniTimeOrg · Quantum-cross · Oct 8, 2021 · Oct 8, 2021 · Oct 8, 2021 · Oct 8, 2021
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,7 @@
 [submodule "src/libs/lvgl"]
 	path = src/libs/lvgl
-	url = https://github.com/joaquimorg/lvgl.git
+	url = https://github.com/lvgl/lvgl.git
+	branch = release/v8.0
 [submodule "src/libs/littlefs"]
 	path = src/libs/littlefs
 	url = https://github.com/littlefs-project/littlefs.git
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
diff --git a/src/FreeRTOSConfig.h b/src/FreeRTOSConfig.h
@@ -79,7 +79,7 @@
 /* Hook function related definitions. */
 #define configUSE_IDLE_HOOK            0
 #define configUSE_TICK_HOOK            0
-#define configCHECK_FOR_STACK_OVERFLOW 0
+#define configCHECK_FOR_STACK_OVERFLOW 1
 #define configUSE_MALLOC_FAILED_HOOK   0
 
 /* Run time and task stats gathering related definitions. */

diff --git a/src/components/fs/FS.cpp b/src/components/fs/FS.cpp
@@ -72,8 +72,8 @@ int FS::FileWrite(lfs_file_t* file_p, const uint8_t* buff, uint32_t size) {
   return lfs_file_write(&lfs, file_p, buff, size);
 }
 
-int FS::FileSeek(lfs_file_t* file_p, uint32_t pos) {
-  return lfs_file_seek(&lfs, file_p, pos, LFS_SEEK_SET);
+int FS::FileSeek(lfs_file_t* file_p, uint32_t pos, lfs_whence_flags whence) {
+  return lfs_file_seek(&lfs, file_p, pos, whence);
 }
 
 int FS::FileDelete(const char* fileName) {
@@ -140,18 +140,16 @@ int FS::SectorRead(const struct lfs_config* c, lfs_block_t block, lfs_off_t off,
 */
 
 namespace {
-  lv_fs_res_t lvglOpen(lv_fs_drv_t* drv, void* file_p, const char* path, lv_fs_mode_t mode) {
+  void * lvglOpen(lv_fs_drv_t* drv, const char* path, lv_fs_mode_t mode) {
 
-    lfs_file_t* file = static_cast<lfs_file_t*>(file_p);
+    lfs_file_t* file = nullptr;
     FS* filesys = static_cast<FS*>(drv->user_data);
     filesys->FileOpen(file, path, LFS_O_RDONLY);
 
     if (file->type == 0) {
-      return LV_FS_RES_FS_ERR;
-    }
-    else {
-      return LV_FS_RES_OK;
+      return nullptr;
     }
+    return file;
   }
 
   lv_fs_res_t lvglClose(lv_fs_drv_t* drv, void* file_p) {
@@ -169,27 +167,30 @@ namespace {
     *br = btr;
     return LV_FS_RES_OK;
   }
-
-  lv_fs_res_t lvglSeek(lv_fs_drv_t* drv, void* file_p, uint32_t pos) {
+  lv_fs_res_t lvglSeek(lv_fs_drv_t* drv, void* file_p, uint32_t pos, lv_fs_whence_t whence) {
     FS* filesys = static_cast<FS*>(drv->user_data);
     lfs_file_t* file = static_cast<lfs_file_t*>(file_p);
-    filesys->FileSeek(file, pos);
+    filesys->FileSeek(file, pos, static_cast<lfs_whence_flags>(whence));
     return LV_FS_RES_OK;
   }
 }
 
 void FS::LVGLFileSystemInit() {
-
-  lv_fs_drv_t fs_drv;
   lv_fs_drv_init(&fs_drv);
 
-  fs_drv.file_size = sizeof(lfs_file_t);
   fs_drv.letter = 'F';
+  fs_drv.ready_cb = nullptr;
   fs_drv.open_cb = lvglOpen;
   fs_drv.close_cb = lvglClose;
   fs_drv.read_cb = lvglRead;
+  fs_drv.write_cb = nullptr;
   fs_drv.seek_cb = lvglSeek;
-
+  fs_drv.tell_cb = nullptr;
+
+  fs_drv.dir_open_cb = nullptr;
+  fs_drv.dir_read_cb = nullptr;
+  fs_drv.dir_close_cb = nullptr;
+
   fs_drv.user_data = this;
 
   lv_fs_drv_register(&fs_drv);

diff --git a/src/components/fs/FS.h b/src/components/fs/FS.h
@@ -3,6 +3,7 @@
 #include <cstdint>
 #include "drivers/SpiNorFlash.h"
 #include <littlefs/lfs.h>
+#include <lvgl/lvgl.h>
 
 namespace Pinetime {
   namespace Controllers {
@@ -17,7 +18,7 @@ namespace Pinetime {
       int FileClose(lfs_file_t* file_p);
       int FileRead(lfs_file_t* file_p, uint8_t* buff, uint32_t size);
       int FileWrite(lfs_file_t* file_p, const uint8_t* buff, uint32_t size);
-      int FileSeek(lfs_file_t* file_p, uint32_t pos);
+      int FileSeek(lfs_file_t* file_p, uint32_t pos, lfs_whence_flags whence);
 
       int FileDelete(const char* fileName);
 
@@ -55,7 +56,9 @@ namespace Pinetime {
       static constexpr size_t startAddress = 0x0B4000;
       static constexpr size_t size = 0x34C000;
       static constexpr size_t blockSize = 4096;
-
+
+      lv_fs_drv_t fs_drv;
+
       bool resourcesValid = false;
       const struct lfs_config lfsConfig;
 

diff --git a/src/components/gfx/Gfx.cpp b/src/components/gfx/Gfx.cpp
@@ -184,7 +184,7 @@ void Gfx::NotifyEndOfTransfer(TaskHandle_t task) {
 }
 
 void Gfx::WaitTransferFinished() const {
-  ulTaskNotifyTake(pdTRUE, 500);
+//  ulTaskNotifyTake(pdTRUE, 500);
 }
 
 void Gfx::SetScrollArea(uint16_t topFixedLines, uint16_t scrollLines, uint16_t bottomFixedLines) {

diff --git a/src/displayapp/Colors.cpp b/src/displayapp/Colors.cpp
@@ -5,23 +5,23 @@ using namespace Pinetime::Controllers;
 
 lv_color_t Pinetime::Applications::Convert(Pinetime::Controllers::Settings::Colors color) {
   switch (color) {
-    case Pinetime::Controllers::Settings::Colors::White: return LV_COLOR_WHITE;
-    case Pinetime::Controllers::Settings::Colors::Silver: return LV_COLOR_SILVER;
-    case Pinetime::Controllers::Settings::Colors::Gray: return LV_COLOR_GRAY;
-    case Pinetime::Controllers::Settings::Colors::Black: return LV_COLOR_BLACK;
-    case Pinetime::Controllers::Settings::Colors::Red: return LV_COLOR_RED;
-    case Pinetime::Controllers::Settings::Colors::Maroon: return LV_COLOR_MAROON;
-    case Pinetime::Controllers::Settings::Colors::Yellow: return LV_COLOR_YELLOW;
-    case Pinetime::Controllers::Settings::Colors::Olive: return LV_COLOR_OLIVE;
-    case Pinetime::Controllers::Settings::Colors::Lime: return LV_COLOR_LIME;
-    case Pinetime::Controllers::Settings::Colors::Green: return LV_COLOR_GREEN;
-    case Pinetime::Controllers::Settings::Colors::Cyan: return LV_COLOR_CYAN;
-    case Pinetime::Controllers::Settings::Colors::Teal: return LV_COLOR_TEAL;
-    case Pinetime::Controllers::Settings::Colors::Blue: return LV_COLOR_BLUE;
-    case Pinetime::Controllers::Settings::Colors::Navy: return LV_COLOR_NAVY;
-    case Pinetime::Controllers::Settings::Colors::Magenta: return LV_COLOR_MAGENTA;
-    case Pinetime::Controllers::Settings::Colors::Purple: return LV_COLOR_PURPLE;
-    case Pinetime::Controllers::Settings::Colors::Orange: return LV_COLOR_ORANGE;
-    default: return LV_COLOR_WHITE;
+    case Pinetime::Controllers::Settings::Colors::White: return lv_color_white();
+    case Pinetime::Controllers::Settings::Colors::Silver: return lv_color_hex(0xC0C0C0);
+    case Pinetime::Controllers::Settings::Colors::Gray: return lv_palette_main(LV_PALETTE_GREY);
+    case Pinetime::Controllers::Settings::Colors::Black: return lv_color_black();
+    case Pinetime::Controllers::Settings::Colors::Red: return lv_palette_main(LV_PALETTE_RED);
+    case Pinetime::Controllers::Settings::Colors::Maroon: return lv_color_hex(0x800000);
+    case Pinetime::Controllers::Settings::Colors::Yellow: return lv_palette_main(LV_PALETTE_YELLOW);
+    case Pinetime::Controllers::Settings::Colors::Olive: return lv_color_hex(0x808000);
+    case Pinetime::Controllers::Settings::Colors::Lime: return lv_color_hex(0x00FF00);
+    case Pinetime::Controllers::Settings::Colors::Green: return lv_palette_main(LV_PALETTE_GREEN);
+    case Pinetime::Controllers::Settings::Colors::Cyan: return lv_color_hex(0x00FFFF);
+    case Pinetime::Controllers::Settings::Colors::Teal: return lv_color_hex(0x008080);
+    case Pinetime::Controllers::Settings::Colors::Blue: return lv_palette_main(LV_PALETTE_BLUE);
+    case Pinetime::Controllers::Settings::Colors::Navy: return lv_color_hex(0x000080);
+    case Pinetime::Controllers::Settings::Colors::Magenta: return lv_color_hex(0xFF00FF);
+    case Pinetime::Controllers::Settings::Colors::Purple: return lv_color_hex(0x800080);
+    case Pinetime::Controllers::Settings::Colors::Orange: return lv_palette_main(LV_PALETTE_ORANGE);
+    default: return lv_color_white();
   }
 }
diff --git a/src/displayapp/Colors.h b/src/displayapp/Colors.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <lvgl/src/lv_misc/lv_color.h>
+#include <lvgl/src/misc/lv_color.h>
 #include <components/settings/Settings.h>
 
 namespace Pinetime {

diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
@@ -135,7 +135,7 @@ void DisplayApp::Process(void* instance) {
   app->InitHw();
 
   // Send a dummy notification to unlock the lvgl display driver for the first iteration
-  xTaskNotifyGive(xTaskGetCurrentTaskHandle());
+//  xTaskNotifyGive(xTaskGetCurrentTaskHandle());
 
   while (true) {
     app->Refresh();
@@ -149,6 +149,9 @@ void DisplayApp::InitHw() {
 
 void DisplayApp::Refresh() {
   TickType_t queueTimeout;
+  if (currentScreen->IsNew()){
+    doScreenTransition();
+  }
   switch (state) {
     case States::Idle:
       queueTimeout = portMAX_DELAY;

diff --git a/src/displayapp/DisplayApp.h b/src/displayapp/DisplayApp.h
@@ -70,6 +70,7 @@ namespace Pinetime {
       void SetFullRefresh(FullRefreshDirections direction);
 
       void Register(Pinetime::System::SystemTask* systemTask);
+      void doScreenTransition(){lvgl.StartTransitionAnimation();}
 
     private:
       Pinetime::Drivers::St7789& lcd;

diff --git a/src/displayapp/DisplayAppRecovery.cpp b/src/displayapp/DisplayAppRecovery.cpp
@@ -39,7 +39,7 @@ void DisplayApp::Process(void* instance) {
   NRF_LOG_INFO("displayapp task started!");
 
   // Send a dummy notification to unlock the lvgl display driver for the first iteration
-  xTaskNotifyGive(xTaskGetCurrentTaskHandle());
+//  xTaskNotifyGive(xTaskGetCurrentTaskHandle());
 
   app->InitHw();
   while (true) {
@@ -94,7 +94,7 @@ void DisplayApp::DisplayLogo(uint16_t color) {
   Pinetime::Tools::RleDecoder rleDecoder(infinitime_nb, sizeof(infinitime_nb), color, colorBlack);
   for (int i = 0; i < displayWidth; i++) {
     rleDecoder.DecodeNext(displayBuffer, displayWidth * bytesPerPixel);
-    ulTaskNotifyTake(pdTRUE, 500);
+//    ulTaskNotifyTake(pdTRUE, 500);
     lcd.DrawBuffer(0, i, displayWidth, 1, reinterpret_cast<const uint8_t*>(displayBuffer), displayWidth * bytesPerPixel);
   }
 }
@@ -103,7 +103,7 @@ void DisplayApp::DisplayOtaProgress(uint8_t percent, uint16_t color) {
   const uint8_t barHeight = 20;
   std::fill(displayBuffer, displayBuffer + (displayWidth * bytesPerPixel), color);
   for (int i = 0; i < barHeight; i++) {
-    ulTaskNotifyTake(pdTRUE, 500);
+//    ulTaskNotifyTake(pdTRUE, 500);
     uint16_t barWidth = std::min(static_cast<float>(percent) * 2.4f, static_cast<float>(displayWidth));
     lcd.DrawBuffer(0, displayWidth - barHeight + i, barWidth, 1, reinterpret_cast<const uint8_t*>(displayBuffer), barWidth * bytesPerPixel);
   }

diff --git a/src/displayapp/DisplayAppRecovery.h b/src/displayapp/DisplayAppRecovery.h
@@ -10,6 +10,7 @@
 #include <date/date.h>
 #include <drivers/Watchdog.h>
 #include <components/motor/MotorController.h>
+#include <BootErrors.h>
 #include "TouchEvents.h"
 #include "Apps.h"
 #include "Messages.h"
@@ -58,6 +59,7 @@ namespace Pinetime {
                  Pinetime::Controllers::AlarmController& alarmController,
                  Pinetime::Controllers::TouchHandler& touchHandler);
       void Start();
+      void Start(Pinetime::System::BootErrors){ Start(); };
       void PushMessage(Pinetime::Applications::Display::Messages msg);
       void Register(Pinetime::System::SystemTask* systemTask);
 

diff --git a/src/displayapp/DummyLittleVgl.h b/src/displayapp/DummyLittleVgl.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <libs/lvgl/src/lv_core/lv_style.h>
-#include <libs/lvgl/src/lv_themes/lv_theme.h>
-#include <libs/lvgl/src/lv_hal/lv_hal.h>
+#include <libs/lvgl/src/misc/lv_style.h>
+#include <libs/lvgl/src/core/lv_theme.h>
+#include <libs/lvgl/src/hal/lv_hal.h>
 #include <drivers/St7789.h>
 #include <drivers/Cst816s.h>