micheleandClaude Sonnet 5
bee8cfa86f
- Add docs/si4684-rf-investigation-report.md: full record of the FM/DAB no-lock investigation (crystal, front-end matching, ANTCAP sweep, continuity, leading EP solder-defect hypothesis, PCBWay report sent) plus the separate audio profile NVS bug found and partially fixed this session. - Fix sigma_i2c_write() (SigmaStudioFW.c): no retry on I2C failure meant a single transient NACK anywhere in a long safeload burst (EQ apply = ~55 sequential transactions) aborted the whole sequence. Added a 3-attempt retry. - Add granular failure logging (AudioService::applyProfileToDsp/persistProfile, Adau1701Driver::applyMixer/applyEq, NvsAudioProfileStore::saveProfile error codes) to isolate the remaining NVS-side audio profile save failure. - Si4684Driver::tuneFm gains an optional ANTCAP argument (default 0 = unchanged auto-tune behavior) used during this session's front-end matching sweep. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
124 lines
3.3 KiB
C++
124 lines
3.3 KiB
C++
/**
|
|
* @file NvsAudioProfileStore.cpp
|
|
* @brief NvsAudioProfileStore implementation.
|
|
*
|
|
* DigiRadio firmware — https://github.com/manvalan/DigiRadio
|
|
*
|
|
* Copyright 2026 Michele Bigi
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*
|
|
* @author Michele Bigi
|
|
* @date 2026-07-06
|
|
*/
|
|
|
|
#include "secure_store/NvsAudioProfileStore.hpp"
|
|
|
|
#include "core/AudioProfileJson.hpp"
|
|
|
|
#include "esp_log.h"
|
|
#include "nvs.h"
|
|
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
namespace secure_store {
|
|
|
|
namespace {
|
|
constexpr char kTag[] = "NvsAudioProfileStore";
|
|
constexpr char kNamespace[] = "digiradio";
|
|
constexpr char kProfileKey[] = "audio_profile_json";
|
|
} // namespace
|
|
|
|
bool NvsAudioProfileStore::hasProfile() const
|
|
{
|
|
nvs_handle_t handle = 0;
|
|
if (nvs_open(kNamespace, NVS_READONLY, &handle) != ESP_OK) {
|
|
return false;
|
|
}
|
|
|
|
std::size_t len = 0;
|
|
const esp_err_t err = nvs_get_str(handle, kProfileKey, nullptr, &len);
|
|
nvs_close(handle);
|
|
return err == ESP_OK && len > 1U;
|
|
}
|
|
|
|
std::expected<void, core::StoreError> NvsAudioProfileStore::saveProfile(
|
|
const core::AudioProfile& profile)
|
|
{
|
|
const std::string json = core::serializeAudioProfileJson(profile);
|
|
|
|
nvs_handle_t handle = 0;
|
|
esp_err_t openErr = nvs_open(kNamespace, NVS_READWRITE, &handle);
|
|
if (openErr != ESP_OK) {
|
|
ESP_LOGW(kTag, "nvs_open failed (0x%x)", static_cast<unsigned>(openErr));
|
|
return std::unexpected(core::StoreError::IoFailed);
|
|
}
|
|
|
|
esp_err_t err = nvs_set_str(handle, kProfileKey, json.c_str());
|
|
if (err != ESP_OK) {
|
|
ESP_LOGW(kTag, "nvs_set_str failed (0x%x) json_len=%u",
|
|
static_cast<unsigned>(err),
|
|
static_cast<unsigned>(json.size()));
|
|
} else {
|
|
err = nvs_commit(handle);
|
|
if (err != ESP_OK) {
|
|
ESP_LOGW(kTag, "nvs_commit failed (0x%x)",
|
|
static_cast<unsigned>(err));
|
|
}
|
|
}
|
|
nvs_close(handle);
|
|
|
|
if (err != ESP_OK) {
|
|
return std::unexpected(core::StoreError::IoFailed);
|
|
}
|
|
return {};
|
|
}
|
|
|
|
std::expected<core::AudioProfile, core::StoreError>
|
|
NvsAudioProfileStore::loadProfile() const
|
|
{
|
|
nvs_handle_t handle = 0;
|
|
if (nvs_open(kNamespace, NVS_READONLY, &handle) != ESP_OK) {
|
|
return std::unexpected(core::StoreError::NotFound);
|
|
}
|
|
|
|
std::size_t len = 0;
|
|
if (nvs_get_str(handle, kProfileKey, nullptr, &len) != ESP_OK || len == 0U) {
|
|
nvs_close(handle);
|
|
return std::unexpected(core::StoreError::NotFound);
|
|
}
|
|
|
|
std::vector<char> buf(len);
|
|
if (nvs_get_str(handle, kProfileKey, buf.data(), &len) != ESP_OK) {
|
|
nvs_close(handle);
|
|
return std::unexpected(core::StoreError::IoFailed);
|
|
}
|
|
nvs_close(handle);
|
|
|
|
if (auto parsed = core::parseAudioProfileJson(buf.data()); parsed) {
|
|
return *parsed;
|
|
}
|
|
return std::unexpected(core::StoreError::InvalidData);
|
|
}
|
|
|
|
std::expected<void, core::StoreError> NvsAudioProfileStore::clearProfile()
|
|
{
|
|
nvs_handle_t handle = 0;
|
|
if (nvs_open(kNamespace, NVS_READWRITE, &handle) != ESP_OK) {
|
|
return std::unexpected(core::StoreError::IoFailed);
|
|
}
|
|
|
|
esp_err_t err = nvs_erase_key(handle, kProfileKey);
|
|
if (err == ESP_OK || err == ESP_ERR_NVS_NOT_FOUND) {
|
|
err = nvs_commit(handle);
|
|
}
|
|
nvs_close(handle);
|
|
|
|
if (err != ESP_OK) {
|
|
return std::unexpected(core::StoreError::IoFailed);
|
|
}
|
|
return {};
|
|
}
|
|
|
|
} // namespace secure_store
|