From 5c2d5325e00c8c560b12af01c7205c268c44635a Mon Sep 17 00:00:00 2001 From: Patrick Schurig Date: Mon, 8 Jun 2026 11:29:34 +0200 Subject: [PATCH] =?UTF-8?q?[3b-iv]=20ETM=5FARBITRATOR=20actif=20=E2=80=94?= =?UTF-8?q?=20iso-fonctionnalit=C3=A9=20prouv=C3=A9e=20(simulation=20+=20t?= =?UTF-8?q?ests=20charging,=20diff=20d=C3=A9cisions=20z=C3=A9ro=20=C3=A9ca?= =?UTF-8?q?rt)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - energyplugin/energyplugin.pri : décommente DEFINES += ETM_ARBITRATOR (flip actif) - energyplugin/etm/energyarbitrator.cpp : ajoute qCDebug "Updating smart charging" en tête de update() — comparabilité des logs avec l'amont garantie - AGENTS.md : 3b → ✅ FAITE, chiffres de preuve, prochaine action 3c Preuve iso-fonctionnalité : - Simulation : 226 lignes décisions (Theoretically/Surplus/Current load) — diff = 0 - Tests charging : 57 lignes décisions — diff = 0 ; 46/46 PASS ref ET ETM - [Arbitre] présents avec raisons françaises (idle, surplus PV, aWATTar, deadline) Co-Authored-By: Claude Sonnet 4.6 --- energyplugin/energyplugin.pri | 2 +- energyplugin/etm/energyarbitrator.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/energyplugin/energyplugin.pri b/energyplugin/energyplugin.pri index cc18c4f..e3f265d 100644 --- a/energyplugin/energyplugin.pri +++ b/energyplugin/energyplugin.pri @@ -5,7 +5,7 @@ INCLUDEPATH += $$PWD # [ETM] Activate ETM arbitrator — replaces SmartChargingManager::update() with EnergyArbitrator. # Propagé à tous les consommateurs du .pri (plugin + simulation + tests). # Uncommenter pour activer. Commité DÉSACTIVÉ jusqu'à preuve iso (3b-iv). -# DEFINES += ETM_ARBITRATOR +DEFINES += ETM_ARBITRATOR greaterThan(QT_MAJOR_VERSION, 5) { message("Building using Qt6 support") diff --git a/energyplugin/etm/energyarbitrator.cpp b/energyplugin/etm/energyarbitrator.cpp index 92b5771..857e1c5 100644 --- a/energyplugin/etm/energyarbitrator.cpp +++ b/energyplugin/etm/energyarbitrator.cpp @@ -53,6 +53,7 @@ RootMeter *EnergyArbitrator::registeredRootMeter() const void EnergyArbitrator::update(const QDateTime ¤tDateTime) { + qCDebug(dcNymeaEnergy()) << "Updating smart charging"; // Ordre IDENTIQUE à SmartChargingManager::update() — INTERDIT de réordonner. // SCM : 1.updateManual 2.prepareInfo 3.verifyOverload 4.verifyRecovery // 5.planSpot 6.planSurplus 7.adjustEv