pakutz79
67836b7234
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>
85 lines
2.6 KiB
C++
85 lines
2.6 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/>.
|
|
*
|
|
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
|
|
|
#ifndef ADAPTERSETTINGS_H
|
|
#define ADAPTERSETTINGS_H
|
|
|
|
#include <QObject>
|
|
#include <QList>
|
|
#include <QVariantMap>
|
|
|
|
#include "types/loadrole.h"
|
|
|
|
// Persists LoadAdapterRegistry role assignments to:
|
|
// NymeaSettings::settingsPath() + "/adapters.conf" (QSettings INI)
|
|
//
|
|
// Section layout:
|
|
// [roles]
|
|
// size = N
|
|
//
|
|
// [roles/1]
|
|
// role = DHW
|
|
// enabled = true
|
|
// thingId = <uuid>
|
|
// adapterType = relay
|
|
// nominalPowerW = 2000
|
|
//
|
|
// [roles/2]
|
|
// role = HeatPump
|
|
// enabled = true
|
|
// thingId = <uuid>
|
|
// adapterType = sgready
|
|
// relay1ThingId = <uuid>
|
|
// relay2ThingId = <uuid>
|
|
// normalPowerW = 1500
|
|
class AdapterSettings : public QObject
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
explicit AdapterSettings(QObject *parent = nullptr);
|
|
|
|
// Return all saved role assignments (one QVariantMap per role).
|
|
// Each map contains at least: "role", "enabled", "thingId", "adapterType".
|
|
QList<QVariantMap> assignments() const;
|
|
|
|
// Persist the given set of raw assignment maps (from LoadAdapterRegistry::rawAssignments()).
|
|
void save(const QList<QVariantMap> &assignments);
|
|
|
|
// Override a single role's assignment (loads first, then upserts).
|
|
void setAssignment(LoadRole role, const QVariantMap ¶ms);
|
|
|
|
// Remove a single role's assignment by role name.
|
|
void removeAssignment(LoadRole role);
|
|
|
|
// Path of the settings file (for testing: override via NYMEA_ADAPTER_SETTINGS env var).
|
|
QString settingsFilePath() const;
|
|
|
|
private:
|
|
void load();
|
|
|
|
QList<QVariantMap> m_assignments;
|
|
};
|
|
|
|
#endif // ADAPTERSETTINGS_H
|