ETM-Schurig/powersync-plugins-modbus
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix libnymea-sunspec byteorder initialization

Browse Source
This commit is contained in:
Simon Stürz 2021-12-12 10:39:54 +01:00
parent 2da631710f
commit 1de0cd9ac5
129 changed files with 261 additions and 388 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libnymea-sunspec/models/sunspecaggregatormodel.cpp
View File

@ -31,8 +31,8 @@
#include "sunspecaggregatormodel.h"
#include "sunspecconnection.h"
SunSpecAggregatorModel::SunSpecAggregatorModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 2, modelLength, parent)
SunSpecAggregatorModel::SunSpecAggregatorModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 2, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixed;

2
libnymea-sunspec/models/sunspecaggregatormodel.h
View File

@ -85,7 +85,7 @@ public:
Q_DECLARE_FLAGS(EvtFlags, Evt)
Q_FLAG(Evt)
explicit SunSpecAggregatorModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecAggregatorModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecAggregatorModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspecbasemetmodel.cpp
View File

@ -31,8 +31,8 @@
#include "sunspecbasemetmodel.h"
#include "sunspecconnection.h"
SunSpecBaseMetModel::SunSpecBaseMetModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 307, modelLength, parent)
SunSpecBaseMetModel::SunSpecBaseMetModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 307, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixed;

2
libnymea-sunspec/models/sunspecbasemetmodel.h
View File

@ -42,7 +42,7 @@ class SunSpecBaseMetModel : public SunSpecModel
Q_OBJECT
public:
explicit SunSpecBaseMetModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecBaseMetModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecBaseMetModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspecbatterymodel.cpp
View File

@ -31,8 +31,8 @@
#include "sunspecbatterymodel.h"
#include "sunspecconnection.h"
SunSpecBatteryModel::SunSpecBatteryModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 802, modelLength, parent)
SunSpecBatteryModel::SunSpecBatteryModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 802, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixed;

2
libnymea-sunspec/models/sunspecbatterymodel.h
View File

@ -141,7 +141,7 @@ public:
Q_DECLARE_FLAGS(Evt1Flags, Evt1)
Q_FLAG(Evt1)
explicit SunSpecBatteryModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecBatteryModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecBatteryModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspeccommonmodel.cpp
View File

@ -31,8 +31,8 @@
#include "sunspeccommonmodel.h"
#include "sunspecconnection.h"
SunSpecCommonModel::SunSpecCommonModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 1, modelLength, parent)
SunSpecCommonModel::SunSpecCommonModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 1, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixed;

2
libnymea-sunspec/models/sunspeccommonmodel.h
View File

@ -42,7 +42,7 @@ class SunSpecCommonModel : public SunSpecModel
Q_OBJECT
public:
explicit SunSpecCommonModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecCommonModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecCommonModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspeccontrolsmodel.cpp
View File

@ -31,8 +31,8 @@
#include "sunspeccontrolsmodel.h"
#include "sunspecconnection.h"
SunSpecControlsModel::SunSpecControlsModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 123, modelLength, parent)
SunSpecControlsModel::SunSpecControlsModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 123, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixed;

2
libnymea-sunspec/models/sunspeccontrolsmodel.h
View File

@ -74,7 +74,7 @@ public:
};
Q_ENUM(Varpct_ena)
explicit SunSpecControlsModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecControlsModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecControlsModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspecdeltaconnectthreephaseabcmetermodel.cpp
View File

@ -31,8 +31,8 @@
#include "sunspecdeltaconnectthreephaseabcmetermodel.h"
#include "sunspecconnection.h"
SunSpecDeltaConnectThreePhaseAbcMeterModel::SunSpecDeltaConnectThreePhaseAbcMeterModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 214, modelLength, parent)
SunSpecDeltaConnectThreePhaseAbcMeterModel::SunSpecDeltaConnectThreePhaseAbcMeterModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 214, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixed;

2
libnymea-sunspec/models/sunspecdeltaconnectthreephaseabcmetermodel.h
View File

@ -76,7 +76,7 @@ public:
Q_DECLARE_FLAGS(EvtFlags, Evt)
Q_FLAG(Evt)
explicit SunSpecDeltaConnectThreePhaseAbcMeterModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecDeltaConnectThreePhaseAbcMeterModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecDeltaConnectThreePhaseAbcMeterModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspecenergystoragebasemodeldeprecatedmodel.cpp
View File

@ -31,8 +31,8 @@
#include "sunspecenergystoragebasemodeldeprecatedmodel.h"
#include "sunspecconnection.h"
SunSpecEnergyStorageBaseModelDeprecatedModel::SunSpecEnergyStorageBaseModelDeprecatedModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 801, modelLength, parent)
SunSpecEnergyStorageBaseModelDeprecatedModel::SunSpecEnergyStorageBaseModelDeprecatedModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 801, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixed;

2
libnymea-sunspec/models/sunspecenergystoragebasemodeldeprecatedmodel.h
View File

@ -42,7 +42,7 @@ class SunSpecEnergyStorageBaseModelDeprecatedModel : public SunSpecModel
Q_OBJECT
public:
explicit SunSpecEnergyStorageBaseModelDeprecatedModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecEnergyStorageBaseModelDeprecatedModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecEnergyStorageBaseModelDeprecatedModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspecextsettingsmodel.cpp
View File

@ -31,8 +31,8 @@
#include "sunspecextsettingsmodel.h"
#include "sunspecconnection.h"
SunSpecExtSettingsModel::SunSpecExtSettingsModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 145, modelLength, parent)
SunSpecExtSettingsModel::SunSpecExtSettingsModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 145, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixed;

2
libnymea-sunspec/models/sunspecextsettingsmodel.h
View File

@ -42,7 +42,7 @@ class SunSpecExtSettingsModel : public SunSpecModel
Q_OBJECT
public:
explicit SunSpecExtSettingsModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecExtSettingsModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecExtSettingsModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspecflowbatterymodel.cpp
View File

@ -80,8 +80,8 @@ void SunSpecFlowBatteryModelRepeatingBlock::processBlockData(const QVector<quint
}
SunSpecFlowBatteryModel::SunSpecFlowBatteryModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 806, modelLength, parent)
SunSpecFlowBatteryModel::SunSpecFlowBatteryModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 806, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixedAndRepeating;

2
libnymea-sunspec/models/sunspecflowbatterymodel.h
View File

@ -72,7 +72,7 @@ class SunSpecFlowBatteryModel : public SunSpecModel
Q_OBJECT
public:
explicit SunSpecFlowBatteryModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecFlowBatteryModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecFlowBatteryModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspecflowbatterymodulemodel.cpp
View File

@ -80,8 +80,8 @@ void SunSpecFlowBatteryModuleModelRepeatingBlock::processBlockData(const QVector
}
SunSpecFlowBatteryModuleModel::SunSpecFlowBatteryModuleModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 808, modelLength, parent)
SunSpecFlowBatteryModuleModel::SunSpecFlowBatteryModuleModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 808, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixedAndRepeating;

2
libnymea-sunspec/models/sunspecflowbatterymodulemodel.h
View File

@ -72,7 +72,7 @@ class SunSpecFlowBatteryModuleModel : public SunSpecModel
Q_OBJECT
public:
explicit SunSpecFlowBatteryModuleModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecFlowBatteryModuleModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecFlowBatteryModuleModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspecflowbatterystackmodel.cpp
View File

@ -80,8 +80,8 @@ void SunSpecFlowBatteryStackModelRepeatingBlock::processBlockData(const QVector<
}
SunSpecFlowBatteryStackModel::SunSpecFlowBatteryStackModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 809, modelLength, parent)
SunSpecFlowBatteryStackModel::SunSpecFlowBatteryStackModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 809, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixedAndRepeating;

2
libnymea-sunspec/models/sunspecflowbatterystackmodel.h
View File

@ -72,7 +72,7 @@ class SunSpecFlowBatteryStackModel : public SunSpecModel
Q_OBJECT
public:
explicit SunSpecFlowBatteryStackModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecFlowBatteryStackModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecFlowBatteryStackModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspecflowbatterystringmodel.cpp
View File

@ -467,8 +467,8 @@ void SunSpecFlowBatteryStringModelRepeatingBlock::processBlockData(const QVector
}
SunSpecFlowBatteryStringModel::SunSpecFlowBatteryStringModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 807, modelLength, parent)
SunSpecFlowBatteryStringModel::SunSpecFlowBatteryStringModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 807, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixedAndRepeating;

2
libnymea-sunspec/models/sunspecflowbatterystringmodel.h
View File

@ -303,7 +303,7 @@ public:
Q_DECLARE_FLAGS(Evt2Flags, Evt2)
Q_FLAG(Evt2)
explicit SunSpecFlowBatteryStringModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecFlowBatteryStringModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecFlowBatteryStringModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspecfreqwattmodel.cpp
View File

@ -1727,8 +1727,8 @@ void SunSpecFreqWattModelRepeatingBlock::processBlockData(const QVector<quint16>
}
SunSpecFreqWattModel::SunSpecFreqWattModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 134, modelLength, parent)
SunSpecFreqWattModel::SunSpecFreqWattModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 134, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixedAndRepeating;

2
libnymea-sunspec/models/sunspecfreqwattmodel.h
View File

@ -335,7 +335,7 @@ public:
Q_DECLARE_FLAGS(ModenaFlags, Modena)
Q_FLAG(Modena)
explicit SunSpecFreqWattModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecFreqWattModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecFreqWattModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspecfreqwattparammodel.cpp
View File

@ -31,8 +31,8 @@
#include "sunspecfreqwattparammodel.h"
#include "sunspecconnection.h"
SunSpecFreqWattParamModel::SunSpecFreqWattParamModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 127, modelLength, parent)
SunSpecFreqWattParamModel::SunSpecFreqWattParamModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 127, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixed;

2
libnymea-sunspec/models/sunspecfreqwattparammodel.h
View File

@ -54,7 +54,7 @@ public:
Q_DECLARE_FLAGS(ModenaFlags, Modena)
Q_FLAG(Modena)
explicit SunSpecFreqWattParamModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecFreqWattParamModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecFreqWattParamModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspechfrtcmodel.cpp
View File

@ -1465,8 +1465,8 @@ void SunSpecHfrtcModelRepeatingBlock::processBlockData(const QVector<quint16> bl
}
SunSpecHfrtcModel::SunSpecHfrtcModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 142, modelLength, parent)
SunSpecHfrtcModel::SunSpecHfrtcModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 142, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixedAndRepeating;

2
libnymea-sunspec/models/sunspechfrtcmodel.h
View File

@ -295,7 +295,7 @@ public:
Q_DECLARE_FLAGS(ModenaFlags, Modena)
Q_FLAG(Modena)
explicit SunSpecHfrtcModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecHfrtcModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecHfrtcModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspechfrtmodel.cpp
View File

@ -1465,8 +1465,8 @@ void SunSpecHfrtModelRepeatingBlock::processBlockData(const QVector<quint16> blo
}
SunSpecHfrtModel::SunSpecHfrtModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 136, modelLength, parent)
SunSpecHfrtModel::SunSpecHfrtModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 136, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixedAndRepeating;

2
libnymea-sunspec/models/sunspechfrtmodel.h
View File

@ -295,7 +295,7 @@ public:
Q_DECLARE_FLAGS(ModenaFlags, Modena)
Q_FLAG(Modena)
explicit SunSpecHfrtModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecHfrtModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecHfrtModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspechfrtxmodel.cpp
View File

@ -1465,8 +1465,8 @@ void SunSpecHfrtxModelRepeatingBlock::processBlockData(const QVector<quint16> bl
}
SunSpecHfrtxModel::SunSpecHfrtxModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 144, modelLength, parent)
SunSpecHfrtxModel::SunSpecHfrtxModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 144, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixedAndRepeating;

2
libnymea-sunspec/models/sunspechfrtxmodel.h
View File

@ -300,7 +300,7 @@ public:
Q_DECLARE_FLAGS(ModenaFlags, Modena)
Q_FLAG(Modena)
explicit SunSpecHfrtxModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecHfrtxModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecHfrtxModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspechvrtcmodel.cpp
View File

@ -1465,8 +1465,8 @@ void SunSpecHvrtcModelRepeatingBlock::processBlockData(const QVector<quint16> bl
}
SunSpecHvrtcModel::SunSpecHvrtcModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 138, modelLength, parent)
SunSpecHvrtcModel::SunSpecHvrtcModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 138, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixedAndRepeating;

2
libnymea-sunspec/models/sunspechvrtcmodel.h
View File

@ -295,7 +295,7 @@ public:
Q_DECLARE_FLAGS(ModenaFlags, Modena)
Q_FLAG(Modena)
explicit SunSpecHvrtcModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecHvrtcModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecHvrtcModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspechvrtmodel.cpp
View File

@ -1465,8 +1465,8 @@ void SunSpecHvrtModelRepeatingBlock::processBlockData(const QVector<quint16> blo
}
SunSpecHvrtModel::SunSpecHvrtModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 130, modelLength, parent)
SunSpecHvrtModel::SunSpecHvrtModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 130, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixedAndRepeating;

2
libnymea-sunspec/models/sunspechvrtmodel.h
View File

@ -295,7 +295,7 @@ public:
Q_DECLARE_FLAGS(ModenaFlags, Modena)
Q_FLAG(Modena)
explicit SunSpecHvrtModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecHvrtModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecHvrtModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspechvrtxmodel.cpp
View File

@ -1465,8 +1465,8 @@ void SunSpecHvrtxModelRepeatingBlock::processBlockData(const QVector<quint16> bl
}
SunSpecHvrtxModel::SunSpecHvrtxModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 140, modelLength, parent)
SunSpecHvrtxModel::SunSpecHvrtxModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 140, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixedAndRepeating;

2
libnymea-sunspec/models/sunspechvrtxmodel.h
View File

@ -300,7 +300,7 @@ public:
Q_DECLARE_FLAGS(ModenaFlags, Modena)
Q_FLAG(Modena)
explicit SunSpecHvrtxModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecHvrtxModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecHvrtxModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspecinvertersinglephasefloatmodel.cpp
View File

@ -31,8 +31,8 @@
#include "sunspecinvertersinglephasefloatmodel.h"
#include "sunspecconnection.h"
SunSpecInverterSinglePhaseFloatModel::SunSpecInverterSinglePhaseFloatModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 111, modelLength, parent)
SunSpecInverterSinglePhaseFloatModel::SunSpecInverterSinglePhaseFloatModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 111, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixed;

2
libnymea-sunspec/models/sunspecinvertersinglephasefloatmodel.h
View File

@ -75,7 +75,7 @@ public:
Q_DECLARE_FLAGS(Evt1Flags, Evt1)
Q_FLAG(Evt1)
explicit SunSpecInverterSinglePhaseFloatModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecInverterSinglePhaseFloatModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecInverterSinglePhaseFloatModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspecinvertersinglephasemodel.cpp
View File

@ -31,8 +31,8 @@
#include "sunspecinvertersinglephasemodel.h"
#include "sunspecconnection.h"
SunSpecInverterSinglePhaseModel::SunSpecInverterSinglePhaseModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 101, modelLength, parent)
SunSpecInverterSinglePhaseModel::SunSpecInverterSinglePhaseModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 101, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixed;

2
libnymea-sunspec/models/sunspecinvertersinglephasemodel.h
View File

@ -75,7 +75,7 @@ public:
Q_DECLARE_FLAGS(Evt1Flags, Evt1)
Q_FLAG(Evt1)
explicit SunSpecInverterSinglePhaseModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecInverterSinglePhaseModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecInverterSinglePhaseModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspecinvertersplitphasefloatmodel.cpp
View File

@ -31,8 +31,8 @@
#include "sunspecinvertersplitphasefloatmodel.h"
#include "sunspecconnection.h"
SunSpecInverterSplitPhaseFloatModel::SunSpecInverterSplitPhaseFloatModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 112, modelLength, parent)
SunSpecInverterSplitPhaseFloatModel::SunSpecInverterSplitPhaseFloatModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 112, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixed;

2
libnymea-sunspec/models/sunspecinvertersplitphasefloatmodel.h
View File

@ -75,7 +75,7 @@ public:
Q_DECLARE_FLAGS(Evt1Flags, Evt1)
Q_FLAG(Evt1)
explicit SunSpecInverterSplitPhaseFloatModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecInverterSplitPhaseFloatModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecInverterSplitPhaseFloatModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspecinvertersplitphasemodel.cpp
View File

@ -31,8 +31,8 @@
#include "sunspecinvertersplitphasemodel.h"
#include "sunspecconnection.h"
SunSpecInverterSplitPhaseModel::SunSpecInverterSplitPhaseModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 102, modelLength, parent)
SunSpecInverterSplitPhaseModel::SunSpecInverterSplitPhaseModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 102, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixed;

2
libnymea-sunspec/models/sunspecinvertersplitphasemodel.h
View File

@ -75,7 +75,7 @@ public:
Q_DECLARE_FLAGS(Evt1Flags, Evt1)
Q_FLAG(Evt1)
explicit SunSpecInverterSplitPhaseModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecInverterSplitPhaseModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecInverterSplitPhaseModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspecinverterthreephasefloatmodel.cpp
View File

@ -31,8 +31,8 @@
#include "sunspecinverterthreephasefloatmodel.h"
#include "sunspecconnection.h"
SunSpecInverterThreePhaseFloatModel::SunSpecInverterThreePhaseFloatModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 113, modelLength, parent)
SunSpecInverterThreePhaseFloatModel::SunSpecInverterThreePhaseFloatModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 113, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixed;

2
libnymea-sunspec/models/sunspecinverterthreephasefloatmodel.h
View File

@ -75,7 +75,7 @@ public:
Q_DECLARE_FLAGS(Evt1Flags, Evt1)
Q_FLAG(Evt1)
explicit SunSpecInverterThreePhaseFloatModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecInverterThreePhaseFloatModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecInverterThreePhaseFloatModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspecinverterthreephasemodel.cpp
View File

@ -31,8 +31,8 @@
#include "sunspecinverterthreephasemodel.h"
#include "sunspecconnection.h"
SunSpecInverterThreePhaseModel::SunSpecInverterThreePhaseModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 103, modelLength, parent)
SunSpecInverterThreePhaseModel::SunSpecInverterThreePhaseModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 103, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixed;

2
libnymea-sunspec/models/sunspecinverterthreephasemodel.h
View File

@ -75,7 +75,7 @@ public:
Q_DECLARE_FLAGS(Evt1Flags, Evt1)
Q_FLAG(Evt1)
explicit SunSpecInverterThreePhaseModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecInverterThreePhaseModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecInverterThreePhaseModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspecirradiancemodel.cpp
View File

@ -156,8 +156,8 @@ void SunSpecIrradianceModelRepeatingBlock::processBlockData(const QVector<quint1
}
SunSpecIrradianceModel::SunSpecIrradianceModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 302, modelLength, parent)
SunSpecIrradianceModel::SunSpecIrradianceModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 302, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixedAndRepeating;

2
libnymea-sunspec/models/sunspecirradiancemodel.h
View File

@ -84,7 +84,7 @@ class SunSpecIrradianceModel : public SunSpecModel
Q_OBJECT
public:
explicit SunSpecIrradianceModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecIrradianceModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecIrradianceModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspeclfrtcmodel.cpp
View File

@ -1465,8 +1465,8 @@ void SunSpecLfrtcModelRepeatingBlock::processBlockData(const QVector<quint16> bl
}
SunSpecLfrtcModel::SunSpecLfrtcModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 141, modelLength, parent)
SunSpecLfrtcModel::SunSpecLfrtcModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 141, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixedAndRepeating;

2
libnymea-sunspec/models/sunspeclfrtcmodel.h
View File

@ -295,7 +295,7 @@ public:
Q_DECLARE_FLAGS(ModenaFlags, Modena)
Q_FLAG(Modena)
explicit SunSpecLfrtcModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecLfrtcModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecLfrtcModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspeclfrtmodel.cpp
View File

@ -1465,8 +1465,8 @@ void SunSpecLfrtModelRepeatingBlock::processBlockData(const QVector<quint16> blo
}
SunSpecLfrtModel::SunSpecLfrtModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 135, modelLength, parent)
SunSpecLfrtModel::SunSpecLfrtModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 135, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixedAndRepeating;

2
libnymea-sunspec/models/sunspeclfrtmodel.h
View File

@ -295,7 +295,7 @@ public:
Q_DECLARE_FLAGS(ModenaFlags, Modena)
Q_FLAG(Modena)
explicit SunSpecLfrtModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecLfrtModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecLfrtModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspeclfrtxmodel.cpp
View File

@ -1465,8 +1465,8 @@ void SunSpecLfrtxModelRepeatingBlock::processBlockData(const QVector<quint16> bl
}
SunSpecLfrtxModel::SunSpecLfrtxModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 143, modelLength, parent)
SunSpecLfrtxModel::SunSpecLfrtxModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 143, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixedAndRepeating;

2
libnymea-sunspec/models/sunspeclfrtxmodel.h
View File

@ -300,7 +300,7 @@ public:
Q_DECLARE_FLAGS(ModenaFlags, Modena)
Q_FLAG(Modena)
explicit SunSpecLfrtxModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecLfrtxModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecLfrtxModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspeclithiumionbankmodel.cpp
View File

@ -585,8 +585,8 @@ void SunSpecLithiumIonBankModelRepeatingBlock::processBlockData(const QVector<qu
}
SunSpecLithiumIonBankModel::SunSpecLithiumIonBankModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 803, modelLength, parent)
SunSpecLithiumIonBankModel::SunSpecLithiumIonBankModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 803, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixedAndRepeating;

2
libnymea-sunspec/models/sunspeclithiumionbankmodel.h
View File

@ -264,7 +264,7 @@ class SunSpecLithiumIonBankModel : public SunSpecModel
Q_OBJECT
public:
explicit SunSpecLithiumIonBankModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecLithiumIonBankModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecLithiumIonBankModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspeclithiumionmodulemodel.cpp
View File

@ -121,8 +121,8 @@ void SunSpecLithiumIonModuleModelRepeatingBlock::processBlockData(const QVector<
}
SunSpecLithiumIonModuleModel::SunSpecLithiumIonModuleModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 805, modelLength, parent)
SunSpecLithiumIonModuleModel::SunSpecLithiumIonModuleModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 805, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixedAndRepeating;

2
libnymea-sunspec/models/sunspeclithiumionmodulemodel.h
View File

@ -84,7 +84,7 @@ class SunSpecLithiumIonModuleModel : public SunSpecModel
Q_OBJECT
public:
explicit SunSpecLithiumIonModuleModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecLithiumIonModuleModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecLithiumIonModuleModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspeclithiumionstringmodel.cpp
View File

@ -377,8 +377,8 @@ void SunSpecLithiumIonStringModelRepeatingBlock::processBlockData(const QVector<
}
SunSpecLithiumIonStringModel::SunSpecLithiumIonStringModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 804, modelLength, parent)
SunSpecLithiumIonStringModel::SunSpecLithiumIonStringModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 804, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixedAndRepeating;

2
libnymea-sunspec/models/sunspeclithiumionstringmodel.h
View File

@ -214,7 +214,7 @@ public:
Q_DECLARE_FLAGS(Evt1Flags, Evt1)
Q_FLAG(Evt1)
explicit SunSpecLithiumIonStringModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecLithiumIonStringModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecLithiumIonStringModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspeclocationmodel.cpp
View File

@ -31,8 +31,8 @@
#include "sunspeclocationmodel.h"
#include "sunspecconnection.h"
SunSpecLocationModel::SunSpecLocationModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 305, modelLength, parent)
SunSpecLocationModel::SunSpecLocationModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 305, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixed;

2
libnymea-sunspec/models/sunspeclocationmodel.h
View File

@ -42,7 +42,7 @@ class SunSpecLocationModel : public SunSpecModel
Q_OBJECT
public:
explicit SunSpecLocationModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecLocationModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecLocationModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspeclvrtcmodel.cpp
View File

@ -1465,8 +1465,8 @@ void SunSpecLvrtcModelRepeatingBlock::processBlockData(const QVector<quint16> bl
}
SunSpecLvrtcModel::SunSpecLvrtcModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 137, modelLength, parent)
SunSpecLvrtcModel::SunSpecLvrtcModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 137, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixedAndRepeating;

2
libnymea-sunspec/models/sunspeclvrtcmodel.h
View File

@ -295,7 +295,7 @@ public:
Q_DECLARE_FLAGS(ModenaFlags, Modena)
Q_FLAG(Modena)
explicit SunSpecLvrtcModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecLvrtcModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecLvrtcModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspeclvrtmodel.cpp
View File

@ -1465,8 +1465,8 @@ void SunSpecLvrtModelRepeatingBlock::processBlockData(const QVector<quint16> blo
}
SunSpecLvrtModel::SunSpecLvrtModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 129, modelLength, parent)
SunSpecLvrtModel::SunSpecLvrtModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 129, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixedAndRepeating;

2
libnymea-sunspec/models/sunspeclvrtmodel.h
View File

@ -295,7 +295,7 @@ public:
Q_DECLARE_FLAGS(ModenaFlags, Modena)
Q_FLAG(Modena)
explicit SunSpecLvrtModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecLvrtModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecLvrtModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspeclvrtxmodel.cpp
View File

@ -1465,8 +1465,8 @@ void SunSpecLvrtxModelRepeatingBlock::processBlockData(const QVector<quint16> bl
}
SunSpecLvrtxModel::SunSpecLvrtxModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 139, modelLength, parent)
SunSpecLvrtxModel::SunSpecLvrtxModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 139, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixedAndRepeating;

2
libnymea-sunspec/models/sunspeclvrtxmodel.h
View File

@ -300,7 +300,7 @@ public:
Q_DECLARE_FLAGS(ModenaFlags, Modena)
Q_FLAG(Modena)
explicit SunSpecLvrtxModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecLvrtxModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecLvrtxModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspecmetersinglephasefloatmodel.cpp
View File

@ -31,8 +31,8 @@
#include "sunspecmetersinglephasefloatmodel.h"
#include "sunspecconnection.h"
SunSpecMeterSinglePhaseFloatModel::SunSpecMeterSinglePhaseFloatModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 211, modelLength, parent)
SunSpecMeterSinglePhaseFloatModel::SunSpecMeterSinglePhaseFloatModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 211, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixed;

2
libnymea-sunspec/models/sunspecmetersinglephasefloatmodel.h
View File

@ -76,7 +76,7 @@ public:
Q_DECLARE_FLAGS(EvtFlags, Evt)
Q_FLAG(Evt)
explicit SunSpecMeterSinglePhaseFloatModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecMeterSinglePhaseFloatModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecMeterSinglePhaseFloatModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspecmetersinglephasemodel.cpp
View File

@ -31,8 +31,8 @@
#include "sunspecmetersinglephasemodel.h"
#include "sunspecconnection.h"
SunSpecMeterSinglePhaseModel::SunSpecMeterSinglePhaseModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 201, modelLength, parent)
SunSpecMeterSinglePhaseModel::SunSpecMeterSinglePhaseModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 201, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixed;

2
libnymea-sunspec/models/sunspecmetersinglephasemodel.h
View File

@ -68,7 +68,7 @@ public:
Q_DECLARE_FLAGS(EvtFlags, Evt)
Q_FLAG(Evt)
explicit SunSpecMeterSinglePhaseModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecMeterSinglePhaseModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecMeterSinglePhaseModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspecmetersplitsinglephaseabnmodel.cpp
View File

@ -31,8 +31,8 @@
#include "sunspecmetersplitsinglephaseabnmodel.h"
#include "sunspecconnection.h"
SunSpecMeterSplitSinglePhaseAbnModel::SunSpecMeterSplitSinglePhaseAbnModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 202, modelLength, parent)
SunSpecMeterSplitSinglePhaseAbnModel::SunSpecMeterSplitSinglePhaseAbnModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 202, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixed;

2
libnymea-sunspec/models/sunspecmetersplitsinglephaseabnmodel.h
View File

@ -76,7 +76,7 @@ public:
Q_DECLARE_FLAGS(EvtFlags, Evt)
Q_FLAG(Evt)
explicit SunSpecMeterSplitSinglePhaseAbnModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecMeterSplitSinglePhaseAbnModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecMeterSplitSinglePhaseAbnModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspecmetersplitsinglephasefloatmodel.cpp
View File

@ -31,8 +31,8 @@
#include "sunspecmetersplitsinglephasefloatmodel.h"
#include "sunspecconnection.h"
SunSpecMeterSplitSinglePhaseFloatModel::SunSpecMeterSplitSinglePhaseFloatModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 212, modelLength, parent)
SunSpecMeterSplitSinglePhaseFloatModel::SunSpecMeterSplitSinglePhaseFloatModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 212, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixed;

2
libnymea-sunspec/models/sunspecmetersplitsinglephasefloatmodel.h
View File

@ -76,7 +76,7 @@ public:
Q_DECLARE_FLAGS(EvtFlags, Evt)
Q_FLAG(Evt)
explicit SunSpecMeterSplitSinglePhaseFloatModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecMeterSplitSinglePhaseFloatModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecMeterSplitSinglePhaseFloatModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspecmeterthreephasedeltaconnectmodel.cpp
View File

@ -31,8 +31,8 @@
#include "sunspecmeterthreephasedeltaconnectmodel.h"
#include "sunspecconnection.h"
SunSpecMeterThreePhaseDeltaConnectModel::SunSpecMeterThreePhaseDeltaConnectModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 204, modelLength, parent)
SunSpecMeterThreePhaseDeltaConnectModel::SunSpecMeterThreePhaseDeltaConnectModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 204, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixed;

2
libnymea-sunspec/models/sunspecmeterthreephasedeltaconnectmodel.h
View File

@ -76,7 +76,7 @@ public:
Q_DECLARE_FLAGS(EvtFlags, Evt)
Q_FLAG(Evt)
explicit SunSpecMeterThreePhaseDeltaConnectModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecMeterThreePhaseDeltaConnectModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecMeterThreePhaseDeltaConnectModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspecmeterthreephasemodel.cpp
View File

@ -31,8 +31,8 @@
#include "sunspecmeterthreephasemodel.h"
#include "sunspecconnection.h"
SunSpecMeterThreePhaseModel::SunSpecMeterThreePhaseModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 203, modelLength, parent)
SunSpecMeterThreePhaseModel::SunSpecMeterThreePhaseModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 203, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixed;

2
libnymea-sunspec/models/sunspecmeterthreephasemodel.h
View File

@ -76,7 +76,7 @@ public:
Q_DECLARE_FLAGS(EvtFlags, Evt)
Q_FLAG(Evt)
explicit SunSpecMeterThreePhaseModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecMeterThreePhaseModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecMeterThreePhaseModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspecmeterthreephasewyeconnectmodel.cpp
View File

@ -31,8 +31,8 @@
#include "sunspecmeterthreephasewyeconnectmodel.h"
#include "sunspecconnection.h"
SunSpecMeterThreePhaseWyeConnectModel::SunSpecMeterThreePhaseWyeConnectModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 213, modelLength, parent)
SunSpecMeterThreePhaseWyeConnectModel::SunSpecMeterThreePhaseWyeConnectModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 213, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixed;

2
libnymea-sunspec/models/sunspecmeterthreephasewyeconnectmodel.h
View File

@ -76,7 +76,7 @@ public:
Q_DECLARE_FLAGS(EvtFlags, Evt)
Q_FLAG(Evt)
explicit SunSpecMeterThreePhaseWyeConnectModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecMeterThreePhaseWyeConnectModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecMeterThreePhaseWyeConnectModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspecminimetmodel.cpp
View File

@ -31,8 +31,8 @@
#include "sunspecminimetmodel.h"
#include "sunspecconnection.h"
SunSpecMiniMetModel::SunSpecMiniMetModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 308, modelLength, parent)
SunSpecMiniMetModel::SunSpecMiniMetModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 308, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixed;

2
libnymea-sunspec/models/sunspecminimetmodel.h
View File

@ -42,7 +42,7 @@ class SunSpecMiniMetModel : public SunSpecModel
Q_OBJECT
public:
explicit SunSpecMiniMetModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecMiniMetModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecMiniMetModel() override;
QString name() const override;

248
libnymea-sunspec/models/sunspecmodelfactory.cpp
View File

@ -104,314 +104,190 @@ SunSpecModel *SunSpecModelFactory::createModel(SunSpecConnection *connection, qu
{
switch(modelId) {
case ModelIdCommon: {
SunSpecCommonModel *model = new SunSpecCommonModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecCommonModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdAggregator: {
SunSpecAggregatorModel *model = new SunSpecAggregatorModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecAggregatorModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdInverterSinglePhase: {
SunSpecInverterSinglePhaseModel *model = new SunSpecInverterSinglePhaseModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecInverterSinglePhaseModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdInverterSplitPhase: {
SunSpecInverterSplitPhaseModel *model = new SunSpecInverterSplitPhaseModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecInverterSplitPhaseModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdInverterThreePhase: {
SunSpecInverterThreePhaseModel *model = new SunSpecInverterThreePhaseModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecInverterThreePhaseModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdInverterSinglePhaseFloat: {
SunSpecInverterSinglePhaseFloatModel *model = new SunSpecInverterSinglePhaseFloatModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecInverterSinglePhaseFloatModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdInverterSplitPhaseFloat: {
SunSpecInverterSplitPhaseFloatModel *model = new SunSpecInverterSplitPhaseFloatModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecInverterSplitPhaseFloatModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdInverterThreePhaseFloat: {
SunSpecInverterThreePhaseFloatModel *model = new SunSpecInverterThreePhaseFloatModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecInverterThreePhaseFloatModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdNameplate: {
SunSpecNameplateModel *model = new SunSpecNameplateModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecNameplateModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdSettings: {
SunSpecSettingsModel *model = new SunSpecSettingsModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecSettingsModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdStatus: {
SunSpecStatusModel *model = new SunSpecStatusModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecStatusModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdControls: {
SunSpecControlsModel *model = new SunSpecControlsModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecControlsModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdStorage: {
SunSpecStorageModel *model = new SunSpecStorageModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecStorageModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdEnergyStorageBaseDeprecated: {
SunSpecEnergyStorageBaseModelDeprecatedModel *model = new SunSpecEnergyStorageBaseModelDeprecatedModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecEnergyStorageBaseModelDeprecatedModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdPricing: {
SunSpecPricingModel *model = new SunSpecPricingModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecPricingModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdVoltVar: {
SunSpecVoltVarModel *model = new SunSpecVoltVarModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecVoltVarModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdFreqWattParam: {
SunSpecFreqWattParamModel *model = new SunSpecFreqWattParamModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecFreqWattParamModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdReactiveCurrent: {
SunSpecReactiveCurrentModel *model = new SunSpecReactiveCurrentModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecReactiveCurrentModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdLvrt: {
SunSpecLvrtModel *model = new SunSpecLvrtModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecLvrtModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdHvrt: {
SunSpecHvrtModel *model = new SunSpecHvrtModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecHvrtModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdWattPf: {
SunSpecWattPfModel *model = new SunSpecWattPfModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecWattPfModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdVoltWatt: {
SunSpecVoltWattModel *model = new SunSpecVoltWattModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecVoltWattModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdSchedule: {
SunSpecScheduleModel *model = new SunSpecScheduleModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecScheduleModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdFreqWatt: {
SunSpecFreqWattModel *model = new SunSpecFreqWattModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecFreqWattModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdLfrt: {
SunSpecLfrtModel *model = new SunSpecLfrtModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecLfrtModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdHfrt: {
SunSpecHfrtModel *model = new SunSpecHfrtModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecHfrtModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdLvrtc: {
SunSpecLvrtcModel *model = new SunSpecLvrtcModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecLvrtcModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdHvrtc: {
SunSpecHvrtcModel *model = new SunSpecHvrtcModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecHvrtcModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdLvrtx: {
SunSpecLvrtxModel *model = new SunSpecLvrtxModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecLvrtxModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdHvrtx: {
SunSpecHvrtxModel *model = new SunSpecHvrtxModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecHvrtxModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdLfrtc: {
SunSpecLfrtcModel *model = new SunSpecLfrtcModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecLfrtcModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdHfrtc: {
SunSpecHfrtcModel *model = new SunSpecHfrtcModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecHfrtcModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdLfrtx: {
SunSpecLfrtxModel *model = new SunSpecLfrtxModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecLfrtxModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdHfrtx: {
SunSpecHfrtxModel *model = new SunSpecHfrtxModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecHfrtxModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdExtSettings: {
SunSpecExtSettingsModel *model = new SunSpecExtSettingsModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecExtSettingsModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdMppt: {
SunSpecMpptModel *model = new SunSpecMpptModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecMpptModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdMeterSinglePhase: {
SunSpecMeterSinglePhaseModel *model = new SunSpecMeterSinglePhaseModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecMeterSinglePhaseModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdMeterSplitSinglePhaseAbn: {
SunSpecMeterSplitSinglePhaseAbnModel *model = new SunSpecMeterSplitSinglePhaseAbnModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecMeterSplitSinglePhaseAbnModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdMeterThreePhase: {
SunSpecMeterThreePhaseModel *model = new SunSpecMeterThreePhaseModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecMeterThreePhaseModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdMeterThreePhaseDeltaConnect: {
SunSpecMeterThreePhaseDeltaConnectModel *model = new SunSpecMeterThreePhaseDeltaConnectModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecMeterThreePhaseDeltaConnectModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdMeterSinglePhaseFloat: {
SunSpecMeterSinglePhaseFloatModel *model = new SunSpecMeterSinglePhaseFloatModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecMeterSinglePhaseFloatModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdMeterSplitSinglePhaseFloat: {
SunSpecMeterSplitSinglePhaseFloatModel *model = new SunSpecMeterSplitSinglePhaseFloatModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecMeterSplitSinglePhaseFloatModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdMeterThreePhaseWyeConnect: {
SunSpecMeterThreePhaseWyeConnectModel *model = new SunSpecMeterThreePhaseWyeConnectModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecMeterThreePhaseWyeConnectModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdDeltaConnectThreePhaseAbcMeter: {
SunSpecDeltaConnectThreePhaseAbcMeterModel *model = new SunSpecDeltaConnectThreePhaseAbcMeterModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecDeltaConnectThreePhaseAbcMeterModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdSecureAcMeterSelectedReadings: {
SunSpecSecureAcMeterSelectedReadingsModel *model = new SunSpecSecureAcMeterSelectedReadingsModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecSecureAcMeterSelectedReadingsModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdIrradiance: {
SunSpecIrradianceModel *model = new SunSpecIrradianceModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecIrradianceModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdLocation: {
SunSpecLocationModel *model = new SunSpecLocationModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecLocationModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdRefPoint: {
SunSpecRefPointModel *model = new SunSpecRefPointModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecRefPointModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdBaseMet: {
SunSpecBaseMetModel *model = new SunSpecBaseMetModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecBaseMetModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdMiniMet: {
SunSpecMiniMetModel *model = new SunSpecMiniMetModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecMiniMetModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdStringCombinerCurrent: {
SunSpecStringCombinerCurrentModel *model = new SunSpecStringCombinerCurrentModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecStringCombinerCurrentModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdStringCombinerAdvanced: {
SunSpecStringCombinerAdvancedModel *model = new SunSpecStringCombinerAdvancedModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecStringCombinerAdvancedModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdSolarModule: {
SunSpecSolarModuleModel *model = new SunSpecSolarModuleModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecSolarModuleModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdTrackerController: {
SunSpecTrackerControllerModel *model = new SunSpecTrackerControllerModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecTrackerControllerModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdBattery: {
SunSpecBatteryModel *model = new SunSpecBatteryModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecBatteryModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdLithiumIonBank: {
SunSpecLithiumIonBankModel *model = new SunSpecLithiumIonBankModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecLithiumIonBankModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdLithiumIonString: {
SunSpecLithiumIonStringModel *model = new SunSpecLithiumIonStringModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecLithiumIonStringModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdLithiumIonModule: {
SunSpecLithiumIonModuleModel *model = new SunSpecLithiumIonModuleModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecLithiumIonModuleModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdFlowBattery: {
SunSpecFlowBatteryModel *model = new SunSpecFlowBatteryModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecFlowBatteryModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdFlowBatteryString: {
SunSpecFlowBatteryStringModel *model = new SunSpecFlowBatteryStringModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecFlowBatteryStringModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdFlowBatteryModule: {
SunSpecFlowBatteryModuleModel *model = new SunSpecFlowBatteryModuleModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecFlowBatteryModuleModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
case ModelIdFlowBatteryStack: {
SunSpecFlowBatteryStackModel *model = new SunSpecFlowBatteryStackModel(connection, modbusStartRegister, modelLength, connection);
model->setByteOrder(byteOrder);
return model;
return new SunSpecFlowBatteryStackModel(connection, modbusStartRegister, modelLength, byteOrder, connection);
};
default:
return nullptr;

4
libnymea-sunspec/models/sunspecmpptmodel.cpp
View File

@ -241,8 +241,8 @@ void SunSpecMpptModelRepeatingBlock::processBlockData(const QVector<quint16> blo
}
SunSpecMpptModel::SunSpecMpptModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 160, modelLength, parent)
SunSpecMpptModel::SunSpecMpptModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 160, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixedAndRepeating;

2
libnymea-sunspec/models/sunspecmpptmodel.h
View File

@ -169,7 +169,7 @@ public:
Q_DECLARE_FLAGS(EvtFlags, Evt)
Q_FLAG(Evt)
explicit SunSpecMpptModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecMpptModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecMpptModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspecnameplatemodel.cpp
View File

@ -31,8 +31,8 @@
#include "sunspecnameplatemodel.h"
#include "sunspecconnection.h"
SunSpecNameplateModel::SunSpecNameplateModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 120, modelLength, parent)
SunSpecNameplateModel::SunSpecNameplateModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 120, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixed;

2
libnymea-sunspec/models/sunspecnameplatemodel.h
View File

@ -48,7 +48,7 @@ public:
};
Q_ENUM(Dertyp)
explicit SunSpecNameplateModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecNameplateModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecNameplateModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspecpricingmodel.cpp
View File

@ -31,8 +31,8 @@
#include "sunspecpricingmodel.h"
#include "sunspecconnection.h"
SunSpecPricingModel::SunSpecPricingModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 125, modelLength, parent)
SunSpecPricingModel::SunSpecPricingModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 125, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixed;

2
libnymea-sunspec/models/sunspecpricingmodel.h
View File

@ -57,7 +57,7 @@ public:
Q_DECLARE_FLAGS(ModenaFlags, Modena)
Q_FLAG(Modena)
explicit SunSpecPricingModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecPricingModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecPricingModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspecreactivecurrentmodel.cpp
View File

@ -31,8 +31,8 @@
#include "sunspecreactivecurrentmodel.h"
#include "sunspecconnection.h"
SunSpecReactiveCurrentModel::SunSpecReactiveCurrentModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 128, modelLength, parent)
SunSpecReactiveCurrentModel::SunSpecReactiveCurrentModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 128, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixed;

2
libnymea-sunspec/models/sunspecreactivecurrentmodel.h
View File

@ -54,7 +54,7 @@ public:
Q_DECLARE_FLAGS(ModenaFlags, Modena)
Q_FLAG(Modena)
explicit SunSpecReactiveCurrentModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);
explicit SunSpecReactiveCurrentModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);
~SunSpecReactiveCurrentModel() override;
QString name() const override;

4
libnymea-sunspec/models/sunspecrefpointmodel.cpp
View File

@ -31,8 +31,8 @@
#include "sunspecrefpointmodel.h"
#include "sunspecconnection.h"
SunSpecRefPointModel::SunSpecRefPointModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 306, modelLength, parent)
SunSpecRefPointModel::SunSpecRefPointModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :
SunSpecModel(connection, modbusStartRegister, 306, modelLength, byteOrder, parent)
{
m_modelBlockType = SunSpecModel::ModelBlockTypeFixed;

Some files were not shown because too many files have changed in this diff Show More