michele/DigiRadio
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Si4684 RF investigation report; fix ADAU1701 I2C reliability under long safeload bursts

Browse Source 
- 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>
This commit is contained in:
michele
2026-08-13 22:21:04 +02:00
co-authored by Claude Sonnet 5
parent 6f7b6dd12c
commit bee8cfa86f
7 changed files with 193 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Software/components/drivers/adau1701/src/Adau1701Driver.cpp
+13 -2
View File
@@ -241,12 +241,14 @@ namespace adau1701
mixer.si4684Right);
!result)
{
ESP_LOGW(kTag, "applyMixer: si4684 input safeload failed");
return result;
}
if (auto result = setInputVolume(core::MixSource::Esp32, mixer.esp32Left,
mixer.esp32Right);
!result)
{
ESP_LOGW(kTag, "applyMixer: esp32 input safeload failed");
return result;
}
if (auto result =
@@ -254,10 +256,17 @@ namespace adau1701
mixer.mixLeft);
!result)
{
ESP_LOGW(kTag, "applyMixer: st0 safeload failed");
return result;
}
return safeloadGain(static_cast<unsigned>(ADDR_STMIXER1_ST1_VOLUME),
mixer.mixRight);
if (auto result = safeloadGain(
static_cast<unsigned>(ADDR_STMIXER1_ST1_VOLUME), mixer.mixRight);
!result)
{
ESP_LOGW(kTag, "applyMixer: st1 safeload failed");
return result;
}
return {};
}
std::expected<void, Adau1701Error> Adau1701Driver::setEqBand(
@@ -344,6 +353,8 @@ namespace adau1701
if (auto result = setEqBand(*index, band.gain, band.center, band.q);
!result)
{
ESP_LOGW(kTag, "applyEq: band %u safeload failed",
static_cast<unsigned>(i));
return result;
}
}
Software/components/drivers/adau1701/src/SigmaStudioFW.c
+17 -3
View File
@@ -16,6 +16,7 @@
#include "driver/i2c_master.h"
#include "freertos/FreeRTOS.h"
#include "freertos/semphr.h"
#include "freertos/task.h"
#include <string.h>
@@ -135,9 +136,22 @@ static int sigma_i2c_write(unsigned int reg, const unsigned char* data,
buf[0] = (unsigned char)((reg >> 8) & 0xFFU);
buf[1] = (unsigned char)(reg & 0xFFU);
memcpy(buf + 2U, data, length);
const esp_err_t err =
i2c_master_transmit(s_dev, buf, (size_t)(2U + length), 1000);
return err == ESP_OK ? 0 : -1;
// Long safeload sequences (e.g. one EQ band = 5 params x 2 writes +
// trigger) chain dozens of back-to-back transactions; a single
// transient NACK anywhere in that chain used to abort the whole
// sequence. Retry a few times before giving up -- cheap and matches
// how every other bus driver in this codebase tolerates bus noise.
static const int kMaxAttempts = 3;
esp_err_t err = ESP_FAIL;
for (int attempt = 0; attempt < kMaxAttempts; ++attempt) {
err = i2c_master_transmit(s_dev, buf, (size_t)(2U + length), 1000);
if (err == ESP_OK) {
return 0;
}
vTaskDelay(pdMS_TO_TICKS(2));
}
return -1;
}
/*
Software/components/drivers/si4684/include/si4684/Si4684Driver.hpp
+6 -1
View File
@@ -203,6 +203,11 @@ public:
*
* @dname tuneFm
* @param frequency FM centre frequency in kHz.
* @param antCap FM_TUNE_FREQ ARG4/5 ANTCAP (AN649 Command 0x30).
* 0 = automatic (varactor set from FE_VARM/VARB
* properties); 1-128 bypasses auto-tune and forces
* the on-chip antenna varactor directly (AN851
* Appendix A calibration procedure).
* @return Ok on success, or Si4684Error::WrongBand / TuneFailed.
* @pubstate sends FM_TUNE_FREQ and waits for STC (AN649).
*
@@ -210,7 +215,7 @@ public:
* @date 2026-07-06
*/
[[nodiscard]] std::expected<void, Si4684Error> tuneFm(
core::FrequencyKHz frequency);
core::FrequencyKHz frequency, std::uint8_t antCap = 0U);
/**
* @brief seekFm — seek FM in the given direction.
Software/components/drivers/si4684/src/Si4684Driver.cpp
+6 -4
View File
@@ -690,7 +690,7 @@ Si4684Band Si4684Driver::loadedBand() const noexcept
}
std::expected<void, Si4684Error> Si4684Driver::tuneFm(
core::FrequencyKHz frequency)
core::FrequencyKHz frequency, std::uint8_t antCap)
{
if (auto band = ensureBand(Si4684Band::Fm); !band) {
return band;
@@ -703,8 +703,8 @@ std::expected<void, Si4684Error> Si4684Driver::tuneFm(
0x00U,
static_cast<std::uint8_t>(chipFreq & 0xFFU),
static_cast<std::uint8_t>(chipFreq >> 8),
0x00U,
0x00U,
antCap, // ANTCAP[7:0] -- 0 = auto (FE_VARM/VARB), else forced value
0x00U, // ANTCAP[15:8] -- range is 0-128, high byte always 0
0x00U, // PROG_ID (AN649 ARG6; ignored when DIR_TUNE=0)
};
if (auto cmd = writeCommand(Command::FmTuneFreq, args, sizeof(args));
@@ -728,8 +728,10 @@ std::expected<void, Si4684Error> Si4684Driver::tuneFm(
static_cast<unsigned>(readKhz));
}
ESP_LOGI(kTag,
"FM tuned %u kHz rssi=%d dBuV snr=%d dB valid=%d readfreq=%u",
"FM tuned %u kHz antcap=%u rssi=%d dBuV snr=%d dB valid=%d "
"readfreq=%u",
static_cast<unsigned>(frequency.value()),
static_cast<unsigned>(antCap),
static_cast<int>(rsq->rssiDbuV),
static_cast<int>(rsq->snrDb),
static_cast<int>(rsq->valid),
Software/components/secure_store/src/NvsAudioProfileStore.cpp
+14 -2
View File
@@ -15,6 +15,7 @@
#include "core/AudioProfileJson.hpp"
#include "esp_log.h"
#include "nvs.h"
#include <string>
@@ -23,6 +24,7 @@
namespace secure_store {
namespace {
constexpr char kTag[] = "NvsAudioProfileStore";
constexpr char kNamespace[] = "digiradio";
constexpr char kProfileKey[] = "audio_profile_json";
} // namespace
@@ -46,13 +48,23 @@ std::expected<void, core::StoreError> NvsAudioProfileStore::saveProfile(
const std::string json = core::serializeAudioProfileJson(profile);
nvs_handle_t handle = 0;
if (nvs_open(kNamespace, NVS_READWRITE, &handle) != ESP_OK) {
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) {
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);
Software/components/services/audio/src/AudioService.cpp
+10 -1
View File
@@ -13,10 +13,14 @@
#include "audio/AudioService.hpp"
#include "esp_log.h"
namespace audio {
namespace {
constexpr char kTag[] = "AudioService";
[[nodiscard]] core::AudioProfile profileForHardware(
const core::AudioProfile& profile) noexcept
{
@@ -59,7 +63,11 @@ std::expected<void, core::StoreError> AudioService::persistProfile() const
if (store_ == nullptr) {
return {};
}
return store_->saveProfile(profile_);
auto saved = store_->saveProfile(profile_);
if (!saved) {
ESP_LOGW(kTag, "persistProfile: NVS save failed");
}
return saved;
}
std::expected<void, core::StoreError> AudioService::applyProfileToDsp(
@@ -67,6 +75,7 @@ std::expected<void, core::StoreError> AudioService::applyProfileToDsp(
{
const core::AudioProfile hardware = profileForHardware(profile);
if (auto applied = dsp_.applyProfile(hardware); !applied) {
ESP_LOGW(kTag, "applyProfileToDsp: DSP safeload failed");
return std::unexpected(core::StoreError::IoFailed);
}
return {};