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
285 lines
9.9 KiB
C++
285 lines
9.9 KiB
C++
/**
|
|
* @file NetBootstrap.cpp
|
|
* @brief NetBootstrap implementation.
|
|
*
|
|
* DigiRadio firmware — https://github.com/manvalan/DigiRadio
|
|
*
|
|
* Copyright 2026 Michele Bigi
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* @author Michele Bigi
|
|
* @date 2026-07-06
|
|
*/
|
|
|
|
#include "net/NetBootstrap.hpp"
|
|
|
|
#include "esp_event.h"
|
|
#include "esp_log.h"
|
|
#include "esp_netif.h"
|
|
#include "esp_wifi.h"
|
|
#include "audio/AudioService.hpp"
|
|
#include "net/BleProvisioning.hpp"
|
|
#include "bluetooth/BluetoothService.hpp"
|
|
#include "secure_store/NvsPlatformInit.hpp"
|
|
#include "station/StationService.hpp"
|
|
#include "tuner/TunerService.hpp"
|
|
#include "webradio/WebRadioService.hpp"
|
|
|
|
namespace net {
|
|
|
|
namespace {
|
|
constexpr char kTag[] = "NetBootstrap";
|
|
|
|
/**
|
|
* @brief initPlatform — one-time NVS and TCP/IP stack bring-up.
|
|
*
|
|
* @dname initPlatform
|
|
* @return Ok on success, or a NetError describing the failure.
|
|
* @pubstate initialises encrypted NVS, esp_netif, and the default event loop.
|
|
*
|
|
* @author Michele Bigi
|
|
* @date 2026-07-06
|
|
*/
|
|
[[nodiscard]] std::expected<void, NetError> initPlatform()
|
|
{
|
|
const auto nvsResult = secure_store::initEncryptedStorage();
|
|
if (!nvsResult) {
|
|
ESP_LOGE(kTag, "NVS init failed");
|
|
return std::unexpected(NetError::NvsInitFailed);
|
|
}
|
|
|
|
if (esp_netif_init() != ESP_OK) {
|
|
ESP_LOGE(kTag, "esp_netif_init failed");
|
|
return std::unexpected(NetError::NetifInitFailed);
|
|
}
|
|
|
|
if (esp_event_loop_create_default() != ESP_OK) {
|
|
ESP_LOGE(kTag, "esp_event_loop_create_default failed");
|
|
return std::unexpected(NetError::EventLoopFailed);
|
|
}
|
|
|
|
return {};
|
|
}
|
|
|
|
/**
|
|
* @brief initWifiStack — initialise the Wi-Fi driver once.
|
|
*
|
|
* @dname initWifiStack
|
|
* @return Ok on success, or NetError::WifiInitFailed.
|
|
* @pubstate calls esp_wifi_init.
|
|
*
|
|
* @author Michele Bigi
|
|
* @date 2026-07-06
|
|
*/
|
|
[[nodiscard]] std::expected<void, NetError> initWifiStack()
|
|
{
|
|
wifi_init_config_t initCfg = WIFI_INIT_CONFIG_DEFAULT();
|
|
if (esp_wifi_init(&initCfg) != ESP_OK) {
|
|
ESP_LOGE(kTag, "esp_wifi_init failed");
|
|
return std::unexpected(NetError::WifiInitFailed);
|
|
}
|
|
return {};
|
|
}
|
|
|
|
/**
|
|
* @brief startSetupMode — SoftAP plus HTTP for first-time provisioning.
|
|
*
|
|
* @dname startSetupMode
|
|
* @param store Store passed through to the web server routes.
|
|
* @return NetBootstrap in SoftApSetup, or a NetError.
|
|
* @pubstate creates default Wi-Fi AP netif and starts SoftAP.
|
|
*
|
|
* @author Michele Bigi
|
|
* @date 2026-07-06
|
|
*/
|
|
[[nodiscard]] std::expected<NetBootstrap, NetError>
|
|
startSetupMode(core::ISecureStore& store, tuner::TunerService& tuner,
|
|
audio::AudioService& audio,
|
|
bluetooth::BluetoothService& bluetooth,
|
|
station::StationService& stations,
|
|
integration::IntegrationService& integration,
|
|
ota::OtaService& ota,
|
|
webradio::WebRadioService& webRadio,
|
|
PhoneStreamSink& phoneStream,
|
|
AntennaCalibration& antennaCalibration,
|
|
core::CompanionChipStatus companionChips,
|
|
const core::DeviceIdentity& deviceIdentity)
|
|
{
|
|
esp_netif_create_default_wifi_ap();
|
|
esp_netif_create_default_wifi_sta();
|
|
|
|
SoftApHost softAp(SoftApConfig::forSsid(deviceIdentity.softApSsid()));
|
|
if (auto apResult = softAp.start(); !apResult) {
|
|
return std::unexpected(apResult.error());
|
|
}
|
|
|
|
SetupWebServer webServer;
|
|
if (auto webResult =
|
|
webServer.start(store, NetState::SoftApSetup, tuner, audio,
|
|
bluetooth, stations, integration, ota, webRadio,
|
|
phoneStream, antennaCalibration, companionChips,
|
|
deviceIdentity);
|
|
!webResult) {
|
|
return std::unexpected(webResult.error());
|
|
}
|
|
|
|
SigmaStudioTcpServer sigmaStudio;
|
|
if (auto sigmaResult = sigmaStudio.start(); !sigmaResult) {
|
|
ESP_LOGW(kTag, "SigmaStudio TCP bridge failed to start — continuing "
|
|
"without it");
|
|
}
|
|
|
|
// Additive: a phone can provision over BLE (no need to first join the
|
|
// SoftAP) while the HTTP route above keeps working as before. Non-fatal
|
|
// — setup mode is still fully usable via SoftAP if this fails.
|
|
if (auto bleResult = ble_provisioning::start(store, deviceIdentity);
|
|
!bleResult) {
|
|
ESP_LOGW(kTag, "BLE provisioning failed to start — SoftAP setup "
|
|
"still available");
|
|
}
|
|
|
|
ESP_LOGI(kTag, "setup mode ready — SSID %.*s",
|
|
static_cast<int>(deviceIdentity.softApSsid().size()),
|
|
deviceIdentity.softApSsid().data());
|
|
return NetBootstrap(std::move(softAp), std::nullopt, std::move(webServer),
|
|
std::move(sigmaStudio), NetState::SoftApSetup);
|
|
}
|
|
|
|
/**
|
|
* @brief startStaMode — join stored Wi-Fi and serve HTTP on STA.
|
|
*
|
|
* @dname startStaMode
|
|
* @param store Store supplying validated STA credentials.
|
|
* @return NetBootstrap in StaConnected, or a NetError.
|
|
* @pubstate creates default Wi-Fi STA netif and connects.
|
|
*
|
|
* @author Michele Bigi
|
|
* @date 2026-07-06
|
|
*/
|
|
[[nodiscard]] std::expected<NetBootstrap, NetError>
|
|
startStaMode(core::ISecureStore& store, tuner::TunerService& tuner,
|
|
audio::AudioService& audio,
|
|
bluetooth::BluetoothService& bluetooth,
|
|
station::StationService& stations,
|
|
integration::IntegrationService& integration,
|
|
ota::OtaService& ota,
|
|
webradio::WebRadioService& webRadio,
|
|
PhoneStreamSink& phoneStream,
|
|
AntennaCalibration& antennaCalibration,
|
|
core::CompanionChipStatus companionChips,
|
|
const core::DeviceIdentity& deviceIdentity)
|
|
{
|
|
auto credsResult = store.loadWifiCredentials();
|
|
if (!credsResult) {
|
|
ESP_LOGE(kTag, "stored credentials missing or unreadable");
|
|
return std::unexpected(NetError::CredentialsNotFound);
|
|
}
|
|
|
|
const auto& creds = credsResult.value();
|
|
ESP_LOGI(kTag, "joining SSID %.*s",
|
|
static_cast<int>(creds.ssid().value().size()),
|
|
creds.ssid().value().data());
|
|
|
|
esp_netif_create_default_wifi_sta();
|
|
|
|
StaClient sta;
|
|
if (auto staResult =
|
|
sta.connect(creds, deviceIdentity.hostname());
|
|
!staResult) {
|
|
ESP_LOGW(kTag, "STA connect failed for SSID %.*s — credentials kept in NVS",
|
|
static_cast<int>(creds.ssid().value().size()),
|
|
creds.ssid().value().data());
|
|
return std::unexpected(staResult.error());
|
|
}
|
|
|
|
SetupWebServer webServer;
|
|
if (auto webResult =
|
|
webServer.start(store, NetState::StaConnected, tuner, audio,
|
|
bluetooth, stations, integration, ota, webRadio,
|
|
phoneStream, antennaCalibration, companionChips,
|
|
deviceIdentity);
|
|
!webResult) {
|
|
return std::unexpected(webResult.error());
|
|
}
|
|
|
|
SigmaStudioTcpServer sigmaStudio;
|
|
if (auto sigmaResult = sigmaStudio.start(); !sigmaResult) {
|
|
ESP_LOGW(kTag, "SigmaStudio TCP bridge failed to start — continuing "
|
|
"without it");
|
|
}
|
|
|
|
ESP_LOGI(kTag, "STA mode ready — hostname %.*s.local",
|
|
static_cast<int>(deviceIdentity.hostname().size()),
|
|
deviceIdentity.hostname().data());
|
|
return NetBootstrap(std::nullopt, std::move(sta), std::move(webServer),
|
|
std::move(sigmaStudio), NetState::StaConnected);
|
|
}
|
|
|
|
} // namespace
|
|
|
|
std::expected<NetBootstrap, NetError>
|
|
NetBootstrap::start(core::ISecureStore& store, tuner::TunerService& tuner,
|
|
audio::AudioService& audio,
|
|
bluetooth::BluetoothService& bluetooth,
|
|
station::StationService& stations,
|
|
integration::IntegrationService& integration,
|
|
ota::OtaService& ota,
|
|
webradio::WebRadioService& webRadio,
|
|
PhoneStreamSink& phoneStream,
|
|
AntennaCalibration& antennaCalibration,
|
|
core::CompanionChipStatus companionChips,
|
|
const core::DeviceIdentity& deviceIdentity)
|
|
{
|
|
if (auto platform = initPlatform(); !platform) {
|
|
return std::unexpected(platform.error());
|
|
}
|
|
|
|
if (auto wifi = initWifiStack(); !wifi) {
|
|
return std::unexpected(wifi.error());
|
|
}
|
|
|
|
if (store.hasWifiCredentials()) {
|
|
auto staResult = startStaMode(store, tuner, audio, bluetooth, stations,
|
|
integration, ota, webRadio, phoneStream,
|
|
antennaCalibration, companionChips,
|
|
deviceIdentity);
|
|
if (staResult) {
|
|
return staResult;
|
|
}
|
|
ESP_LOGW(kTag,
|
|
"STA join failed — Wi-Fi credentials are stored; check "
|
|
"SSID/password or signal (falling back to setup SoftAP)");
|
|
} else {
|
|
ESP_LOGI(kTag, "no stored Wi-Fi credentials — entering setup SoftAP");
|
|
}
|
|
|
|
return startSetupMode(store, tuner, audio, bluetooth, stations, integration,
|
|
ota, webRadio, phoneStream, antennaCalibration,
|
|
companionChips, deviceIdentity);
|
|
}
|
|
|
|
NetBootstrap::NetBootstrap(std::optional<SoftApHost> softAp,
|
|
std::optional<StaClient> sta,
|
|
SetupWebServer webServer,
|
|
SigmaStudioTcpServer sigmaStudio,
|
|
NetState state)
|
|
: softAp_(std::move(softAp))
|
|
, sta_(std::move(sta))
|
|
, webServer_(std::move(webServer))
|
|
, sigmaStudio_(std::move(sigmaStudio))
|
|
, state_(state)
|
|
{
|
|
}
|
|
|
|
NetState NetBootstrap::state() const noexcept
|
|
{
|
|
return state_;
|
|
}
|
|
|
|
} // namespace net
|