From df61907073fab7d4c2f9595c7771e894a3841b65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Milants?= <jf@codingfield.com>
Date: Mon, 14 Mar 2022 20:44:19 +0100
Subject: Limit the size of the track and album name received by MusicService.
 This should work around this bug :
 https://github.com/InfiniTimeOrg/InfiniTime/issues/825 and prevent heap
 over-allocation.


diff --git a/src/components/ble/MusicService.cpp b/src/components/ble/MusicService.cpp
index 3457ce4..7b74ac2 100644
--- a/src/components/ble/MusicService.cpp
+++ b/src/components/ble/MusicService.cpp
@@ -47,6 +47,8 @@ namespace {
   constexpr ble_uuid128_t msRepeatCharUuid {CharUuid(0x0b, 0x00)};
   constexpr ble_uuid128_t msShuffleCharUuid {CharUuid(0x0c, 0x00)};
 
+  constexpr uint8_t MaxStringSize {40};
+
   int MusicCallback(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_access_ctxt* ctxt, void* arg) {
     return static_cast<Pinetime::Controllers::MusicService*>(arg)->OnCommand(conn_handle, attr_handle, ctxt);
   }
@@ -125,6 +127,11 @@ void Pinetime::Controllers::MusicService::Init() {
 int Pinetime::Controllers::MusicService::OnCommand(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_access_ctxt* ctxt) {
   if (ctxt->op == BLE_GATT_ACCESS_OP_WRITE_CHR) {
     size_t notifSize = OS_MBUF_PKTLEN(ctxt->om);
+
+    if(notifSize > MaxStringSize) {
+      notifSize = MaxStringSize;
+    }
+
     char data[notifSize + 1];
     data[notifSize] = '\0';
     os_mbuf_copydata(ctxt->om, 0, notifSize, data);
-- 
cgit v0.10.2


From f973f1c12c5f82ddacfdaca29fbe1043d94313ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Milants?= <jf@codingfield.com>
Date: Mon, 14 Mar 2022 21:03:08 +0100
Subject: Add missing space in if expression.


diff --git a/src/components/ble/MusicService.cpp b/src/components/ble/MusicService.cpp
index 7b74ac2..0e53b9c 100644
--- a/src/components/ble/MusicService.cpp
+++ b/src/components/ble/MusicService.cpp
@@ -128,7 +128,7 @@ int Pinetime::Controllers::MusicService::OnCommand(uint16_t conn_handle, uint16_
   if (ctxt->op == BLE_GATT_ACCESS_OP_WRITE_CHR) {
     size_t notifSize = OS_MBUF_PKTLEN(ctxt->om);
 
-    if(notifSize > MaxStringSize) {
+    if (notifSize > MaxStringSize) {
       notifSize = MaxStringSize;
     }
 
-- 
cgit v0.10.2


From 88197b66328ab8cbecc199c91d1ce1e1688ade83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Milants?= <jf@codingfield.com>
Date: Thu, 17 Mar 2022 21:15:05 +0100
Subject: Music app : when title/track name are truncated, add an ellipsis at
 the end of the strings.


diff --git a/src/components/ble/MusicService.cpp b/src/components/ble/MusicService.cpp
index 0e53b9c..c99aa1e 100644
--- a/src/components/ble/MusicService.cpp
+++ b/src/components/ble/MusicService.cpp
@@ -17,6 +17,7 @@
 */
 #include "components/ble/MusicService.h"
 #include "systemtask/SystemTask.h"
+#include <cstring>
 
 namespace {
   // 0000yyxx-78fc-48fe-8e23-433b3a1942d0
@@ -127,14 +128,21 @@ void Pinetime::Controllers::MusicService::Init() {
 int Pinetime::Controllers::MusicService::OnCommand(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_access_ctxt* ctxt) {
   if (ctxt->op == BLE_GATT_ACCESS_OP_WRITE_CHR) {
     size_t notifSize = OS_MBUF_PKTLEN(ctxt->om);
-
+    size_t bufferSize = notifSize;
     if (notifSize > MaxStringSize) {
-      notifSize = MaxStringSize;
+      bufferSize = MaxStringSize;
+    }
+
+    char data[bufferSize + 1];
+    os_mbuf_copydata(ctxt->om, 0, bufferSize, data);
+
+    if (notifSize > bufferSize) {
+      data[bufferSize-1] = '.';
+      data[bufferSize-2] = '.';
+      data[bufferSize-3] = '.';
     }
+    data[bufferSize] = '\0';
 
-    char data[notifSize + 1];
-    data[notifSize] = '\0';
-    os_mbuf_copydata(ctxt->om, 0, notifSize, data);
     char* s = &data[0];
     if (ble_uuid_cmp(ctxt->chr->uuid, &msArtistCharUuid.u) == 0) {
       artistName = s;
-- 
cgit v0.10.2


From f1194a5f74fa7e02805940a39489210783b94878 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Milants?= <jf@codingfield.com>
Date: Mon, 14 Mar 2022 20:54:04 +0100
Subject: In current configuration, the timer task (the one from FreeRTOS) has
 the lowest priority (0). Both display and system tasks are also set on
 priority 0. In cases where any other task takes too much time to execute (it
 can happen in Display Task, see
 https://github.com/InfiniTimeOrg/InfiniTime/issues/825), the timer task does
 not have the opportunity to run fast enough to detect and debounce presses on
 the button.

This commit sets the following priorities:
 - [0] : Display  Task
 - [1] : Timer and System tasks
 - [2] : BLE Host
 - [3] : BLE LL

This way, we ensure that button presses will always be detected, even if the rendering of the display takes a huge amount of time.

diff --git a/src/FreeRTOSConfig.h b/src/FreeRTOSConfig.h
index adbbc8f..5462b93 100644
--- a/src/FreeRTOSConfig.h
+++ b/src/FreeRTOSConfig.h
@@ -60,7 +60,7 @@
 #define configUSE_TICKLESS_IDLE_SIMPLE_DEBUG    0 /* See into vPortSuppressTicksAndSleep source code for explanation */
 #define configCPU_CLOCK_HZ                      (SystemCoreClock)
 #define configTICK_RATE_HZ                      1024
-#define configMAX_PRIORITIES                    (3)
+#define configMAX_PRIORITIES                    (4)
 #define configMINIMAL_STACK_SIZE                (120)
 #define configTOTAL_HEAP_SIZE                   (1024 * 17)
 #define configMAX_TASK_NAME_LEN                 (4)
@@ -93,7 +93,7 @@
 
 /* Software timer definitions. */
 #define configUSE_TIMERS             1
-#define configTIMER_TASK_PRIORITY    (0)
+#define configTIMER_TASK_PRIORITY    (1)
 #define configTIMER_QUEUE_LENGTH     32
 #define configTIMER_TASK_STACK_DEPTH (300)
 
diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
index 1e45fac..77cf411 100644
--- a/src/systemtask/SystemTask.cpp
+++ b/src/systemtask/SystemTask.cpp
@@ -107,7 +107,7 @@ SystemTask::SystemTask(Drivers::SpiMaster& spi,
 
 void SystemTask::Start() {
   systemTasksMsgQueue = xQueueCreate(10, 1);
-  if (pdPASS != xTaskCreate(SystemTask::Process, "MAIN", 350, this, 0, &taskHandle)) {
+  if (pdPASS != xTaskCreate(SystemTask::Process, "MAIN", 350, this, 1, &taskHandle)) {
     APP_ERROR_HANDLER(NRF_ERROR_NO_MEM);
   }
 }
-- 
cgit v0.10.2


From cd1f218dd8710f61238307a9fa5b0d11e229bffa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Milants?= <jf@codingfield.com>
Date: Mon, 14 Mar 2022 21:54:13 +0100
Subject: Fix priorities of BLE tasks


diff --git a/src/libs/mynewt-nimble/porting/npl/freertos/src/nimble_port_freertos.c b/src/libs/mynewt-nimble/porting/npl/freertos/src/nimble_port_freertos.c
index b990278..205831a 100644
--- a/src/libs/mynewt-nimble/porting/npl/freertos/src/nimble_port_freertos.c
+++ b/src/libs/mynewt-nimble/porting/npl/freertos/src/nimble_port_freertos.c
@@ -38,7 +38,7 @@ nimble_port_freertos_init(TaskFunction_t host_task_fn)
      * since it has compatible prototype.
      */
     xTaskCreate(nimble_port_ll_task_func, "ll", configMINIMAL_STACK_SIZE + 200,
-                NULL, configMAX_PRIORITIES - 1, &ll_task_h);
+                NULL, 3, &ll_task_h);
 #endif
 
     /*
@@ -47,5 +47,5 @@ nimble_port_freertos_init(TaskFunction_t host_task_fn)
      * default queue it is just easier to make separate task which does this.
      */
     xTaskCreate(host_task_fn, "ble", configMINIMAL_STACK_SIZE + 600,
-                NULL, tskIDLE_PRIORITY + 1, &host_task_h);
+                NULL, 2, &host_task_h);
 }
-- 
cgit v0.10.2


From a8b7fbe48b4a86238f38ed0f084b277b44c428fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Milants?= <jf@codingfield.com>
Date: Thu, 17 Mar 2022 21:22:59 +0100
Subject: New changes according to the review : Priority 0 for display, 1 for
 system, timer and ble host, and 2 for ble LL


diff --git a/src/FreeRTOSConfig.h b/src/FreeRTOSConfig.h
index 5462b93..263d803 100644
--- a/src/FreeRTOSConfig.h
+++ b/src/FreeRTOSConfig.h
@@ -60,7 +60,7 @@
 #define configUSE_TICKLESS_IDLE_SIMPLE_DEBUG    0 /* See into vPortSuppressTicksAndSleep source code for explanation */
 #define configCPU_CLOCK_HZ                      (SystemCoreClock)
 #define configTICK_RATE_HZ                      1024
-#define configMAX_PRIORITIES                    (4)
+#define configMAX_PRIORITIES                    (3)
 #define configMINIMAL_STACK_SIZE                (120)
 #define configTOTAL_HEAP_SIZE                   (1024 * 17)
 #define configMAX_TASK_NAME_LEN                 (4)
diff --git a/src/components/ble/NimbleController.cpp b/src/components/ble/NimbleController.cpp
index 0be7c0f..10eb429 100644
--- a/src/components/ble/NimbleController.cpp
+++ b/src/components/ble/NimbleController.cpp
@@ -77,6 +77,7 @@ int GAPEventCallback(struct ble_gap_event* event, void* arg) {
 
 void NimbleController::Init() {
   while (!ble_hs_synced()) {
+    vTaskDelay(10);
   }
 
   nptr = this;
diff --git a/src/libs/mynewt-nimble/porting/npl/freertos/src/nimble_port_freertos.c b/src/libs/mynewt-nimble/porting/npl/freertos/src/nimble_port_freertos.c
index 205831a..49834db 100644
--- a/src/libs/mynewt-nimble/porting/npl/freertos/src/nimble_port_freertos.c
+++ b/src/libs/mynewt-nimble/porting/npl/freertos/src/nimble_port_freertos.c
@@ -38,7 +38,7 @@ nimble_port_freertos_init(TaskFunction_t host_task_fn)
      * since it has compatible prototype.
      */
     xTaskCreate(nimble_port_ll_task_func, "ll", configMINIMAL_STACK_SIZE + 200,
-                NULL, 3, &ll_task_h);
+                NULL, 2, &ll_task_h);
 #endif
 
     /*
@@ -47,5 +47,5 @@ nimble_port_freertos_init(TaskFunction_t host_task_fn)
      * default queue it is just easier to make separate task which does this.
      */
     xTaskCreate(host_task_fn, "ble", configMINIMAL_STACK_SIZE + 600,
-                NULL, 2, &host_task_h);
+                NULL, 1, &host_task_h);
 }
-- 
cgit v0.10.2


From 4761fcb63a55749c5e46c5fe6bb53ae25b4716c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Milants?= <jf@codingfield.com>
Date: Sun, 27 Mar 2022 20:29:52 +0200
Subject: DisplayApp : Call the event handler of the current app before loading
 the new one. This way, we ensure that lv_task_handler() is called before
 sending event to the newly loaded app.


diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index fdc6376..c842956 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -306,14 +306,14 @@ void DisplayApp::Refresh() {
     }
   }
 
+  if (touchHandler.IsTouching()) {
+    currentScreen->OnTouchEvent(touchHandler.GetX(), touchHandler.GetY());
+  }
+
   if (nextApp != Apps::None) {
     LoadApp(nextApp, nextDirection);
     nextApp = Apps::None;
   }
-
-  if (touchHandler.IsTouching()) {
-    currentScreen->OnTouchEvent(touchHandler.GetX(), touchHandler.GetY());
-  }
 }
 
 void DisplayApp::StartApp(Apps app, DisplayApp::FullRefreshDirections direction) {
-- 
cgit v0.10.2


From 8f436e1d74ffdd497c68dc2f34f6a67e430a1932 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Milants?= <jf@codingfield.com>
Date: Sun, 27 Mar 2022 20:21:44 +0200
Subject: Timer App : add background label to ensure that the app will be
 displayed correctly after a full refresh (HW scrolling transition). Code
 cleaning and rename methods.


diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index c842956..f6d2747 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -207,7 +207,7 @@ void DisplayApp::Refresh() {
       case Messages::TimerDone:
         if (currentApp == Apps::Timer) {
           auto* timer = static_cast<Screens::Timer*>(currentScreen.get());
-          timer->setDone();
+          timer->SetDone();
         } else {
           LoadApp(Apps::Timer, DisplayApp::FullRefreshDirections::Down);
         }
diff --git a/src/displayapp/screens/Timer.cpp b/src/displayapp/screens/Timer.cpp
index a5e4019..5cd496c 100644
--- a/src/displayapp/screens/Timer.cpp
+++ b/src/displayapp/screens/Timer.cpp
@@ -1,5 +1,4 @@
 #include "displayapp/screens/Timer.h"
-
 #include "displayapp/screens/Screen.h"
 #include "displayapp/screens/Symbols.h"
 #include <lvgl/lvgl.h>
@@ -7,11 +6,11 @@
 using namespace Pinetime::Applications::Screens;
 
 static void btnEventHandler(lv_obj_t* obj, lv_event_t event) {
-  Timer* screen = static_cast<Timer*>(obj->user_data);
+  auto* screen = static_cast<Timer*>(obj->user_data);
   screen->OnButtonEvent(obj, event);
 }
 
-void Timer::createButtons() {
+void Timer::CreateButtons() {
   btnMinutesUp = lv_btn_create(lv_scr_act(), nullptr);
   btnMinutesUp->user_data = this;
   lv_obj_set_event_cb(btnMinutesUp, btnEventHandler);
@@ -51,6 +50,12 @@ void Timer::createButtons() {
 
 Timer::Timer(DisplayApp* app, Controllers::TimerController& timerController)
   : Screen(app), running {true}, timerController {timerController} {
+  backgroundLabel = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_click(backgroundLabel, true);
+  lv_label_set_long_mode(backgroundLabel, LV_LABEL_LONG_CROP);
+  lv_obj_set_size(backgroundLabel, 240, 240);
+  lv_obj_set_pos(backgroundLabel, 0, 0);
+  lv_label_set_text(backgroundLabel, "");
 
   time = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_font(time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_76);
@@ -71,7 +76,7 @@ Timer::Timer(DisplayApp* app, Controllers::TimerController& timerController)
     lv_label_set_text(txtPlayPause, Symbols::pause);
   } else {
     lv_label_set_text(txtPlayPause, Symbols::play);
-    createButtons();
+    CreateButtons();
   }
 
   taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this);
@@ -98,7 +103,7 @@ void Timer::OnButtonEvent(lv_obj_t* obj, lv_event_t event) {
         minutesToSet = seconds / 60;
         secondsToSet = seconds % 60;
         timerController.StopTimer();
-        createButtons();
+        CreateButtons();
 
       } else if (secondsToSet + minutesToSet > 0) {
         lv_label_set_text(txtPlayPause, Symbols::pause);
@@ -152,10 +157,10 @@ void Timer::OnButtonEvent(lv_obj_t* obj, lv_event_t event) {
   }
 }
 
-void Timer::setDone() {
+void Timer::SetDone() {
   lv_label_set_text(time, "00:00");
   lv_label_set_text(txtPlayPause, Symbols::play);
   secondsToSet = 0;
   minutesToSet = 0;
-  createButtons();
+  CreateButtons();
 }
diff --git a/src/displayapp/screens/Timer.h b/src/displayapp/screens/Timer.h
index 23c8734..93e84c8 100644
--- a/src/displayapp/screens/Timer.h
+++ b/src/displayapp/screens/Timer.h
@@ -8,32 +8,35 @@
 #include "components/timer/TimerController.h"
 
 namespace Pinetime::Applications::Screens {
-
   class Timer : public Screen {
   public:
     enum class Modes { Normal, Done };
 
     Timer(DisplayApp* app, Controllers::TimerController& timerController);
-
     ~Timer() override;
-
     void Refresh() override;
-
-    void setDone();
-
+    void SetDone();
     void OnButtonEvent(lv_obj_t* obj, lv_event_t event);
 
   private:
+    void CreateButtons();
     bool running;
     uint8_t secondsToSet = 0;
     uint8_t minutesToSet = 0;
     Controllers::TimerController& timerController;
-
-    void createButtons();
-
-    lv_obj_t *time, *msecTime, *btnPlayPause, *txtPlayPause, *btnMinutesUp, *btnMinutesDown, *btnSecondsUp, *btnSecondsDown, *txtMUp,
-      *txtMDown, *txtSUp, *txtSDown;
-
+    lv_obj_t* backgroundLabel;
+    lv_obj_t* time;
+    lv_obj_t* msecTime;
+    lv_obj_t* btnPlayPause;
+    lv_obj_t* txtPlayPause;
+    lv_obj_t* btnMinutesUp;
+    lv_obj_t* btnMinutesDown;
+    lv_obj_t* btnSecondsUp;
+    lv_obj_t* btnSecondsDown;
+    lv_obj_t* txtMUp;
+    lv_obj_t* txtMDown;
+    lv_obj_t* txtSUp;
+    lv_obj_t* txtSDown;
     lv_task_t* taskRefresh;
   };
 }
-- 
cgit v0.10.2