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

Add FM ANTCAP antenna calibration: HTTP sweep control + EEPROM persistence

Browse Source 
Confirmed live tonight that the Si4684's automatic front-end tuning
(FE_VARM/VARB properties) is measurably suboptimal on this board: a
129-value ANTCAP sweep (0-128, AN851 Appendix A) at four different FM
frequencies found antcap=102 beats auto-tune by +6 to +11 dB RSSI and
+3 to +11 dB SNR everywhere tested, consistent with the front-end
network component mismatch already logged in
docs/si4684-rf-investigation-report.md — the board's actual matching
network differs from the AN851 reference network those auto-tune
constants were derived from, so a fixed empirical override
compensates for a gap the chip's own algorithm can't see.

Wiring, bottom to top:
- Si4684Driver::tuneFm() already took an antCap byte; threaded it
  through core::ITuner::tuneFm() and si4684::Si4684Tuner::tuneFm() as
  a new parameter (default 0 = auto, unchanged behaviour for every
  existing caller).
- TunerService::tuneFm() takes an optional override instead: omitted,
  it falls back to a new defaultFmAntCap_ member so every ordinary FM
  tune (seek, scan, station recall, live UI) benefits automatically
  once calibrated, not just calls that pass antcap explicitly.
- POST /api/tuner/tune gained an optional "antcap" field for sweeping
  live without touching the saved calibration.
- POST /api/tuner/calibrate-antenna commits a sweep result: writes it
  to the 24AA025E48 EEPROM's user-writable region (word address 0x00,
  separate from the factory-locked EUI-48 at 0xFA-0xFF) via a new
  Eeprom24aa::writeFmAntCap()/readFmAntCap() pair, and immediately
  updates the live TunerService default — no reboot needed to take
  effect, though HardwareBootstrap::boot() also loads it at every
  boot so it survives power cycles. Same net::AntennaCalibration
  function-pointer bridge pattern as PhoneStreamSink/BleProvisioning,
  so components/net stays free of eeprom24aa headers.

Verified end to end on hardware: swept and found 102, saved it via
the new endpoint, confirmed the live default changed immediately,
then power-cycled and confirmed the boot log reports "FM ANTCAP
calibration loaded: 102" and a subsequent default tune reflects it.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_0178rASQ6ZETPMUamvpoR2KR
This commit is contained in:
michele
2026-08-19 02:01:09 +02:00
co-authored by Claude Sonnet 5
parent 45098145cb
commit f610121fd3
22 changed files with 448 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Software/components/core/include/core/ITuner.hpp
+9 -1
View File
@@ -100,6 +100,14 @@ public:
*
* @dname tuneFm
* @param frequency Validated FM centre frequency.
* @param antCap Front-end antenna varactor override (0-128).
* 0 = automatic (chip's own FE_VARM/VARB-derived
* tuning); other values force a specific varactor
* setting, for antenna calibration sweeps. Chip-
* specific concept (AN851 Appendix A on the
* Si4684), exposed here only because ANTCAP has no
* other reasonable home without duplicating the
* whole tune path per driver.
* @return Ok on success, or WrongBand / TuneFailed / NotBooted.
* @pubstate writes last tune target in the adapter.
*
@@ -107,7 +115,7 @@ public:
* @date 2026-07-06
*/
[[nodiscard]] virtual std::expected<void, TunerError> tuneFm(
FrequencyKHz frequency) = 0;
FrequencyKHz frequency, std::uint8_t antCap = 0U) = 0;
/**
* @brief seekFm — seek to the next valid FM station.
Software/components/core/include/core/TunerJson.hpp
+17
View File
@@ -41,6 +41,8 @@ struct TunerTuneRequest {
TunerBand band; ///< Target band (Dab or Fm).
std::uint8_t dabFreqIndex; ///< Band III ensemble index (0–37) when band is Dab.
std::optional<FrequencyKHz> fmFrequency; ///< FM centre frequency when band is Fm.
std::optional<std::uint8_t> antCap; ///< FM antenna varactor override (0–128),
///< for calibration sweeps; ignored for Dab.
};
/**
@@ -239,4 +241,19 @@ struct TunerFmScannedStation {
[[nodiscard]] std::string serializeTunerFmBandScanJson(
const std::vector<TunerFmScannedStation>& stations);
/**
* @brief parseAntennaCalibrationJson — validate POST
* /api/tuner/calibrate-antenna body.
*
* @dname parseAntennaCalibrationJson
* @param json Untrusted request body from the HTTP handler.
* @return ANTCAP value (0-128) on success, or a ParseError.
* @pubstate none
*
* @author Michele Bigi
* @date 2026-08-19
*/
[[nodiscard]] std::expected<std::uint8_t, ParseError>
parseAntennaCalibrationJson(std::string_view json);
} // namespace core
Software/components/core/src/TunerJson.cpp
+17
View File
@@ -200,6 +200,10 @@ std::expected<TunerTuneRequest, ParseError> parseTunerTuneJson(
return std::unexpected(freq.error());
}
req.fmFrequency = *freq;
unsigned long antCap = 0U;
if (extractJsonUint(json, "antcap", antCap) && antCap <= 128U) {
req.antCap = static_cast<std::uint8_t>(antCap);
}
} else {
return std::unexpected(ParseError::InvalidJson);
}
@@ -336,4 +340,17 @@ std::string serializeTunerFmBandScanJson(
return out.str();
}
std::expected<std::uint8_t, ParseError> parseAntennaCalibrationJson(
std::string_view json)
{
if (json.find('{') == std::string_view::npos) {
return std::unexpected(ParseError::InvalidJson);
}
unsigned long antCap = 0U;
if (!extractJsonUint(json, "antcap", antCap) || antCap > 128U) {
return std::unexpected(ParseError::MissingField);
}
return static_cast<std::uint8_t>(antCap);
}
} // namespace core
Software/components/core/test/integration_service_test.cpp
+1 -1
View File
@@ -117,7 +117,7 @@ public:
}
[[nodiscard]] std::expected<void, core::TunerError> tuneFm(
core::FrequencyKHz) override
core::FrequencyKHz, std::uint8_t) override
{
tunedFm = true;
return {};
Software/components/core/test/station_service_test.cpp
+1 -1
View File
@@ -59,7 +59,7 @@ public:
}
[[nodiscard]] std::expected<void, core::TunerError> tuneFm(
core::FrequencyKHz) override
core::FrequencyKHz, std::uint8_t) override
{
return {};
}
Software/components/drivers/eeprom24aa/CMakeLists.txt
+1 -1
View File
@@ -1,7 +1,7 @@
idf_component_register(
SRCS "src/Eeprom24aa.cpp"
INCLUDE_DIRS "include"
REQUIRES core driver esp_driver_i2c
REQUIRES core driver esp_driver_i2c freertos
)
target_compile_features(${COMPONENT_LIB} PUBLIC cxx_std_23)
Software/components/drivers/eeprom24aa/include/eeprom24aa/Eeprom24aa.hpp
+48 -3
View File
@@ -13,27 +13,40 @@
#pragma once
#include "core/IDeviceIdentitySource.hpp"
#include "core/IdentityError.hpp"
#include "driver/i2c_master.h"
#include <cstdint>
#include <expected>
#include <optional>
namespace eeprom24aa {
/**
* @brief Eeprom24aa — reads the factory EUI-48 from Microchip 24AA025E48.
* @brief Eeprom24aa — reads the factory EUI-48 from Microchip 24AA025E48;
* also stores one board-specific calibration byte in the chip's
* user-writable region.
*
* @dname Eeprom24aa
* @return n/a (type)
* @pubstate Borrows an existing I2C master bus (shared with ADAU1701). The
* EUI-48 lives at word address 0xFA..0xFF per the 24AA025E48
* datasheet (DS20001191).
* EUI-48 lives at word address 0xFA..0xFF (read-only, factory
* programmed) per the 24AA025E48 datasheet (DS20001191); the FM
* ANTCAP calibration byte lives at word address 0x00 in the
* remaining user-writable 250 bytes.
*
* @author Michele Bigi
* @date 2026-07-07
*/
class Eeprom24aa : public core::IDeviceIdentitySource {
public:
/** Valid FM ANTCAP calibration values are 0-128 (AN649/AN851); any
* stored byte above this, including the EEPROM's blank/erased 0xFF,
* reads back as "never calibrated" — no separate sentinel write
* needed for a fresh chip. */
static constexpr std::uint8_t kFmAntCapMax = 128U;
/**
* @brief Eeprom24aa — bind to a running I2C master bus and 7-bit addr.
*
@@ -60,6 +73,38 @@ public:
[[nodiscard]] std::expected<core::DeviceIdentity, core::IdentityError>
readDeviceIdentity() override;
/**
* @brief readFmAntCap — read the stored FM antenna calibration byte.
*
* @dname readFmAntCap
* @return Calibrated ANTCAP (0-kFmAntCapMax) if one was ever saved via
* writeFmAntCap(), nullopt if the byte is blank/out of range,
* or IdentityError on an I2C failure.
* @pubstate performs one I2C read of one byte at word address 0x00.
*
* @author Michele Bigi
* @date 2026-08-19
*/
[[nodiscard]] std::expected<std::optional<std::uint8_t>, core::IdentityError>
readFmAntCap();
/**
* @brief writeFmAntCap — persist an FM antenna calibration value.
*
* @dname writeFmAntCap
* @param value ANTCAP to store, 0-kFmAntCapMax (AN851 Appendix A
* calibration procedure; found via a sweep, not
* computed).
* @return Ok on success, or IdentityError::I2cFailed.
* @pubstate performs one I2C byte write at word address 0x00, then
* blocks for the chip's write-cycle time before returning.
*
* @author Michele Bigi
* @date 2026-08-19
*/
[[nodiscard]] std::expected<void, core::IdentityError>
writeFmAntCap(std::uint8_t value);
private:
i2c_master_bus_handle_t bus_;
std::uint8_t addr7_;
Software/components/drivers/eeprom24aa/src/Eeprom24aa.cpp
+79
View File
@@ -15,6 +15,8 @@
#include "driver/i2c_master.h"
#include "esp_log.h"
#include "freertos/FreeRTOS.h"
#include "freertos/task.h"
#include <array>
@@ -25,7 +27,13 @@ namespace {
constexpr char kTag[] = "Eeprom24aa";
/** EUI-48 word address per Microchip 24AA025E48 datasheet (DS20001191). */
constexpr std::uint8_t kEui48WordAddress = 0xFAU;
/** FM ANTCAP calibration byte, in the chip's user-writable region (anywhere
* below the factory-locked 0xFA-0xFF EUI-48 block). */
constexpr std::uint8_t kFmAntCapWordAddress = 0x00U;
constexpr int kI2cTimeoutMs = 100;
/** DS20001191 §"Page Write"/"Byte Write": max write cycle time after STOP
* before the chip acknowledges further I2C traffic. */
constexpr int kI2cWriteCycleMs = 5;
} // namespace
@@ -69,4 +77,75 @@ Eeprom24aa::readDeviceIdentity()
return core::DeviceIdentity::fromEui48(core::Eui48::fromBytes(payload));
}
std::expected<std::optional<std::uint8_t>, core::IdentityError>
Eeprom24aa::readFmAntCap()
{
if (bus_ == nullptr) {
return std::unexpected(core::IdentityError::I2cFailed);
}
i2c_device_config_t devCfg = {};
devCfg.dev_addr_length = I2C_ADDR_BIT_LEN_7;
devCfg.device_address = addr7_;
devCfg.scl_speed_hz = 100000;
i2c_master_dev_handle_t dev = nullptr;
if (i2c_master_bus_add_device(bus_, &devCfg, &dev) != ESP_OK) {
ESP_LOGW(kTag, "i2c_master_bus_add_device failed");
return std::unexpected(core::IdentityError::I2cFailed);
}
const std::uint8_t wordAddress = kFmAntCapWordAddress;
std::uint8_t value = 0xFFU;
const esp_err_t err = i2c_master_transmit_receive(
dev, &wordAddress, 1U, &value, 1U, kI2cTimeoutMs);
i2c_master_bus_rm_device(dev);
if (err != ESP_OK) {
ESP_LOGW(kTag, "FM ANTCAP read failed (err=0x%x)",
static_cast<unsigned>(err));
return std::unexpected(core::IdentityError::ReadFailed);
}
if (value > kFmAntCapMax) {
return std::optional<std::uint8_t>{};
}
return std::optional<std::uint8_t>{value};
}
std::expected<void, core::IdentityError>
Eeprom24aa::writeFmAntCap(std::uint8_t value)
{
if (bus_ == nullptr) {
return std::unexpected(core::IdentityError::I2cFailed);
}
i2c_device_config_t devCfg = {};
devCfg.dev_addr_length = I2C_ADDR_BIT_LEN_7;
devCfg.device_address = addr7_;
devCfg.scl_speed_hz = 100000;
i2c_master_dev_handle_t dev = nullptr;
if (i2c_master_bus_add_device(bus_, &devCfg, &dev) != ESP_OK) {
ESP_LOGW(kTag, "i2c_master_bus_add_device failed");
return std::unexpected(core::IdentityError::I2cFailed);
}
const std::array<std::uint8_t, 2> payload = {kFmAntCapWordAddress, value};
const esp_err_t err =
i2c_master_transmit(dev, payload.data(), payload.size(), kI2cTimeoutMs);
i2c_master_bus_rm_device(dev);
if (err != ESP_OK) {
ESP_LOGW(kTag, "FM ANTCAP write failed (err=0x%x)",
static_cast<unsigned>(err));
return std::unexpected(core::IdentityError::I2cFailed);
}
vTaskDelay(pdMS_TO_TICKS(kI2cWriteCycleMs));
return {};
}
} // namespace eeprom24aa
Software/components/drivers/si4684/include/si4684/Si4684Tuner.hpp
+2 -1
View File
@@ -110,6 +110,7 @@ public:
*
* @dname tuneFm
* @param frequency Validated FM centre frequency.
* @param antCap Forwarded to Si4684Driver::tuneFm (0 = auto).
* @return Ok on success, or a mapped TunerError.
* @pubstate writes fmFrequency_ on success.
*
@@ -117,7 +118,7 @@ public:
* @date 2026-07-06
*/
[[nodiscard]] std::expected<void, core::TunerError> tuneFm(
core::FrequencyKHz frequency) override;
core::FrequencyKHz frequency, std::uint8_t antCap = 0U) override;
/**
* @brief seekFm — seek FM with band wrap.
Software/components/drivers/si4684/src/Si4684Tuner.cpp
+2 -2
View File
@@ -225,12 +225,12 @@ std::expected<void, core::TunerError> Si4684Tuner::tuneDab(
}
std::expected<void, core::TunerError> Si4684Tuner::tuneFm(
core::FrequencyKHz frequency)
core::FrequencyKHz frequency, std::uint8_t antCap)
{
if (auto ready = ensureBandLoaded(core::TunerBand::Fm); !ready) {
return ready;
}
if (auto result = driver_.tuneFm(frequency); !result) {
if (auto result = driver_.tuneFm(frequency, antCap); !result) {
return std::unexpected(mapError(result.error()));
}
fmFrequency_ = frequency;
Software/components/net/include/net/NetBootstrap.hpp
+3
View File
@@ -87,6 +87,8 @@ public:
* @param ota Firmware OTA service for POST /api/system/ota.
* @param webRadio Streaming config for GET/POST /api/streaming.
* @param phoneStream I2S write-through for PUT /api/stream/phone.
* @param antennaCalibration EEPROM write-through for
* POST /api/tuner/calibrate-antenna.
* @param companionChips Boot flags exposed on GET /api/health.
* @param deviceIdentity EEPROM-derived SSID, hostname, and serial.
* @return NetBootstrap on success, or a NetError.
@@ -103,6 +105,7 @@ public:
ota::OtaService& ota,
webradio::WebRadioService& webRadio,
PhoneStreamSink& phoneStream,
AntennaCalibration& antennaCalibration,
core::CompanionChipStatus companionChips,
const core::DeviceIdentity& deviceIdentity);
Software/components/net/include/net/SetupWebServer.hpp
+23
View File
@@ -85,6 +85,25 @@ struct PhoneStreamSink {
std::size_t frameCount);
};
/**
* @brief AntennaCalibration — plain function pointer over EEPROM-backed
* FM ANTCAP storage, so net/ never includes eeprom24aa headers
* directly; main/ supplies it (HardwareBootstrap owns the I2C
* bus and EEPROM handle).
*
* @dname AntennaCalibration
* @return n/a (type)
* @pubstate Free function with process lifetime; no per-instance state.
*
* @author Michele Bigi
* @date 2026-08-19
*/
struct AntennaCalibration {
/** Persist a new FM ANTCAP calibration value to EEPROM.
* @return false on an I2C failure. */
bool (*save)(std::uint8_t antCap);
};
/**
* @brief HttpRouteContext — dependencies injected into HTTP handlers.
*
@@ -106,6 +125,7 @@ struct HttpRouteContext {
ota::OtaService* ota; ///< Firmware OTA streaming.
webradio::WebRadioService* webRadio; ///< Streaming config REST routes.
PhoneStreamSink* phoneStream; ///< PUT /api/stream/phone I2S write-through.
AntennaCalibration* antennaCalibration; ///< POST /api/tuner/calibrate-antenna.
core::CompanionChipStatus companionChips; ///< Boot flags for /api/health.
core::DeviceIdentity deviceIdentity; ///< EEPROM-derived unit identity.
};
@@ -187,6 +207,8 @@ public:
* @param ota Firmware OTA service for POST /api/system/ota.
* @param webRadio Streaming config for GET/POST /api/streaming.
* @param phoneStream I2S write-through for PUT /api/stream/phone.
* @param antennaCalibration EEPROM write-through for
* POST /api/tuner/calibrate-antenna.
* @param companionChips Boot flags for GET /api/health.
* @param deviceIdentity Unit identity for /api/health serialNumber.
* @return Ok on success, or NetError::HttpServerStartFailed.
@@ -204,6 +226,7 @@ public:
ota::OtaService& ota,
webradio::WebRadioService& webRadio,
PhoneStreamSink& phoneStream,
AntennaCalibration& antennaCalibration,
core::CompanionChipStatus companionChips,
const core::DeviceIdentity& deviceIdentity);
Software/components/net/src/NetBootstrap.cpp
+11 -5
View File
@@ -106,6 +106,7 @@ startSetupMode(core::ISecureStore& store, tuner::TunerService& tuner,
ota::OtaService& ota,
webradio::WebRadioService& webRadio,
PhoneStreamSink& phoneStream,
AntennaCalibration& antennaCalibration,
core::CompanionChipStatus companionChips,
const core::DeviceIdentity& deviceIdentity)
{
@@ -121,7 +122,8 @@ startSetupMode(core::ISecureStore& store, tuner::TunerService& tuner,
if (auto webResult =
webServer.start(store, NetState::SoftApSetup, tuner, audio,
bluetooth, stations, integration, ota, webRadio,
phoneStream, companionChips, deviceIdentity);
phoneStream, antennaCalibration, companionChips,
deviceIdentity);
!webResult) {
return std::unexpected(webResult.error());
}
@@ -168,6 +170,7 @@ startStaMode(core::ISecureStore& store, tuner::TunerService& tuner,
ota::OtaService& ota,
webradio::WebRadioService& webRadio,
PhoneStreamSink& phoneStream,
AntennaCalibration& antennaCalibration,
core::CompanionChipStatus companionChips,
const core::DeviceIdentity& deviceIdentity)
{
@@ -198,7 +201,8 @@ startStaMode(core::ISecureStore& store, tuner::TunerService& tuner,
if (auto webResult =
webServer.start(store, NetState::StaConnected, tuner, audio,
bluetooth, stations, integration, ota, webRadio,
phoneStream, companionChips, deviceIdentity);
phoneStream, antennaCalibration, companionChips,
deviceIdentity);
!webResult) {
return std::unexpected(webResult.error());
}
@@ -227,6 +231,7 @@ NetBootstrap::start(core::ISecureStore& store, tuner::TunerService& tuner,
ota::OtaService& ota,
webradio::WebRadioService& webRadio,
PhoneStreamSink& phoneStream,
AntennaCalibration& antennaCalibration,
core::CompanionChipStatus companionChips,
const core::DeviceIdentity& deviceIdentity)
{
@@ -241,7 +246,8 @@ NetBootstrap::start(core::ISecureStore& store, tuner::TunerService& tuner,
if (store.hasWifiCredentials()) {
auto staResult = startStaMode(store, tuner, audio, bluetooth, stations,
integration, ota, webRadio, phoneStream,
companionChips, deviceIdentity);
antennaCalibration, companionChips,
deviceIdentity);
if (staResult) {
return staResult;
}
@@ -253,8 +259,8 @@ NetBootstrap::start(core::ISecureStore& store, tuner::TunerService& tuner,
}
return startSetupMode(store, tuner, audio, bluetooth, stations, integration,
ota, webRadio, phoneStream, companionChips,
deviceIdentity);
ota, webRadio, phoneStream, antennaCalibration,
companionChips, deviceIdentity);
}
NetBootstrap::NetBootstrap(std::optional<SoftApHost> softAp,
Software/components/net/src/SetupWebServer.cpp
+67 -1
View File
@@ -99,6 +99,7 @@ extern const uint8_t index_html_gz_end[] asm(
.ota = nullptr,
.webRadio = nullptr,
.phoneStream = nullptr,
.antennaCalibration = nullptr,
.companionChips = {},
.deviceIdentity = core::DeviceIdentity::unknown(),
};
@@ -432,7 +433,10 @@ esp_err_t tunerTunePostHandler(httpd_req_t* req)
if (parsed->band == core::TunerBand::Dab) {
result = ctx->tuner->tuneDab(parsed->dabFreqIndex);
} else if (parsed->fmFrequency) {
result = ctx->tuner->tuneFm(*parsed->fmFrequency);
// Omitting antcap uses the board's saved calibration (or hardware
// auto-tune if never calibrated) — only an explicit value in the
// request overrides it, e.g. for a calibration sweep.
result = ctx->tuner->tuneFm(*parsed->fmFrequency, parsed->antCap);
}
if (!result) {
@@ -635,6 +639,58 @@ esp_err_t tunerFullScanPostHandler(httpd_req_t* req)
return httpd_resp_send(req, json.c_str(), json.size());
}
/**
* @brief tunerCalibrateAntennaPostHandler — save the FM ANTCAP found by
* a calibration sweep as the board's permanent default.
*
* @dname tunerCalibrateAntennaPostHandler
* @param req HTTP request handle from esp_http_server.
* @return ESP_OK on success, or an esp_err_t error code.
* @pubstate writes the 24AA025E48 via route context antenna calibration
* bridge, then updates the live tuner default immediately.
*
* @author Michele Bigi
* @date 2026-08-19
*/
esp_err_t tunerCalibrateAntennaPostHandler(httpd_req_t* req)
{
auto* ctx = routeContextFrom(req);
if (ctx == nullptr || ctx->tuner == nullptr
|| ctx->antennaCalibration == nullptr) {
httpd_resp_set_status(req, "503 Service Unavailable");
return httpd_resp_send(req, nullptr, 0);
}
std::array<char, 128> body{};
if (!readRequestBody(req, body)) {
httpd_resp_set_status(req, "400 Bad Request");
return httpd_resp_send(req, nullptr, 0);
}
const auto parsed =
core::parseAntennaCalibrationJson(std::string_view(body.data()));
if (!parsed) {
const std::string json = core::serializeTunerErrorJson("invalid_json");
httpd_resp_set_status(req, "400 Bad Request");
httpd_resp_set_type(req, "application/json");
return httpd_resp_send(req, json.c_str(), json.size());
}
if (!ctx->antennaCalibration->save(*parsed)) {
const std::string json = core::serializeTunerErrorJson("store_failed");
httpd_resp_set_status(req, "500 Internal Server Error");
httpd_resp_set_type(req, "application/json");
return httpd_resp_send(req, json.c_str(), json.size());
}
ctx->tuner->setDefaultFmAntCap(*parsed);
const std::string json =
std::string("{\"status\":\"saved\",\"antcap\":")
+ std::to_string(*parsed) + "}";
httpd_resp_set_type(req, "application/json");
return httpd_resp_send(req, json.c_str(), json.size());
}
/**
* @brief audioProfileGetHandler — serve GET /api/audio/profile JSON.
*
@@ -1865,6 +1921,7 @@ std::expected<void, NetError> SetupWebServer::start(
ota::OtaService& ota,
webradio::WebRadioService& webRadio,
PhoneStreamSink& phoneStream,
AntennaCalibration& antennaCalibration,
core::CompanionChipStatus companionChips,
const core::DeviceIdentity& deviceIdentity)
{
@@ -1889,6 +1946,7 @@ std::expected<void, NetError> SetupWebServer::start(
routeContext.ota = &ota;
routeContext.webRadio = &webRadio;
routeContext.phoneStream = &phoneStream;
routeContext.antennaCalibration = &antennaCalibration;
routeContext.companionChips = companionChips;
routeContext.deviceIdentity = deviceIdentity;
@@ -2001,6 +2059,14 @@ std::expected<void, NetError> SetupWebServer::start(
};
httpd_register_uri_handler(server_, &tunerFullScanUri);
const httpd_uri_t tunerCalibrateAntennaUri = {
.uri = "/api/tuner/calibrate-antenna",
.method = HTTP_POST,
.handler = tunerCalibrateAntennaPostHandler,
.user_ctx = routeCtx,
};
httpd_register_uri_handler(server_, &tunerCalibrateAntennaUri);
const httpd_uri_t audioProfileGetUri = {
.uri = "/api/audio/profile",
.method = HTTP_GET,
Software/components/services/tuner/include/tuner/TunerService.hpp
+21 -1
View File
@@ -87,6 +87,10 @@ public:
*
* @dname tuneFm
* @param frequency Validated FM centre frequency.
* @param antCap Front-end antenna varactor override for this one
* tune (e.g. for a calibration sweep). Omit to use
* defaultFmAntCap_ (the board's saved calibration,
* or hardware auto-tune if never calibrated).
* @return Ok on success, or a TunerError from ITuner.
* @pubstate writes lastFmFrequency_ on success.
*
@@ -94,7 +98,22 @@ public:
* @date 2026-07-06
*/
[[nodiscard]] std::expected<void, core::TunerError> tuneFm(
core::FrequencyKHz frequency);
core::FrequencyKHz frequency,
std::optional<std::uint8_t> antCap = std::nullopt);
/**
* @brief setDefaultFmAntCap — set the board's calibrated ANTCAP.
*
* @dname setDefaultFmAntCap
* @param antCap Value applied to every FM tune that doesn't pass an
* explicit override (0 = chip auto-tune, the factory
* default before any calibration is saved).
* @pubstate writes defaultFmAntCap_. Does not itself re-tune.
*
* @author Michele Bigi
* @date 2026-08-19
*/
void setDefaultFmAntCap(std::uint8_t antCap) noexcept;
/**
* @brief seekFm — seek FM in the given direction.
@@ -200,6 +219,7 @@ private:
std::uint8_t lastDabIndex_;
core::FrequencyKHz lastFmFrequency_;
std::uint8_t volume_;
std::uint8_t defaultFmAntCap_;
std::optional<std::uint32_t> lastPlayedServiceId_;
std::optional<std::uint32_t> lastPlayedComponentId_;
};
Software/components/services/tuner/src/TunerService.cpp
+9 -2
View File
@@ -138,9 +138,15 @@ TunerService::TunerService(core::ITuner& tuner)
, lastDabIndex_(0U)
, lastFmFrequency_(defaultFmFrequency())
, volume_(40U)
, defaultFmAntCap_(0U)
{
}
void TunerService::setDefaultFmAntCap(std::uint8_t antCap) noexcept
{
defaultFmAntCap_ = antCap;
}
std::expected<core::TunerStatus, core::TunerError> TunerService::refreshStatus()
{
auto status = tuner_.readStatus();
@@ -167,9 +173,10 @@ std::expected<void, core::TunerError> TunerService::tuneDab(
}
std::expected<void, core::TunerError> TunerService::tuneFm(
core::FrequencyKHz frequency)
core::FrequencyKHz frequency, std::optional<std::uint8_t> antCap)
{
if (auto result = tuner_.tuneFm(frequency); !result) {
if (auto result = tuner_.tuneFm(frequency, antCap.value_or(defaultFmAntCap_));
!result) {
return result;
}
lastFmFrequency_ = frequency;