From f9011839cd0b0b7f2b45e4231500cc267245912b Mon Sep 17 00:00:00 2001
From: jacqueline <me@jacqueline.id.au>
Date: Wed, 29 Jan 2025 13:48:18 +1100
Subject: Actually read+write the fast charge nvs bit

It turns out that our error prone method of managing nvs keys has led to
an error!

We took a look over the other keys here and it didn't look like any
others were missing.

Fixes #204
---
 src/drivers/nvs.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/drivers/nvs.cpp b/src/drivers/nvs.cpp
index 6c916e60..6f0d874e 100644
--- a/src/drivers/nvs.cpp
+++ b/src/drivers/nvs.cpp
@@ -172,9 +172,7 @@ auto Setting<std::vector<bluetooth::MacAndName>>::store(
 }
 
 template <>
-auto Setting<std::string>::store(
-    nvs_handle_t nvs,
-    std::string v) -> void {
+auto Setting<std::string>::store(nvs_handle_t nvs, std::string v) -> void {
   cppbor::Tstr cbor{v};
   auto encoded = cbor.encode();
   nvs_set_blob(nvs, name_, encoded.data(), encoded.size());
@@ -295,6 +293,7 @@ auto NvsStorage::Read() -> void {
   display_rows_.read(handle_);
   haptic_motor_type_.read(handle_);
   lra_calibration_.read(handle_);
+  fast_charge_.read(handle_);
   brightness_.read(handle_);
   sensitivity_.read(handle_);
   amp_max_vol_.read(handle_);
@@ -317,6 +316,7 @@ auto NvsStorage::Write() -> bool {
   display_rows_.write(handle_);
   haptic_motor_type_.write(handle_);
   lra_calibration_.write(handle_);
+  fast_charge_.write(handle_);
   brightness_.write(handle_);
   sensitivity_.write(handle_);
   amp_max_vol_.write(handle_);
-- 
cgit v1.2.3


From ddcd06dbca61fc55a7c2cd68f82f8cfe7b4c5cbf Mon Sep 17 00:00:00 2001
From: jacqueline <me@jacqueline.id.au>
Date: Wed, 29 Jan 2025 16:04:31 +1100
Subject: Add 'Tdisc' to libtags

Uses 'TPOS' for id3v2 tags, and 'DISCNUMBER' for vorbis comments (mostly
just relevant to flacs for our use case).

Fixes #181.
---
 src/tangara/database/tag_parser.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/tangara/database/tag_parser.cpp b/src/tangara/database/tag_parser.cpp
index 59bd8f13..6c95d496 100644
--- a/src/tangara/database/tag_parser.cpp
+++ b/src/tangara/database/tag_parser.cpp
@@ -41,6 +41,8 @@ static auto convert_tag(int tag) -> std::optional<Tag> {
       return Tag::kAlbum;
     case Ttrack:
       return Tag::kTrack;
+    case Tdisc:
+      return Tag::kDisc;
     case Tgenre:
       return Tag::kGenres;
     default:
-- 
cgit v1.2.3