summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorailurux <ailuruxx@gmail.com>2025-01-31 12:25:05 +1100
committerailurux <ailuruxx@gmail.com>2025-01-31 12:25:05 +1100
commit5e3cfc8f3db18fac8e8962259f6521550add4139 (patch)
tree774003df582f6986f4354e86223fcdaa52cf966e /src
parent001fc52ec87bf04b5fb5a262d310738e5dd3682a (diff)
parentabf13d4ec112fc430b9fadea69455aa45d4e3cd6 (diff)
downloadtangara-fw-5e3cfc8f3db18fac8e8962259f6521550add4139.tar.gz
Merge branch 'main' of codeberg.org:cool-tech-zone/tangara-fw
Diffstat (limited to 'src')
-rw-r--r--src/drivers/nvs.cpp6
-rw-r--r--src/tangara/database/tag_parser.cpp2
2 files changed, 5 insertions, 3 deletions
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_);
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: