Fully implement music app and service

SystemTask can return a reference to the nimbleController
The nimbleController can return a reference to the musicService
The musicService get a connection handle from the nimbleController
The musicApp communicated directly with the musicService

src/Components/Ble/MusicService.cpp

@@ -1,3 +1,4 @@
+#include <SystemTask/SystemTask.h>
 #include "MusicService.h"
 
 int MSCallback(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_access_ctxt *ctxt, void *arg) {
@@ -5,7 +6,7 @@ int MSCallback(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_acces
   return musicService->OnCommand(conn_handle, attr_handle, ctxt);
 }
 
-Pinetime::Controllers::MusicService::MusicService()
+Pinetime::Controllers::MusicService::MusicService(Pinetime::System::SystemTask &system) : m_system(system)
 {
     msUuid.value[11] = msId[0];
     msUuid.value[12] = msId[1];
@@ -86,6 +87,8 @@ int Pinetime::Controllers::MusicService::OnCommand(uint16_t conn_handle, uint16_
             m_track = s;
         } else if (ble_uuid_cmp(ctxt->chr->uuid, (ble_uuid_t *)&msAlbumCharUuid) == 0) {
             m_album = s;
+        } else if (ble_uuid_cmp(ctxt->chr->uuid, (ble_uuid_t *)&msStatusCharUuid) == 0) {
+            m_status = s[0];
         }
   }
   return 0;
@@ -106,18 +109,19 @@ std::string Pinetime::Controllers::MusicService::track()
     return m_track;
 }
 
+unsigned char Pinetime::Controllers::MusicService::status()
+{
+    return m_status;
+}
+
 void Pinetime::Controllers::MusicService::event(char event)
 {
-    struct os_mbuf *om;
+    auto *om = ble_hs_mbuf_from_flat(&event, 1);
     int ret;
 
-    uint16_t connectionHandle = 0;
+    uint16_t connectionHandle = m_system.nimble().connHandle();
 
-    om = ble_hs_mbuf_from_flat(&event, 1);
+    if (connectionHandle == 0 || connectionHandle == BLE_HS_CONN_HANDLE_NONE) {
-
-    ret = ble_gatts_find_svc((ble_uuid_t *) &msUuid, &connectionHandle);
-
-    if (connectionHandle == 0) {
         return;
     }
 

src/Components/Ble/MusicService.h

@@ -1,4 +1,5 @@
 #pragma once
+
 #include <cstdint>
 #include <array>
 #include <host/ble_gap.h>
@@ -9,10 +10,14 @@
 #define MUSIC_SERVICE_UUID_BASE {0xd0, 0x42, 0x19, 0x3a, 0x3b, 0x43, 0x23, 0x8e, 0xfe, 0x48, 0xfc, 0x78, 0x00, 0x00, 0xe5, 0xc7}
 
 namespace Pinetime {
+  namespace System {
+    class SystemTask;
+  }
   namespace Controllers {
+
     class MusicService {
       public:
-        MusicService();
+        MusicService(Pinetime::System::SystemTask &system);
         void Init();
         int OnCommand(uint16_t conn_handle, uint16_t attr_handle,
                                     struct ble_gatt_access_ctxt *ctxt);
@@ -20,6 +25,8 @@ namespace Pinetime {
         std::string artist();
         std::string track();
         std::string album();
+        unsigned char status();
+
         void event(char event);
 
         static const char EVENT_MUSIC_OPEN = 0xe0;
@@ -29,7 +36,8 @@ namespace Pinetime {
         static const char EVENT_MUSIC_PREV = 0x04;
         static const char EVENT_MUSIC_VOLUP = 0x05;
         static const char EVENT_MUSIC_VOLDOWN = 0x06;
-
+        static const char STATUS_MUSIC_PAUSED = 0x00;
+        static const char STATUS_MUSIC_PLAYING = 0x01;
 
       private:
         static constexpr uint8_t msId[2] = {0x00, 0x01};
@@ -67,13 +75,17 @@ namespace Pinetime {
 
         struct ble_gatt_chr_def characteristicDefinition[6];
         struct ble_gatt_svc_def serviceDefinition[2];
-        
+
         uint16_t m_eventHandle;
 
         std::string m_artist;
         std::string m_album;
         std::string m_track;
 
+        unsigned char m_status;
+
+        Pinetime::System::SystemTask& m_system;
+
     };
   }
 }

src/Components/Ble/NimbleController.cpp

@@ -6,6 +6,7 @@
 #include <hal/nrf_rtc.h>
 
 #include "NimbleController.h"
+#include "MusicService.h"
 #include <services/gatt/ble_svc_gatt.h>
 #include <services/gap/ble_svc_gap.h>
 #include <host/util/util.h>
@@ -35,7 +36,8 @@ NimbleController::NimbleController(Pinetime::System::SystemTask& systemTask,
         currentTimeClient{dateTimeController},
         anService{systemTask, notificationManager},
         alertNotificationClient{systemTask, notificationManager},
-        currentTimeService{dateTimeController} {
+        currentTimeService{dateTimeController},
+        musicService{systemTask} {
 
 }
 
@@ -327,5 +329,7 @@ void NimbleController::StartDiscovery() {
 }
 
 
-
+uint16_t NimbleController::connHandle() {
+    return connectionHandle;
+}
 

src/Components/Ble/NimbleController.h

@@ -16,6 +16,7 @@ namespace Pinetime {
   }
   namespace Controllers {
     class DateTime;
+
     class NimbleController {
 
       public:
@@ -39,6 +40,8 @@ namespace Pinetime {
 
         Pinetime::Controllers::MusicService& music() {return musicService;};
 
+        uint16_t connHandle();
+
       private:
         static constexpr char* deviceName = "Pinetime-JF";
         Pinetime::System::SystemTask& systemTask;
@@ -56,7 +59,7 @@ namespace Pinetime {
         MusicService musicService;
 
         uint8_t addrType; // 1 = Random, 0 = PUBLIC
-        uint16_t connectionHandle;
+        uint16_t connectionHandle = 0;
 
         ble_uuid128_t dfuServiceUuid {
                 .u { .type = BLE_UUID_TYPE_128},

src/DisplayApp/Screens/Music.cpp

@@ -41,8 +41,8 @@ Music::Music(Pinetime::Applications::DisplayApp *app, Pinetime::Controllers::Mus
     lv_obj_set_event_cb(btnPlayPause, event_handler);
     lv_obj_set_size(btnPlayPause, LV_HOR_RES / 4, LV_VER_RES / 4);
     lv_obj_align(btnPlayPause, NULL, LV_ALIGN_IN_BOTTOM_MID, 0,-10);
-    label = lv_label_create(btnPlayPause, NULL);
+    txtPlayPause = lv_label_create(btnPlayPause, NULL);
-    lv_label_set_text(label, ">");
+    lv_label_set_text(txtPlayPause, ">");
 
     btnNext = lv_btn_create(lv_scr_act(), NULL);
     btnNext->user_data = this;
@@ -65,6 +65,8 @@ Music::Music(Pinetime::Applications::DisplayApp *app, Pinetime::Controllers::Mus
     lv_label_set_text(txtTrack, "This is a very long track name");
     lv_label_set_align(txtTrack, LV_LABEL_ALIGN_CENTER);
     lv_obj_set_width(txtTrack, LV_HOR_RES);
+
+    musicService.event(Controllers::MusicService::EVENT_MUSIC_OPEN);
 }
 
 Music::~Music() {
@@ -89,6 +91,14 @@ bool Music::Refresh() {
     if (m_album != musicService.album()) {
         m_album = musicService.album();
     }
+    if (m_status != musicService.status()) {
+        m_status = musicService.status();
+    }
+    if (m_status == Pinetime::Controllers::MusicService::STATUS_MUSIC_PLAYING) {
+        lv_label_set_text(txtPlayPause, "||");
+    } else {
+        lv_label_set_text(txtPlayPause, ">");
+    }
 
   return running;
 }
@@ -97,13 +107,17 @@ void Music::OnObjectEvent(lv_obj_t* obj, lv_event_t event)
 {
     if (event == LV_EVENT_CLICKED) {
         if (obj == btnVolDown) {
-            musicService.event(Controllers::MusicService::EVENT_MUSIC_VOLUP);
-        } else if (obj == btnVolUp) {
             musicService.event(Controllers::MusicService::EVENT_MUSIC_VOLDOWN);
+        } else if (obj == btnVolUp) {
+            musicService.event(Controllers::MusicService::EVENT_MUSIC_VOLUP);
         } else if (obj == btnPrev) {
             musicService.event(Controllers::MusicService::EVENT_MUSIC_PREV);
         } else if (obj == btnPlayPause) {
-            musicService.event(Controllers::MusicService::EVENT_MUSIC_PLAY);
+            if (m_status == Pinetime::Controllers::MusicService::STATUS_MUSIC_PLAYING) {
+                musicService.event(Controllers::MusicService::EVENT_MUSIC_PAUSE);
+            } else {
+                musicService.event(Controllers::MusicService::EVENT_MUSIC_PLAY);
+            }
         } else if (obj == btnNext) {
             musicService.event(Controllers::MusicService::EVENT_MUSIC_NEXT);
         }

src/DisplayApp/Screens/Music.h

@@ -35,12 +35,14 @@ namespace Pinetime {
           lv_obj_t * btnVolUp;
           lv_obj_t * txtArtist;
           lv_obj_t * txtTrack;
+          lv_obj_t * txtPlayPause;
 
           bool running = true;
           Pinetime::Controllers::MusicService &musicService;
           std::string m_artist;
           std::string m_album;
           std::string m_track;
+          unsigned char m_status;
       };
     }
   }

src/SystemTask/SystemTask.cpp

@@ -12,6 +12,7 @@
 #include <host/util/util.h>
 #include <drivers/InternalFlash.h>
 #include "../main.h"
+#include "Components/Ble/NimbleController.h"
 
 using namespace Pinetime::System;
 

src/SystemTask/SystemTask.h

@@ -8,9 +8,10 @@
 #include <Components/Battery/BatteryController.h>
 #include <DisplayApp/DisplayApp.h>
 #include <drivers/Watchdog.h>
-#include <Components/Ble/NimbleController.h>
 #include <drivers/SpiNorFlash.h>
 #include "SystemMonitor.h"
+#include "Components/Ble/NimbleController.h"
+#include "timers.h"
 
 namespace Pinetime {
   namespace System {