diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2365a3e..d1a2b58 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -129,8 +129,6 @@ target_sources(infinisim PUBLIC
sim/displayapp/LittleVgl.cpp
sim/components/battery/BatteryController.h
sim/components/battery/BatteryController.cpp
- sim/components/ble/MusicService.h
- sim/components/ble/MusicService.cpp
sim/components/ble/NimbleController.h
sim/components/ble/NimbleController.cpp
sim/components/brightness/BrightnessController.h
@@ -199,6 +197,8 @@ target_sources(infinisim PUBLIC
${InfiniTime_DIR}/src/components/ble/AlertNotificationService.cpp
${InfiniTime_DIR}/src/components/ble/MotionService.h
${InfiniTime_DIR}/src/components/ble/MotionService.cpp
+ ${InfiniTime_DIR}/src/components/ble/MusicService.h
+ ${InfiniTime_DIR}/src/components/ble/MusicService.cpp
${InfiniTime_DIR}/src/components/ble/NavigationService.h
${InfiniTime_DIR}/src/components/ble/NavigationService.cpp
${InfiniTime_DIR}/src/components/ble/NotificationManager.h
diff --git a/InfiniTime b/InfiniTime
index c8236af..40a293d 160000
--- a/InfiniTime
+++ b/InfiniTime
@@ -1 +1 @@
-Subproject commit c8236afbefbcc4e22150da7324617d853561a0c5
+Subproject commit 40a293defca67b48d48ab811599e56821b814a9b
diff --git a/sim/components/ble/MusicService.cpp b/sim/components/ble/MusicService.cpp
deleted file mode 100644
index 5f08847..0000000
--- a/sim/components/ble/MusicService.cpp
+++ /dev/null
@@ -1,198 +0,0 @@
-/* Copyright (C) 2020-2021 JF, Adam Pigg, Avamander
-
- This file is part of InfiniTime.
-
- InfiniTime is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- InfiniTime is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see .
-*/
-#include "components/ble/MusicService.h"
-#include "systemtask/SystemTask.h"
-
-namespace {
- // 0000yyxx-78fc-48fe-8e23-433b3a1942d0
- //constexpr ble_uuid128_t CharUuid(uint8_t x, uint8_t y) {
- // return ble_uuid128_t{
- // .u = {.type = BLE_UUID_TYPE_128},
- // .value = { 0xd0, 0x42, 0x19, 0x3a, 0x3b, 0x43, 0x23, 0x8e, 0xfe, 0x48, 0xfc, 0x78, x, y, 0x00, 0x00 }
- // };
- //}
-
- // 00000000-78fc-48fe-8e23-433b3a1942d0
- //constexpr ble_uuid128_t BaseUuid() {
- // return CharUuid(0x00, 0x00);
- //}
-
- //constexpr ble_uuid128_t msUuid {BaseUuid()};
-
- //constexpr ble_uuid128_t msEventCharUuid {CharUuid(0x01, 0x00)};
- //constexpr ble_uuid128_t msStatusCharUuid {CharUuid(0x02, 0x00)};
- //constexpr ble_uuid128_t msArtistCharUuid {CharUuid(0x03, 0x00)};
- //constexpr ble_uuid128_t msTrackCharUuid {CharUuid(0x04, 0x00)};
- //constexpr ble_uuid128_t msAlbumCharUuid {CharUuid(0x05, 0x00)};
- //constexpr ble_uuid128_t msPositionCharUuid {CharUuid(0x06, 0x00)};
- //constexpr ble_uuid128_t msTotalLengthCharUuid {CharUuid(0x07, 0x00)};
- //constexpr ble_uuid128_t msTrackNumberCharUuid {CharUuid(0x08, 0x00)};
- //constexpr ble_uuid128_t msTrackTotalCharUuid {CharUuid(0x09, 0x00)};
- //constexpr ble_uuid128_t msPlaybackSpeedCharUuid {CharUuid(0x0a, 0x00)};
- //constexpr ble_uuid128_t msRepeatCharUuid {CharUuid(0x0b, 0x00)};
- //constexpr ble_uuid128_t msShuffleCharUuid {CharUuid(0x0c, 0x00)};
-
- //int MusicCallback(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_access_ctxt* ctxt, void* arg) {
- // return static_cast(arg)->OnCommand(conn_handle, attr_handle, ctxt);
- //}
-}
-
-Pinetime::Controllers::MusicService::MusicService(Pinetime::System::SystemTask& system) : m_system(system) {
-// characteristicDefinition[0] = {.uuid = &msEventCharUuid.u,
-// .access_cb = MusicCallback,
-// .arg = this,
-// .flags = BLE_GATT_CHR_F_NOTIFY,
-// .val_handle = &eventHandle};
-// characteristicDefinition[1] = {.uuid = &msStatusCharUuid.u,
-// .access_cb = MusicCallback,
-// .arg = this,
-// .flags = BLE_GATT_CHR_F_WRITE | BLE_GATT_CHR_F_READ};
-// characteristicDefinition[2] = {.uuid = &msTrackCharUuid.u,
-// .access_cb = MusicCallback,
-// .arg = this,
-// .flags = BLE_GATT_CHR_F_WRITE | BLE_GATT_CHR_F_READ};
-// characteristicDefinition[3] = {.uuid = &msArtistCharUuid.u,
-// .access_cb = MusicCallback,
-// .arg = this,
-// .flags = BLE_GATT_CHR_F_WRITE | BLE_GATT_CHR_F_READ};
-// characteristicDefinition[4] = {.uuid = &msAlbumCharUuid.u,
-// .access_cb = MusicCallback,
-// .arg = this,
-// .flags = BLE_GATT_CHR_F_WRITE | BLE_GATT_CHR_F_READ};
-// characteristicDefinition[5] = {.uuid = &msPositionCharUuid.u,
-// .access_cb = MusicCallback,
-// .arg = this,
-// .flags = BLE_GATT_CHR_F_WRITE | BLE_GATT_CHR_F_READ};
-// characteristicDefinition[6] = {.uuid = &msTotalLengthCharUuid.u,
-// .access_cb = MusicCallback,
-// .arg = this,
-// .flags = BLE_GATT_CHR_F_WRITE | BLE_GATT_CHR_F_READ};
-// characteristicDefinition[7] = {.uuid = &msTotalLengthCharUuid.u,
-// .access_cb = MusicCallback,
-// .arg = this,
-// .flags = BLE_GATT_CHR_F_WRITE | BLE_GATT_CHR_F_READ};
-// characteristicDefinition[8] = {.uuid = &msTrackNumberCharUuid.u,
-// .access_cb = MusicCallback,
-// .arg = this,
-// .flags = BLE_GATT_CHR_F_WRITE | BLE_GATT_CHR_F_READ};
-// characteristicDefinition[9] = {.uuid = &msTrackTotalCharUuid.u,
-// .access_cb = MusicCallback,
-// .arg = this,
-// .flags = BLE_GATT_CHR_F_WRITE | BLE_GATT_CHR_F_READ};
-// characteristicDefinition[10] = {.uuid = &msPlaybackSpeedCharUuid.u,
-// .access_cb = MusicCallback,
-// .arg = this,
-// .flags = BLE_GATT_CHR_F_WRITE | BLE_GATT_CHR_F_READ};
-// characteristicDefinition[11] = {.uuid = &msRepeatCharUuid.u,
-// .access_cb = MusicCallback,
-// .arg = this,
-// .flags = BLE_GATT_CHR_F_WRITE | BLE_GATT_CHR_F_READ};
-// characteristicDefinition[12] = {.uuid = &msShuffleCharUuid.u,
-// .access_cb = MusicCallback,
-// .arg = this,
-// .flags = BLE_GATT_CHR_F_WRITE | BLE_GATT_CHR_F_READ};
-// characteristicDefinition[13] = {0};
-//
-// serviceDefinition[0] = {
-// .type = BLE_GATT_SVC_TYPE_PRIMARY, .uuid = &msUuid.u, .characteristics = characteristicDefinition};
-// serviceDefinition[1] = {0};
-}
-
-void Pinetime::Controllers::MusicService::Init() {
- //uint8_t res = 0;
- //res = ble_gatts_count_cfg(serviceDefinition);
- //ASSERT(res == 0);
-
- //res = ble_gatts_add_svcs(serviceDefinition);
- //ASSERT(res == 0);
-}
-
-//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);
-// 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;
-// } else if (ble_uuid_cmp(ctxt->chr->uuid, &msTrackCharUuid.u) == 0) {
-// trackName = s;
-// } else if (ble_uuid_cmp(ctxt->chr->uuid, &msAlbumCharUuid.u) == 0) {
-// albumName = s;
-// } else if (ble_uuid_cmp(ctxt->chr->uuid, &msStatusCharUuid.u) == 0) {
-// playing = s[0];
-// } else if (ble_uuid_cmp(ctxt->chr->uuid, &msRepeatCharUuid.u) == 0) {
-// repeat = s[0];
-// } else if (ble_uuid_cmp(ctxt->chr->uuid, &msShuffleCharUuid.u) == 0) {
-// shuffle = s[0];
-// } else if (ble_uuid_cmp(ctxt->chr->uuid, &msPositionCharUuid.u) == 0) {
-// trackProgress = (s[0] << 24) | (s[1] << 16) | (s[2] << 8) | s[3];
-// } else if (ble_uuid_cmp(ctxt->chr->uuid, &msTotalLengthCharUuid.u) == 0) {
-// trackLength = (s[0] << 24) | (s[1] << 16) | (s[2] << 8) | s[3];
-// } else if (ble_uuid_cmp(ctxt->chr->uuid, &msTrackNumberCharUuid.u) == 0) {
-// trackNumber = (s[0] << 24) | (s[1] << 16) | (s[2] << 8) | s[3];
-// } else if (ble_uuid_cmp(ctxt->chr->uuid, &msTrackTotalCharUuid.u) == 0) {
-// tracksTotal = (s[0] << 24) | (s[1] << 16) | (s[2] << 8) | s[3];
-// } else if (ble_uuid_cmp(ctxt->chr->uuid, &msPlaybackSpeedCharUuid.u) == 0) {
-// playbackSpeed = static_cast(((s[0] << 24) | (s[1] << 16) | (s[2] << 8) | s[3])) / 100.0f;
-// }
-// }
-// return 0;
-//}
-
-std::string Pinetime::Controllers::MusicService::getAlbum() const {
- return albumName;
-}
-
-std::string Pinetime::Controllers::MusicService::getArtist() const {
- return artistName;
-}
-
-std::string Pinetime::Controllers::MusicService::getTrack() const {
- return trackName;
-}
-
-bool Pinetime::Controllers::MusicService::isPlaying() const {
- return playing;
-}
-
-float Pinetime::Controllers::MusicService::getPlaybackSpeed() const {
- return playbackSpeed;
-}
-
-int Pinetime::Controllers::MusicService::getProgress() const {
- return trackProgress;
-}
-
-int Pinetime::Controllers::MusicService::getTrackLength() const {
- return trackLength;
-}
-
-void Pinetime::Controllers::MusicService::event(char event) {
- std::ignore = event;
- //auto* om = ble_hs_mbuf_from_flat(&event, 1);
-
- //uint16_t connectionHandle = m_system.nimble().connHandle();
-
- //if (connectionHandle == 0 || connectionHandle == BLE_HS_CONN_HANDLE_NONE) {
- // return;
- //}
-
- //ble_gattc_notify_custom(connectionHandle, eventHandle, om);
-}
diff --git a/sim/components/ble/MusicService.h b/sim/components/ble/MusicService.h
deleted file mode 100644
index ddbd23f..0000000
--- a/sim/components/ble/MusicService.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* Copyright (C) 2020-2021 JF, Adam Pigg, Avamander
-
- This file is part of InfiniTime.
-
- InfiniTime is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- InfiniTime is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see .
-*/
-#pragma once
-
-#include
-#include
-
-namespace Pinetime {
- namespace System {
- class SystemTask;
- }
- namespace Controllers {
- class MusicService {
- public:
- explicit MusicService(Pinetime::System::SystemTask& system);
-
- void Init();
-
- //int OnCommand(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_access_ctxt* ctxt);
-
- void event(char event);
-
- std::string getArtist() const;
-
- std::string getTrack() const;
-
- std::string getAlbum() const;
-
- int getProgress() const;
-
- int getTrackLength() const;
-
- float getPlaybackSpeed() const;
-
- bool isPlaying() const;
-
- static const char EVENT_MUSIC_OPEN = 0xe0;
- static const char EVENT_MUSIC_PLAY = 0x00;
- static const char EVENT_MUSIC_PAUSE = 0x01;
- static const char EVENT_MUSIC_NEXT = 0x03;
- static const char EVENT_MUSIC_PREV = 0x04;
- static const char EVENT_MUSIC_VOLUP = 0x05;
- static const char EVENT_MUSIC_VOLDOWN = 0x06;
- static const char EVENT_MUSIC_FORWARD = 0x07;
- static const char EVENT_MUSIC_REWIND = 0x08;
-
- enum MusicStatus { NotPlaying = 0x00, Playing = 0x01 };
-
- private:
- //struct ble_gatt_chr_def characteristicDefinition[14];
- //struct ble_gatt_svc_def serviceDefinition[2];
-
- uint16_t eventHandle {};
-
- std::string artistName {"Waiting for"};
- std::string albumName {};
- std::string trackName {"track information.."};
-
- bool playing {false};
-
- int trackProgress {0};
- int trackLength {0};
- int trackNumber {};
- int tracksTotal {};
-
- float playbackSpeed {1.0f};
-
- bool repeat {false};
- bool shuffle {false};
-
- Pinetime::System::SystemTask& m_system;
- };
- }
-}
diff --git a/sim/components/ble/NimbleController.cpp b/sim/components/ble/NimbleController.cpp
index fda4155..9c29f86 100644
--- a/sim/components/ble/NimbleController.cpp
+++ b/sim/components/ble/NimbleController.cpp
@@ -43,7 +43,7 @@ NimbleController::NimbleController(Pinetime::System::SystemTask& systemTask,
anService {systemTask, notificationManager},
// alertNotificationClient {systemTask, notificationManager},
// currentTimeService {dateTimeController},
- musicService {systemTask},
+ musicService {*this},
weatherService {dateTimeController},
// batteryInformationService {batteryController},
// immediateAlertService {systemTask, notificationManager},