Merge branch 'main' of codeberg.org:cool-tech-zone/tangara-fw

2 files changed, 6 insertions, 2 deletions

diff --git a/src/drivers/include/nvs.hpp b/src/drivers/include/nvs.hpp
index f288f8e2..25396622 100644
--- a/src/drivers/include/nvs.hpp
+++ b/src/drivers/include/nvs.hpp
@@ -114,6 +114,9 @@ class NvsStorage {
   auto PrimaryInput() -> InputModes;
   auto PrimaryInput(InputModes) -> void;
 
+  auto DbAutoIndex() -> bool;
+  auto DbAutoIndex(bool) -> void;
+
   explicit NvsStorage(nvs_handle_t);
   ~NvsStorage();
 
@@ -136,6 +139,7 @@ class NvsStorage {
   Setting<uint8_t> input_mode_;
   Setting<uint8_t> output_mode_;
   Setting<bluetooth::MacAndName> bt_preferred_;
+  Setting<uint8_t> db_auto_index_;
 
   util::LruCache<10, bluetooth::mac_addr_t, uint8_t> bt_volumes_;
   bool bt_volumes_dirty_;
diff --git a/src/drivers/include/samd.hpp b/src/drivers/include/samd.hpp
index ac265950..55ea513c 100644
--- a/src/drivers/include/samd.hpp
+++ b/src/drivers/include/samd.hpp
@@ -48,8 +48,8 @@ class Samd {
     // There is a compatible usb host attached, but USB MSC is not currently
     // in use by the SAMD.
     kAttachedIdle,
-    // The SAMD is currently exposing the SD card via USB MSC.
-    kAttachedMounted,
+    // The SAMD is currently writing to the SD card via USB MSC.
+    kAttachedBusy,
   };
 
   auto GetUsbStatus() -> UsbStatus;