From 320fdeb9d8355d3c361d5c6d60de8afc64501af9 Mon Sep 17 00:00:00 2001 From: jacqueline Date: Wed, 30 Aug 2023 16:48:10 +1000 Subject: Use a service locator instead of passing around subsets of drivers between FSMs --- src/app_console/include/app_console.hpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/app_console/include') diff --git a/src/app_console/include/app_console.hpp b/src/app_console/include/app_console.hpp index 6c23552e..5981cc04 100644 --- a/src/app_console/include/app_console.hpp +++ b/src/app_console/include/app_console.hpp @@ -12,16 +12,14 @@ #include "console.hpp" #include "database.hpp" #include "samd.hpp" +#include "service_locator.hpp" #include "track_queue.hpp" namespace console { class AppConsole : public Console { public: - static std::weak_ptr sDatabase; - static audio::TrackQueue* sTrackQueue; - static drivers::Bluetooth* sBluetooth; - static drivers::Samd* sSamd; + static std::shared_ptr sServices; protected: virtual auto RegisterExtraComponents() -> void; -- cgit v1.2.3