7184fe4e1d
Pont moteur↔app : déclaration des charges etmvariableload persistée et éditable, construction des adaptateurs à chaud depuis la config (remplace le registre en dur). - LoadConfig / LoadConfigNeeds (Q_GADGET typés, introspectables) — forme mot pour mot du LoadDescriptor §4 (jonction inter-repos avec l'app). - LoadConfigStore : persistance atomique /var/lib/nymea/energy-load-configuration.json, validation en bloc, signal changed(). - Handler NymeaEnergy.GetLoadConfig / SetLoadConfig (+ notif LoadConfigChanged). GET typé objectRef<LoadConfig> ; SET schéma inline o: (powerLevels/needs conditionnels §4). - EnergyArbitrator : setLoadConfigStore + rebuildEtmVariableLoadAdapters (enabled==true seulement, §9) ; repli L2 = setPowerSetpoint(0) force=true sur tout etmvariableload (ferme le trou sécurité ouvert en T2). - Tests simulation : migration ECS→etmvariableload (arrondi fixed/dynamic, recrédit, délestage, round-trip powerSetpoint), budget partagé etmvariableload↔PAC, watchdog L2 réactivé, persistance + construction depuis config + injection RPC end-to-end. PAC SG-Ready reste hors config (§8, gelée). Les 5 tâches du brief sont couvertes. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
83 lines
3.4 KiB
C++
83 lines
3.4 KiB
C++
// SPDX-License-Identifier: GPL-3.0-or-later
|
|
|
|
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
|
*
|
|
* Copyright (C) 2013 - 2024, nymea GmbH
|
|
* Copyright (C) 2024 - 2025, chargebyte austria GmbH
|
|
*
|
|
* This file is part of nymea-energy-plugin-nymea.
|
|
*
|
|
* nymea-energy-plugin-nymea.s free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* nymea-energy-plugin-nymea.s distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with nymea-energy-plugin-nymea. If not, see <https://www.gnu.org/licenses/>.
|
|
*
|
|
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
|
|
|
#include "energypluginnymea.h"
|
|
#include "smartchargingmanager.h"
|
|
#include "nymeaenergyjsonhandler.h"
|
|
#include "energymanagerconfiguration.h"
|
|
#include "spotmarket/spotmarketmanager.h"
|
|
|
|
// [ETM] BEGIN — EnergyArbitrator flip. Remove block to revert to upstream SmartChargingManager.
|
|
#ifdef ETM_ARBITRATOR
|
|
#include "etm/energyarbitrator.h"
|
|
#include "etm/adapters/sgreadyadapter.h"
|
|
#include "etm/config/loadconfigstore.h"
|
|
#endif
|
|
// [ETM] END
|
|
|
|
#include "plugininfo.h"
|
|
|
|
EnergyPluginNymea::EnergyPluginNymea(QObject *parent) : EnergyPlugin(parent)
|
|
{
|
|
qCDebug(dcNymeaEnergy()) << "Loading nymea.energy plugin";
|
|
}
|
|
|
|
void EnergyPluginNymea::init()
|
|
{
|
|
qCDebug(dcNymeaEnergy()) << "Initializing nymea.energy plugin";
|
|
|
|
EnergyManagerConfiguration *configuration = new EnergyManagerConfiguration(this);
|
|
QNetworkAccessManager *networkManager = new QNetworkAccessManager(this);
|
|
SpotMarketManager *spotMarketManager = new SpotMarketManager(networkManager, this);
|
|
|
|
LoadConfigStore *loadConfigStore = nullptr;
|
|
|
|
#ifdef ETM_ARBITRATOR
|
|
qCDebug(dcNymeaEnergy()) << "ETM_ARBITRATOR actif — EnergyArbitrator chargé.";
|
|
EnergyArbitrator *chargingManager = new EnergyArbitrator(energyManager(), thingManager(), spotMarketManager, configuration, this);
|
|
|
|
// T4 — charges pilotables etmvariableload (ECS/routeur) construites depuis la config
|
|
// persistée (remplace le registre en dur « 3g »). SetLoadConfig pilote ce store.
|
|
loadConfigStore = new LoadConfigStore(this);
|
|
chargingManager->setLoadConfigStore(loadConfigStore);
|
|
|
|
// §1.d — Banc hems : SG-Ready PAC (ThingIds briefing terrain) — PAC hors config (§8, gelée).
|
|
{
|
|
ThingManager *tm = thingManager();
|
|
const QString K1 = "{beaf92e1-aedc-4b84-9ce4-e423648638cc}";
|
|
const QString K2 = "{bf236e64-5ae7-4bf1-82a6-4ede03de75a6}";
|
|
auto *pac = new SgReadyAdapter(
|
|
tm, "pac-terrain", "PAC banc",
|
|
QHash<int,QList<QString>>({ {1,{K1}}, {2,{}}, {3,{K2}}, {4,{K1,K2}} }),
|
|
QHash<int,double>({ {1,0.0}, {2,0.0}, {3,1500.0}, {4,3000.0} }),
|
|
300, 2, chargingManager);
|
|
chargingManager->registerSgReadyAdapter(pac);
|
|
}
|
|
#else
|
|
SmartChargingManager *chargingManager = new SmartChargingManager(energyManager(), thingManager(), spotMarketManager, configuration, this);
|
|
#endif
|
|
|
|
jsonRpcServer()->registerExperienceHandler(new NymeaEnergyJsonHandler(spotMarketManager, chargingManager, loadConfigStore, this), 0, 8);
|
|
}
|