Adds a thin adapter layer that maps installer-visible roles (EVCharger, DHW, HeatPump, Battery, SolarMeter, GridMeter) to nymea Things and applies Scheduler slot decisions to real hardware. New files: - energyplugin/types/loadrole.h — LoadRole enum + compat interface map - energyplugin/adapters/iloadapter.h — abstract ILoadAdapter interface - energyplugin/adapters/relayadapter.h/.cpp — binary on/off relay (DHW/HP) - energyplugin/adapters/sgreadyadapter.h/.cpp — SG-Ready 2-relay HP (SG1–SG4) - energyplugin/adapters/evchargeradapter.h/.cpp — EV charger W→A adapter - energyplugin/adapters/batteryadapter.h/.cpp — battery charge/discharge/standby - energyplugin/adapters/loadadapterregistry.h/.cpp — role→Thing→adapter registry - energyplugin/adapters/adaptersettings.h/.cpp — persists to adapters.conf (INI) Modified: - SchedulerManager: optional LoadAdapterRegistry param; applyCurrentSlot() now calls adapter->applyPower() for DHW/HP/Battery roles - NymeaEnergyJsonHandler: 6 new v12 methods (GetSetupStatus, GetCompatibleThings, AssignThingToRole, UnassignRole, SetRoleEnabled, TestRoleConnection) + 3 push notifications - energypluginnymea.cpp: wires AdapterSettings + LoadAdapterRegistry, bumps JSON-RPC version to 12 - energyplugin.pri: adds 7 headers + 6 sources - testscheduler: 4 new tests (detectAdapterType, AdapterSettings round-trip, null-registry no-crash, LoadRole serialization) — 15/15 pass - doc.md: section 12 Installer Setup Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
127 lines
4.1 KiB
C++
127 lines
4.1 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 "adaptersettings.h"
|
|
|
|
#include <nymeasettings.h>
|
|
|
|
#include <QSettings>
|
|
#include <QLoggingCategory>
|
|
|
|
Q_DECLARE_LOGGING_CATEGORY(dcNymeaEnergy)
|
|
|
|
AdapterSettings::AdapterSettings(QObject *parent)
|
|
: QObject(parent)
|
|
{
|
|
load();
|
|
}
|
|
|
|
QString AdapterSettings::settingsFilePath() const
|
|
{
|
|
// Allow test override via environment variable
|
|
const QString envPath = qEnvironmentVariable("NYMEA_ADAPTER_SETTINGS");
|
|
if (!envPath.isEmpty())
|
|
return envPath;
|
|
return NymeaSettings::settingsPath() + QStringLiteral("/adapters.conf");
|
|
}
|
|
|
|
QList<QVariantMap> AdapterSettings::assignments() const
|
|
{
|
|
return m_assignments;
|
|
}
|
|
|
|
void AdapterSettings::save(const QList<QVariantMap> &assignments)
|
|
{
|
|
m_assignments = assignments;
|
|
|
|
QSettings s(settingsFilePath(), QSettings::IniFormat);
|
|
s.remove(QStringLiteral("roles")); // clear previous
|
|
|
|
s.beginWriteArray(QStringLiteral("roles"), m_assignments.size());
|
|
for (int i = 0; i < m_assignments.size(); ++i) {
|
|
s.setArrayIndex(i);
|
|
const QVariantMap &m = m_assignments.at(i);
|
|
for (auto it = m.constBegin(); it != m.constEnd(); ++it) {
|
|
s.setValue(it.key(), it.value());
|
|
}
|
|
}
|
|
s.endArray();
|
|
|
|
qCDebug(dcNymeaEnergy()) << "AdapterSettings: saved" << m_assignments.size()
|
|
<< "role assignment(s) to" << settingsFilePath();
|
|
}
|
|
|
|
void AdapterSettings::setAssignment(LoadRole role, const QVariantMap ¶ms)
|
|
{
|
|
const QString roleStr = loadRoleToString(role);
|
|
for (int i = 0; i < m_assignments.size(); ++i) {
|
|
if (m_assignments.at(i).value(QStringLiteral("role")).toString() == roleStr) {
|
|
QVariantMap merged = m_assignments.at(i);
|
|
for (auto it = params.constBegin(); it != params.constEnd(); ++it)
|
|
merged.insert(it.key(), it.value());
|
|
merged.insert(QStringLiteral("role"), roleStr);
|
|
m_assignments[i] = merged;
|
|
save(m_assignments);
|
|
return;
|
|
}
|
|
}
|
|
// New assignment
|
|
QVariantMap m = params;
|
|
m.insert(QStringLiteral("role"), roleStr);
|
|
m_assignments.append(m);
|
|
save(m_assignments);
|
|
}
|
|
|
|
void AdapterSettings::removeAssignment(LoadRole role)
|
|
{
|
|
const QString roleStr = loadRoleToString(role);
|
|
for (int i = 0; i < m_assignments.size(); ++i) {
|
|
if (m_assignments.at(i).value(QStringLiteral("role")).toString() == roleStr) {
|
|
m_assignments.removeAt(i);
|
|
save(m_assignments);
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
|
|
void AdapterSettings::load()
|
|
{
|
|
m_assignments.clear();
|
|
QSettings s(settingsFilePath(), QSettings::IniFormat);
|
|
|
|
int count = s.beginReadArray(QStringLiteral("roles"));
|
|
for (int i = 0; i < count; ++i) {
|
|
s.setArrayIndex(i);
|
|
QVariantMap m;
|
|
foreach (const QString &key, s.childKeys())
|
|
m.insert(key, s.value(key));
|
|
if (!m.isEmpty())
|
|
m_assignments.append(m);
|
|
}
|
|
s.endArray();
|
|
|
|
qCDebug(dcNymeaEnergy()) << "AdapterSettings: loaded" << m_assignments.size()
|
|
<< "role assignment(s) from" << settingsFilePath();
|
|
}
|