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

Add integration startup service and fix Doxygen (fw 0.8.1).

Browse Source 
Replace the services stub with IntegrationService for boot preset recall and tune orchestration, persist last preset in NVS, and remove invalid @return tags that broke CI on T4 metadata headers.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
michele
2026-07-07 00:17:13 +02:00
co-authored by Cursor
parent 0fc714e431
commit d13012ce4b
24 changed files with 858 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Software/components/net/CMakeLists.txt
+1 -1
View File
@@ -7,7 +7,7 @@ idf_component_register(
"src/NetBootstrap.cpp"
INCLUDE_DIRS "include"
EMBED_FILES "www/index.html.gz"
REQUIRES core esp_wifi esp_netif esp_event nvs_flash esp_http_server tuner audio bluetooth station bt1035
REQUIRES core esp_wifi esp_netif esp_event nvs_flash esp_http_server tuner audio bluetooth station integration bt1035
)
target_compile_features(${COMPONENT_LIB} PUBLIC cxx_std_23)
Software/components/net/include/net/NetBootstrap.hpp
+6
View File
@@ -40,6 +40,10 @@ namespace station {
class StationService;
} // namespace station
namespace integration {
class IntegrationService;
} // namespace integration
namespace tuner {
class TunerService;
} // namespace tuner
@@ -68,6 +72,7 @@ public:
* @param audio Audio service exposed by the HTTP API.
* @param bluetooth Bluetooth pairing service for REST routes.
* @param stations Station preset service for REST routes.
* @param integration Application orchestration for preset recall.
* @param companionChips Boot flags exposed on GET /api/health.
* @return NetBootstrap on success, or a NetError.
* @pubstate none
@@ -79,6 +84,7 @@ public:
start(core::ISecureStore& store, tuner::TunerService& tuner,
audio::AudioService& audio, bluetooth::BluetoothService& bluetooth,
station::StationService& stations,
integration::IntegrationService& integration,
core::CompanionChipStatus companionChips);
NetBootstrap(const NetBootstrap&) = delete;
Software/components/net/include/net/SetupWebServer.hpp
+8
View File
@@ -38,6 +38,10 @@ namespace station {
class StationService;
} // namespace station
namespace integration {
class IntegrationService;
} // namespace integration
namespace tuner {
class TunerService;
} // namespace tuner
@@ -63,6 +67,7 @@ struct HttpRouteContext {
audio::AudioService* audio; ///< Audio service for ADAU1701 REST routes.
bluetooth::BluetoothService* bluetooth; ///< Bluetooth pairing REST routes.
station::StationService* stations; ///< Preset list REST routes.
integration::IntegrationService* integration; ///< Preset recall orchestration.
core::CompanionChipStatus companionChips; ///< Boot flags for /api/health.
};
@@ -139,6 +144,7 @@ public:
* @param audio Audio service for the audio REST routes.
* @param bluetooth Bluetooth service for pairing REST routes.
* @param stations Station preset service for list REST routes.
* @param integration Application orchestration for preset recall.
* @param companionChips Boot flags for GET /api/health.
* @return Ok on success, or NetError::HttpServerStartFailed.
* @pubstate writes server_, store_, netState_, and service pointers on success.
@@ -151,6 +157,7 @@ public:
tuner::TunerService& tuner, audio::AudioService& audio,
bluetooth::BluetoothService& bluetooth,
station::StationService& stations,
integration::IntegrationService& integration,
core::CompanionChipStatus companionChips);
private:
@@ -161,6 +168,7 @@ private:
audio::AudioService* audio_;
bluetooth::BluetoothService* bluetooth_;
station::StationService* stations_;
integration::IntegrationService* integration_;
HttpRouteContext routeContext_;
};
Software/components/net/src/NetBootstrap.cpp
+7 -4
View File
@@ -105,6 +105,7 @@ startSetupMode(core::ISecureStore& store, tuner::TunerService& tuner,
audio::AudioService& audio,
bluetooth::BluetoothService& bluetooth,
station::StationService& stations,
integration::IntegrationService& integration,
core::CompanionChipStatus companionChips)
{
esp_netif_create_default_wifi_ap();
@@ -117,7 +118,7 @@ startSetupMode(core::ISecureStore& store, tuner::TunerService& tuner,
SetupWebServer webServer;
if (auto webResult =
webServer.start(store, NetState::SoftApSetup, tuner, audio,
bluetooth, stations, companionChips);
bluetooth, stations, integration, companionChips);
!webResult) {
return std::unexpected(webResult.error());
}
@@ -143,6 +144,7 @@ startStaMode(core::ISecureStore& store, tuner::TunerService& tuner,
audio::AudioService& audio,
bluetooth::BluetoothService& bluetooth,
station::StationService& stations,
integration::IntegrationService& integration,
core::CompanionChipStatus companionChips)
{
auto credsResult = store.loadWifiCredentials();
@@ -161,7 +163,7 @@ startStaMode(core::ISecureStore& store, tuner::TunerService& tuner,
SetupWebServer webServer;
if (auto webResult =
webServer.start(store, NetState::StaConnected, tuner, audio,
bluetooth, stations, companionChips);
bluetooth, stations, integration, companionChips);
!webResult) {
return std::unexpected(webResult.error());
}
@@ -178,6 +180,7 @@ NetBootstrap::start(core::ISecureStore& store, tuner::TunerService& tuner,
audio::AudioService& audio,
bluetooth::BluetoothService& bluetooth,
station::StationService& stations,
integration::IntegrationService& integration,
core::CompanionChipStatus companionChips)
{
if (auto platform = initPlatform(); !platform) {
@@ -190,14 +193,14 @@ NetBootstrap::start(core::ISecureStore& store, tuner::TunerService& tuner,
if (store.hasWifiCredentials()) {
auto staResult = startStaMode(store, tuner, audio, bluetooth, stations,
companionChips);
integration, companionChips);
if (staResult) {
return staResult;
}
ESP_LOGW(kTag, "STA join failed — falling back to setup SoftAP");
}
return startSetupMode(store, tuner, audio, bluetooth, stations,
return startSetupMode(store, tuner, audio, bluetooth, stations, integration,
companionChips);
}
Software/components/net/src/SetupWebServer.cpp
+44 -18
View File
@@ -25,6 +25,7 @@
#include "core/FirmwareVersion.hpp"
#include "core/HealthStatus.hpp"
#include "core/HealthStatusJson.hpp"
#include "core/IntegrationError.hpp"
#include "core/ParseError.hpp"
#include "core/SeekDirection.hpp"
#include "core/StationListJson.hpp"
@@ -35,6 +36,7 @@
#include "audio/AudioService.hpp"
#include "bluetooth/BluetoothService.hpp"
#include "station/StationService.hpp"
#include "integration/IntegrationService.hpp"
#include "bt1035/Bt1035Error.hpp"
#include "esp_http_server.h"
@@ -50,7 +52,7 @@ namespace net {
namespace {
constexpr char kTag[] = "SetupWebServer";
constexpr char kFirmwareVersion[] = "0.8.0";
constexpr char kFirmwareVersion[] = "0.8.1";
constexpr unsigned kRebootDelaySec = 3;
extern const uint8_t www_index_html_gz_start[] asm(
@@ -136,6 +138,22 @@ void rebootTask(void* arg)
return "tuner_error";
}
[[nodiscard]] const char* integrationErrorToken(
core::IntegrationError error) noexcept
{
switch (error) {
case core::IntegrationError::StoreFailed:
return "store_failed";
case core::IntegrationError::PresetNotFound:
return "not_found";
case core::IntegrationError::TuneFailed:
return "tune_failed";
case core::IntegrationError::AudioFailed:
return "audio_failed";
}
return "integration_error";
}
[[nodiscard]] const char* bt1035ErrorToken(bt1035::Bt1035Error error) noexcept
{
switch (error) {
@@ -831,7 +849,7 @@ esp_err_t stationsReorderPostHandler(httpd_req_t* req)
esp_err_t stationsTunePostHandler(httpd_req_t* req)
{
auto* ctx = routeContextFrom(req);
if (ctx == nullptr || ctx->stations == nullptr || ctx->tuner == nullptr) {
if (ctx == nullptr || ctx->integration == nullptr) {
httpd_resp_set_status(req, "503 Service Unavailable");
return httpd_resp_send(req, nullptr, 0);
}
@@ -848,17 +866,14 @@ esp_err_t stationsTunePostHandler(httpd_req_t* req)
httpd_resp_set_type(req, "application/json");
return httpd_resp_send(req, json.c_str(), json.size());
}
if (parsed->index >= ctx->stations->list().stations().size()) {
const std::string json =
core::serializeStationListErrorJson("not_found");
httpd_resp_set_status(req, "404 Not Found");
httpd_resp_set_type(req, "application/json");
return httpd_resp_send(req, json.c_str(), json.size());
}
if (auto tuned = ctx->stations->tuneToIndex(parsed->index); !tuned) {
const std::string json =
core::serializeTunerErrorJson(tunerErrorToken(tuned.error()));
httpd_resp_set_status(req, "500 Internal Server Error");
if (auto tuned = ctx->integration->recallPreset(parsed->index); !tuned) {
const std::string json = core::serializeTunerErrorJson(
integrationErrorToken(tuned.error()));
if (tuned.error() == core::IntegrationError::PresetNotFound) {
httpd_resp_set_status(req, "404 Not Found");
} else {
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());
}
@@ -876,7 +891,8 @@ SetupWebServer::SetupWebServer()
, audio_(nullptr)
, bluetooth_(nullptr)
, stations_(nullptr)
, routeContext_{nullptr, nullptr, nullptr, nullptr, nullptr, {}}
, integration_(nullptr)
, routeContext_{nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, {}}
{
}
@@ -888,6 +904,7 @@ SetupWebServer::SetupWebServer(SetupWebServer&& other) noexcept
, audio_(other.audio_)
, bluetooth_(other.bluetooth_)
, stations_(other.stations_)
, integration_(other.integration_)
, routeContext_(other.routeContext_)
{
other.server_ = nullptr;
@@ -897,7 +914,9 @@ SetupWebServer::SetupWebServer(SetupWebServer&& other) noexcept
other.audio_ = nullptr;
other.bluetooth_ = nullptr;
other.stations_ = nullptr;
other.routeContext_ = {nullptr, nullptr, nullptr, nullptr, nullptr, {}};
other.integration_ = nullptr;
other.routeContext_ = {nullptr, nullptr, nullptr, nullptr, nullptr,
nullptr, {}};
}
SetupWebServer& SetupWebServer::operator=(SetupWebServer&& other) noexcept
@@ -913,6 +932,7 @@ SetupWebServer& SetupWebServer::operator=(SetupWebServer&& other) noexcept
audio_ = other.audio_;
bluetooth_ = other.bluetooth_;
stations_ = other.stations_;
integration_ = other.integration_;
routeContext_ = other.routeContext_;
other.server_ = nullptr;
other.store_ = nullptr;
@@ -921,7 +941,9 @@ SetupWebServer& SetupWebServer::operator=(SetupWebServer&& other) noexcept
other.audio_ = nullptr;
other.bluetooth_ = nullptr;
other.stations_ = nullptr;
other.routeContext_ = {nullptr, nullptr, nullptr, nullptr, nullptr, {}};
other.integration_ = nullptr;
other.routeContext_ = {nullptr, nullptr, nullptr, nullptr, nullptr,
nullptr, {}};
}
return *this;
}
@@ -932,7 +954,7 @@ SetupWebServer::~SetupWebServer()
httpd_stop(server_);
server_ = nullptr;
}
routeContext_ = {nullptr, nullptr, nullptr, nullptr, nullptr, {}};
routeContext_ = {nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, {}};
}
std::expected<void, NetError> SetupWebServer::start(
@@ -942,6 +964,7 @@ std::expected<void, NetError> SetupWebServer::start(
audio::AudioService& audio,
bluetooth::BluetoothService& bluetooth,
station::StationService& stations,
integration::IntegrationService& integration,
core::CompanionChipStatus companionChips)
{
if (server_ != nullptr) {
@@ -954,11 +977,13 @@ std::expected<void, NetError> SetupWebServer::start(
audio_ = &audio;
bluetooth_ = &bluetooth;
stations_ = &stations;
integration_ = &integration;
routeContext_.store = &store;
routeContext_.tuner = &tuner;
routeContext_.audio = &audio;
routeContext_.bluetooth = &bluetooth;
routeContext_.stations = &stations;
routeContext_.integration = &integration;
routeContext_.companionChips = companionChips;
httpd_config_t config = HTTPD_DEFAULT_CONFIG();
@@ -967,7 +992,8 @@ std::expected<void, NetError> SetupWebServer::start(
if (httpd_start(&server_, &config) != ESP_OK) {
ESP_LOGE(kTag, "httpd_start failed");
routeContext_ = {nullptr, nullptr, nullptr, nullptr, nullptr, {}};
routeContext_ = {nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
{}};
return std::unexpected(NetError::HttpServerStartFailed);
}