Allow manually unmounting the SD card

8 files changed, 38 insertions, 7 deletions

diff --git a/src/tangara/audio/audio_events.hpp b/src/tangara/audio/audio_events.hpp
index 89dc28ff..24a5cf83 100644
--- a/src/tangara/audio/audio_events.hpp
+++ b/src/tangara/audio/audio_events.hpp
@@ -150,6 +150,10 @@ struct TtsPlaybackChanged : tinyfsm::Event {
   bool is_playing;
 };
 
+struct UnmountReady : tinyfsm::Event {
+  bool idle;
+};
+
 namespace internal {
 struct DecodingStarted : tinyfsm::Event {
   std::shared_ptr<TrackInfo> track;
diff --git a/src/tangara/audio/audio_fsm.cpp b/src/tangara/audio/audio_fsm.cpp
index 7854818d..27c29eee 100644
--- a/src/tangara/audio/audio_fsm.cpp
+++ b/src/tangara/audio/audio_fsm.cpp
@@ -534,10 +534,7 @@ auto Standby::entry() -> void {
   updateOutputMode();
 }
 
-void Standby::react(const system_fsm::KeyLockChanged& ev) {
-  if (!ev.locking) {
-    return;
-  }
+void Standby::react(const system_fsm::UnmountRequest& ev) {
   auto current = sStreamCues.current();
   sServices->bg_worker().Dispatch<void>([=]() {
     auto db = sServices->database().lock();
@@ -548,6 +545,7 @@ void Standby::react(const system_fsm::KeyLockChanged& ev) {
     if (queue.totalSize() <= queue.currentPosition()) {
       // Nothing is playing, so don't bother saving the queue.
       db->put(kQueueKey, "");
+      events::System().Dispatch(UnmountReady{.idle = ev.idle});
       return;
     }
     db->put(kQueueKey, queue.serialise());
@@ -562,6 +560,7 @@ void Standby::react(const system_fsm::KeyLockChanged& ev) {
       };
       db->put(kCurrentFileKey, current_track.toString());
     }
+    events::System().Dispatch(UnmountReady{.idle = ev.idle});
   });
 }
 
diff --git a/src/tangara/audio/audio_fsm.hpp b/src/tangara/audio/audio_fsm.hpp
index fb42e387..c30012d9 100644
--- a/src/tangara/audio/audio_fsm.hpp
+++ b/src/tangara/audio/audio_fsm.hpp
@@ -65,7 +65,7 @@ class AudioState : public tinyfsm::Fsm<AudioState> {
   void react(const OutputModeChanged&);
 
   virtual void react(const system_fsm::BootComplete&) {}
-  virtual void react(const system_fsm::KeyLockChanged&){};
+  virtual void react(const system_fsm::UnmountRequest&) {}
   virtual void react(const system_fsm::SdStateChanged&) {}
   virtual void react(const system_fsm::BluetoothEvent&);
   virtual void react(const system_fsm::HasPhonesChanged&);
@@ -114,7 +114,7 @@ class Uninitialised : public AudioState {
 class Standby : public AudioState {
  public:
   void entry() override;
-  void react(const system_fsm::KeyLockChanged&) override;
+  void react(const system_fsm::UnmountRequest&) override;
   void react(const system_fsm::SdStateChanged&) override;
 
   using AudioState::react;
diff --git a/src/tangara/system_fsm/running.cpp b/src/tangara/system_fsm/running.cpp
index 13f58ef9..87b7f1ac 100644
--- a/src/tangara/system_fsm/running.cpp
+++ b/src/tangara/system_fsm/running.cpp
@@ -59,9 +59,22 @@ void Running::react(const database::event::UpdateFinished&) {
   checkIdle();
 }
 
+void Running::react(const ui::UnmountRequest& ev) {
+  events::Audio().Dispatch(audio::TogglePlayPause{.set_to = false});
+  events::Audio().Dispatch(UnmountRequest{.idle = false});
+}
+
+void Running::react(const audio::UnmountReady& ev) {
+  if (ev.idle) {
+    transit<Idle>();
+  } else {
+    unmountStorage();
+  }
+}
+
 void Running::react(const internal::UnmountTimeout&) {
   if (IdleCondition()) {
-    transit<Idle>();
+    events::Audio().Dispatch(UnmountRequest{.idle = true});
   }
 }
 
diff --git a/src/tangara/system_fsm/system_events.hpp b/src/tangara/system_fsm/system_events.hpp
index c2e3a2ab..b96846e0 100644
--- a/src/tangara/system_fsm/system_events.hpp
+++ b/src/tangara/system_fsm/system_events.hpp
@@ -40,6 +40,9 @@ struct FatalError : tinyfsm::Event {};
 struct OnIdle : tinyfsm::Event {};
 
 struct SdStateChanged : tinyfsm::Event {};
+struct UnmountRequest : tinyfsm::Event {
+  bool idle;
+};
 
 struct StorageError : tinyfsm::Event {
   FRESULT error;
diff --git a/src/tangara/system_fsm/system_fsm.hpp b/src/tangara/system_fsm/system_fsm.hpp
index 40009781..398a0b9b 100644
--- a/src/tangara/system_fsm/system_fsm.hpp
+++ b/src/tangara/system_fsm/system_fsm.hpp
@@ -27,6 +27,7 @@
 #include "drivers/touchwheel.hpp"
 #include "system_fsm/service_locator.hpp"
 #include "system_fsm/system_events.hpp"
+#include "ui/ui_fsm.hpp"
 #include "tinyfsm.hpp"
 
 namespace system_fsm {
@@ -64,6 +65,8 @@ class SystemState : public tinyfsm::Fsm<SystemState> {
   virtual void react(const internal::IdleTimeout&) {}
   virtual void react(const internal::UnmountTimeout&) {}
   virtual void react(const internal::Mount&) {}
+  virtual void react(const ui::UnmountRequest&) {}
+  virtual void react(const audio::UnmountReady&) {}
 
  protected:
   auto IdleCondition() -> bool;
@@ -103,6 +106,8 @@ class Running : public SystemState {
   void react(const database::event::UpdateFinished&) override;
   void react(const SamdUsbMscChanged&) override;
   void react(const StorageError&) override;
+  void react(const ui::UnmountRequest&) override;
+  void react(const audio::UnmountReady&) override;
 
   void react(const internal::UnmountTimeout&) override;
   void react(const internal::Mount&) override;
diff --git a/src/tangara/ui/ui_fsm.cpp b/src/tangara/ui/ui_fsm.cpp
index a22c704b..ebc4b635 100644
--- a/src/tangara/ui/ui_fsm.cpp
+++ b/src/tangara/ui/ui_fsm.cpp
@@ -714,6 +714,11 @@ void Lua::entry() {
                                });
     registry.AddPropertyModule("sd_card", {
                                               {"mounted", &sSdMounted},
+                                              {"unmount", [&](lua_State*) {
+                                                events::System().Dispatch(
+                                                    UnmountRequest{});
+                                                return 0;
+                                              }},
                                           });
     registry.AddPropertyModule("usb",
                                {
diff --git a/src/tangara/ui/ui_fsm.hpp b/src/tangara/ui/ui_fsm.hpp
index aae69f94..d4354bec 100644
--- a/src/tangara/ui/ui_fsm.hpp
+++ b/src/tangara/ui/ui_fsm.hpp
@@ -37,6 +37,8 @@
 
 namespace ui {
 
+struct UnmountRequest : tinyfsm::Event {};
+
 class UiState : public tinyfsm::Fsm<UiState> {
  public:
   static auto InitBootSplash(drivers::IGpios&, drivers::NvsStorage&) -> bool;