6 files changed, 29 insertions, 16 deletions
diff --git a/src/system_fsm/booting.cpp b/src/system_fsm/booting.cpp
index 41f46df2..bd394428 100644
--- a/src/system_fsm/booting.cpp
+++ b/src/system_fsm/booting.cpp
@@ -57,13 +57,22 @@ auto Booting::entry() -> void {
   sServices.reset(new ServiceLocator());
 
   ESP_LOGI(kTag, "installing early drivers");
+  // NVS is needed first because it contains information about what specific
+  // hardware configuration we're running on.
+  sServices->nvs(
+      std::unique_ptr<drivers::NvsStorage>(drivers::NvsStorage::OpenSync()));
+
+  // HACK: fix up the switch polarity on newer dev units
+  // sServices->nvs().LockPolarity(false);
+
   // I2C and SPI are both always needed. We can't even power down or show an
   // error without these.
   ESP_ERROR_CHECK(drivers::init_spi());
-  sServices->gpios(std::unique_ptr<drivers::Gpios>(drivers::Gpios::Create()));
+  sServices->gpios(std::unique_ptr<drivers::Gpios>(
+      drivers::Gpios::Create(sServices->nvs().LockPolarity())));
 
   ESP_LOGI(kTag, "starting ui");
-  if (!ui::UiState::InitBootSplash(sServices->gpios())) {
+  if (!ui::UiState::InitBootSplash(sServices->gpios(), sServices->nvs())) {
     events::System().Dispatch(FatalError{});
     return;
   }
@@ -74,8 +83,6 @@ auto Booting::entry() -> void {
   ESP_LOGI(kTag, "installing remaining drivers");
   drivers::spiffs_mount();
   sServices->samd(std::unique_ptr<drivers::Samd>(drivers::Samd::Create()));
-  sServices->nvs(
-      std::unique_ptr<drivers::NvsStorage>(drivers::NvsStorage::OpenSync()));
   sServices->touchwheel(
       std::unique_ptr<drivers::TouchWheel>{drivers::TouchWheel::Create()});
   sServices->haptics(std::make_unique<drivers::Haptics>());
@@ -100,8 +107,6 @@ auto Booting::entry() -> void {
     sServices->bluetooth().Enable();
   }
 
-  sServices->nvs().LockPolarity(true);
-
   BootComplete ev{.services = sServices};
   events::Audio().Dispatch(ev);
   events::Ui().Dispatch(ev);
diff --git a/src/system_fsm/idle.cpp b/src/system_fsm/idle.cpp
index b6bb2572..e28864b3 100644
--- a/src/system_fsm/idle.cpp
+++ b/src/system_fsm/idle.cpp
@@ -13,6 +13,7 @@
 
 #include "audio_fsm.hpp"
 #include "event_queue.hpp"
+#include "samd.hpp"
 #include "storage.hpp"
 #include "system_events.hpp"
 #include "system_fsm.hpp"
@@ -40,7 +41,7 @@ void Idle::entry() {
   events::Audio().Dispatch(OnIdle{});
   events::Ui().Dispatch(OnIdle{});
 
-  sIdleTimeout = xTimerCreate("idle_timeout", kTicksBeforeSleep, false, NULL,
+  sIdleTimeout = xTimerCreate("idle_timeout", kTicksBeforeSleep, true, NULL,
                               timer_callback);
   xTimerStart(sIdleTimeout, portMAX_DELAY);
 }
@@ -63,6 +64,12 @@ void Idle::react(const internal::IdleTimeout& ev) {
     transit<Running>();
     return;
   }
+  if (sServices->samd().GetChargeStatus() !=
+      drivers::Samd::ChargeStatus::kDischarging) {
+    // Stay powered on if we're plugged in, in order to charge faster, sync
+    // files, flash updates, etc.
+    return;
+  }
   ESP_LOGI(kTag, "system shutting down");
 
   // FIXME: It would be neater to just free a bunch of our pointers, deinit the
diff --git a/src/system_fsm/include/system_events.hpp b/src/system_fsm/include/system_events.hpp
index 32394958..1be03f82 100644
--- a/src/system_fsm/include/system_events.hpp
+++ b/src/system_fsm/include/system_events.hpp
@@ -57,7 +57,6 @@ struct SamdUsbMscChanged : tinyfsm::Event {
   bool en;
 };
 
-struct ChargingStatusChanged : tinyfsm::Event {};
 struct BatteryStateChanged : tinyfsm::Event {
   battery::Battery::BatteryState new_state;
 };
diff --git a/src/system_fsm/include/system_fsm.hpp b/src/system_fsm/include/system_fsm.hpp
index cc60e43b..a129829e 100644
--- a/src/system_fsm/include/system_fsm.hpp
+++ b/src/system_fsm/include/system_fsm.hpp
@@ -63,7 +63,7 @@ class SystemState : public tinyfsm::Fsm<SystemState> {
   virtual void react(const SdDetectChanged&) {}
   virtual void react(const SamdUsbMscChanged&) {}
   virtual void react(const database::event::UpdateFinished&) {}
-  virtual void react(const audio::PlaybackStopped&) {}
+  virtual void react(const audio::PlaybackUpdate&) {}
   virtual void react(const internal::IdleTimeout&) {}
   virtual void react(const internal::UnmountTimeout&) {}
 
@@ -101,7 +101,7 @@ class Running : public SystemState {
 
   void react(const KeyLockChanged&) override;
   void react(const SdDetectChanged&) override;
-  void react(const audio::PlaybackStopped&) override;
+  void react(const audio::PlaybackUpdate&) override;
   void react(const database::event::UpdateFinished&) override;
   void react(const SamdUsbMscChanged&) override;
   void react(const internal::UnmountTimeout&) override;
diff --git a/src/system_fsm/running.cpp b/src/system_fsm/running.cpp
index d1d02fab..a6ab5d47 100644
--- a/src/system_fsm/running.cpp
+++ b/src/system_fsm/running.cpp
@@ -41,7 +41,11 @@ void Running::entry() {
     sUnmountTimer = xTimerCreate("unmount_timeout", kTicksBeforeUnmount, false,
                                  NULL, timer_callback);
   }
-  mountStorage();
+  // Only mount our storage immediately if we know it's not currently in use
+  // by the SAMD.
+  if (!sServices->samd().UsbMassStorage()) {
+    mountStorage();
+  }
 }
 
 void Running::exit() {
@@ -52,7 +56,7 @@ void Running::react(const KeyLockChanged& ev) {
   checkIdle();
 }
 
-void Running::react(const audio::PlaybackStopped& ev) {
+void Running::react(const audio::PlaybackUpdate& ev) {
   checkIdle();
 }
 
diff --git a/src/system_fsm/system_fsm.cpp b/src/system_fsm/system_fsm.cpp
index 977f4a6d..5a1ccf8c 100644
--- a/src/system_fsm/system_fsm.cpp
+++ b/src/system_fsm/system_fsm.cpp
@@ -84,10 +84,8 @@ void SystemState::react(const internal::SamdInterrupt&) {
   auto charge_status = samd.GetChargeStatus();
   auto usb_status = samd.GetUsbStatus();
 
-  if (charge_status != prev_charge_status) {
-    ChargingStatusChanged ev{};
-    events::System().Dispatch(ev);
-    events::Ui().Dispatch(ev);
+  if (charge_status != prev_charge_status && sServices) {
+    sServices->battery().Update();
   }
   if (usb_status != prev_usb_status) {
     ESP_LOGI(kTag, "usb status changed");