diff --git a/libnymea-sunspec/models/sunspecaggregatormodel.cpp b/libnymea-sunspec/models/sunspecaggregatormodel.cpp index a37c689..a0c5bf4 100644 --- a/libnymea-sunspec/models/sunspecaggregatormodel.cpp +++ b/libnymea-sunspec/models/sunspecaggregatormodel.cpp @@ -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; diff --git a/libnymea-sunspec/models/sunspecaggregatormodel.h b/libnymea-sunspec/models/sunspecaggregatormodel.h index b3650f0..271ebcf 100644 --- a/libnymea-sunspec/models/sunspecaggregatormodel.h +++ b/libnymea-sunspec/models/sunspecaggregatormodel.h @@ -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; diff --git a/libnymea-sunspec/models/sunspecbasemetmodel.cpp b/libnymea-sunspec/models/sunspecbasemetmodel.cpp index 8a8e4ca..56b7ac2 100644 --- a/libnymea-sunspec/models/sunspecbasemetmodel.cpp +++ b/libnymea-sunspec/models/sunspecbasemetmodel.cpp @@ -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; diff --git a/libnymea-sunspec/models/sunspecbasemetmodel.h b/libnymea-sunspec/models/sunspecbasemetmodel.h index 4beee74..cdbda35 100644 --- a/libnymea-sunspec/models/sunspecbasemetmodel.h +++ b/libnymea-sunspec/models/sunspecbasemetmodel.h @@ -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; diff --git a/libnymea-sunspec/models/sunspecbatterymodel.cpp b/libnymea-sunspec/models/sunspecbatterymodel.cpp index a4696ab..33d10f3 100644 --- a/libnymea-sunspec/models/sunspecbatterymodel.cpp +++ b/libnymea-sunspec/models/sunspecbatterymodel.cpp @@ -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; diff --git a/libnymea-sunspec/models/sunspecbatterymodel.h b/libnymea-sunspec/models/sunspecbatterymodel.h index b7bf44c..261dc6d 100644 --- a/libnymea-sunspec/models/sunspecbatterymodel.h +++ b/libnymea-sunspec/models/sunspecbatterymodel.h @@ -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; diff --git a/libnymea-sunspec/models/sunspeccommonmodel.cpp b/libnymea-sunspec/models/sunspeccommonmodel.cpp index 8e154ae..0ba2688 100644 --- a/libnymea-sunspec/models/sunspeccommonmodel.cpp +++ b/libnymea-sunspec/models/sunspeccommonmodel.cpp @@ -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; diff --git a/libnymea-sunspec/models/sunspeccommonmodel.h b/libnymea-sunspec/models/sunspeccommonmodel.h index ae63f24..4f61400 100644 --- a/libnymea-sunspec/models/sunspeccommonmodel.h +++ b/libnymea-sunspec/models/sunspeccommonmodel.h @@ -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; diff --git a/libnymea-sunspec/models/sunspeccontrolsmodel.cpp b/libnymea-sunspec/models/sunspeccontrolsmodel.cpp index ca4d149..dacef9f 100644 --- a/libnymea-sunspec/models/sunspeccontrolsmodel.cpp +++ b/libnymea-sunspec/models/sunspeccontrolsmodel.cpp @@ -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; diff --git a/libnymea-sunspec/models/sunspeccontrolsmodel.h b/libnymea-sunspec/models/sunspeccontrolsmodel.h index fbeb944..2562268 100644 --- a/libnymea-sunspec/models/sunspeccontrolsmodel.h +++ b/libnymea-sunspec/models/sunspeccontrolsmodel.h @@ -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; diff --git a/libnymea-sunspec/models/sunspecdeltaconnectthreephaseabcmetermodel.cpp b/libnymea-sunspec/models/sunspecdeltaconnectthreephaseabcmetermodel.cpp index 4ef5828..046f07e 100644 --- a/libnymea-sunspec/models/sunspecdeltaconnectthreephaseabcmetermodel.cpp +++ b/libnymea-sunspec/models/sunspecdeltaconnectthreephaseabcmetermodel.cpp @@ -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; diff --git a/libnymea-sunspec/models/sunspecdeltaconnectthreephaseabcmetermodel.h b/libnymea-sunspec/models/sunspecdeltaconnectthreephaseabcmetermodel.h index de6ada6..14f33c3 100644 --- a/libnymea-sunspec/models/sunspecdeltaconnectthreephaseabcmetermodel.h +++ b/libnymea-sunspec/models/sunspecdeltaconnectthreephaseabcmetermodel.h @@ -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; diff --git a/libnymea-sunspec/models/sunspecenergystoragebasemodeldeprecatedmodel.cpp b/libnymea-sunspec/models/sunspecenergystoragebasemodeldeprecatedmodel.cpp index 28bc9f9..88fc70a 100644 --- a/libnymea-sunspec/models/sunspecenergystoragebasemodeldeprecatedmodel.cpp +++ b/libnymea-sunspec/models/sunspecenergystoragebasemodeldeprecatedmodel.cpp @@ -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; diff --git a/libnymea-sunspec/models/sunspecenergystoragebasemodeldeprecatedmodel.h b/libnymea-sunspec/models/sunspecenergystoragebasemodeldeprecatedmodel.h index d5765b0..d96e05f 100644 --- a/libnymea-sunspec/models/sunspecenergystoragebasemodeldeprecatedmodel.h +++ b/libnymea-sunspec/models/sunspecenergystoragebasemodeldeprecatedmodel.h @@ -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; diff --git a/libnymea-sunspec/models/sunspecextsettingsmodel.cpp b/libnymea-sunspec/models/sunspecextsettingsmodel.cpp index fb56f3f..57c7f20 100644 --- a/libnymea-sunspec/models/sunspecextsettingsmodel.cpp +++ b/libnymea-sunspec/models/sunspecextsettingsmodel.cpp @@ -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; diff --git a/libnymea-sunspec/models/sunspecextsettingsmodel.h b/libnymea-sunspec/models/sunspecextsettingsmodel.h index 35236dd..84a53a8 100644 --- a/libnymea-sunspec/models/sunspecextsettingsmodel.h +++ b/libnymea-sunspec/models/sunspecextsettingsmodel.h @@ -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; diff --git a/libnymea-sunspec/models/sunspecflowbatterymodel.cpp b/libnymea-sunspec/models/sunspecflowbatterymodel.cpp index beb7bde..d7a607b 100644 --- a/libnymea-sunspec/models/sunspecflowbatterymodel.cpp +++ b/libnymea-sunspec/models/sunspecflowbatterymodel.cpp @@ -80,8 +80,8 @@ void SunSpecFlowBatteryModelRepeatingBlock::processBlockData(const QVector } -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; diff --git a/libnymea-sunspec/models/sunspecfreqwattmodel.h b/libnymea-sunspec/models/sunspecfreqwattmodel.h index b737ac7..b4e5874 100644 --- a/libnymea-sunspec/models/sunspecfreqwattmodel.h +++ b/libnymea-sunspec/models/sunspecfreqwattmodel.h @@ -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; diff --git a/libnymea-sunspec/models/sunspecfreqwattparammodel.cpp b/libnymea-sunspec/models/sunspecfreqwattparammodel.cpp index 658cfcb..0701642 100644 --- a/libnymea-sunspec/models/sunspecfreqwattparammodel.cpp +++ b/libnymea-sunspec/models/sunspecfreqwattparammodel.cpp @@ -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; diff --git a/libnymea-sunspec/models/sunspecfreqwattparammodel.h b/libnymea-sunspec/models/sunspecfreqwattparammodel.h index 0edff36..46f2d93 100644 --- a/libnymea-sunspec/models/sunspecfreqwattparammodel.h +++ b/libnymea-sunspec/models/sunspecfreqwattparammodel.h @@ -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; diff --git a/libnymea-sunspec/models/sunspechfrtcmodel.cpp b/libnymea-sunspec/models/sunspechfrtcmodel.cpp index a7c10a6..717077d 100644 --- a/libnymea-sunspec/models/sunspechfrtcmodel.cpp +++ b/libnymea-sunspec/models/sunspechfrtcmodel.cpp @@ -1465,8 +1465,8 @@ void SunSpecHfrtcModelRepeatingBlock::processBlockData(const QVector 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; diff --git a/libnymea-sunspec/models/sunspechfrtcmodel.h b/libnymea-sunspec/models/sunspechfrtcmodel.h index 8835a6c..46a6796 100644 --- a/libnymea-sunspec/models/sunspechfrtcmodel.h +++ b/libnymea-sunspec/models/sunspechfrtcmodel.h @@ -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; diff --git a/libnymea-sunspec/models/sunspechfrtmodel.cpp b/libnymea-sunspec/models/sunspechfrtmodel.cpp index 5f90b09..d873460 100644 --- a/libnymea-sunspec/models/sunspechfrtmodel.cpp +++ b/libnymea-sunspec/models/sunspechfrtmodel.cpp @@ -1465,8 +1465,8 @@ void SunSpecHfrtModelRepeatingBlock::processBlockData(const QVector 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; diff --git a/libnymea-sunspec/models/sunspechfrtmodel.h b/libnymea-sunspec/models/sunspechfrtmodel.h index df28d4c..1698463 100644 --- a/libnymea-sunspec/models/sunspechfrtmodel.h +++ b/libnymea-sunspec/models/sunspechfrtmodel.h @@ -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; diff --git a/libnymea-sunspec/models/sunspechfrtxmodel.cpp b/libnymea-sunspec/models/sunspechfrtxmodel.cpp index 61f30d3..7168e9a 100644 --- a/libnymea-sunspec/models/sunspechfrtxmodel.cpp +++ b/libnymea-sunspec/models/sunspechfrtxmodel.cpp @@ -1465,8 +1465,8 @@ void SunSpecHfrtxModelRepeatingBlock::processBlockData(const QVector 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; diff --git a/libnymea-sunspec/models/sunspechfrtxmodel.h b/libnymea-sunspec/models/sunspechfrtxmodel.h index 6f5d3a5..59bd080 100644 --- a/libnymea-sunspec/models/sunspechfrtxmodel.h +++ b/libnymea-sunspec/models/sunspechfrtxmodel.h @@ -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; diff --git a/libnymea-sunspec/models/sunspechvrtcmodel.cpp b/libnymea-sunspec/models/sunspechvrtcmodel.cpp index d011e1a..2d06446 100644 --- a/libnymea-sunspec/models/sunspechvrtcmodel.cpp +++ b/libnymea-sunspec/models/sunspechvrtcmodel.cpp @@ -1465,8 +1465,8 @@ void SunSpecHvrtcModelRepeatingBlock::processBlockData(const QVector 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; diff --git a/libnymea-sunspec/models/sunspechvrtcmodel.h b/libnymea-sunspec/models/sunspechvrtcmodel.h index 6a71b1f..52328d1 100644 --- a/libnymea-sunspec/models/sunspechvrtcmodel.h +++ b/libnymea-sunspec/models/sunspechvrtcmodel.h @@ -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; diff --git a/libnymea-sunspec/models/sunspechvrtmodel.cpp b/libnymea-sunspec/models/sunspechvrtmodel.cpp index e28ffba..163dadc 100644 --- a/libnymea-sunspec/models/sunspechvrtmodel.cpp +++ b/libnymea-sunspec/models/sunspechvrtmodel.cpp @@ -1465,8 +1465,8 @@ void SunSpecHvrtModelRepeatingBlock::processBlockData(const QVector 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; diff --git a/libnymea-sunspec/models/sunspechvrtmodel.h b/libnymea-sunspec/models/sunspechvrtmodel.h index 012dd47..3302b16 100644 --- a/libnymea-sunspec/models/sunspechvrtmodel.h +++ b/libnymea-sunspec/models/sunspechvrtmodel.h @@ -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; diff --git a/libnymea-sunspec/models/sunspechvrtxmodel.cpp b/libnymea-sunspec/models/sunspechvrtxmodel.cpp index 3c4311c..208b30c 100644 --- a/libnymea-sunspec/models/sunspechvrtxmodel.cpp +++ b/libnymea-sunspec/models/sunspechvrtxmodel.cpp @@ -1465,8 +1465,8 @@ void SunSpecHvrtxModelRepeatingBlock::processBlockData(const QVector 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; diff --git a/libnymea-sunspec/models/sunspechvrtxmodel.h b/libnymea-sunspec/models/sunspechvrtxmodel.h index 56cec11..2f7d731 100644 --- a/libnymea-sunspec/models/sunspechvrtxmodel.h +++ b/libnymea-sunspec/models/sunspechvrtxmodel.h @@ -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; diff --git a/libnymea-sunspec/models/sunspecinvertersinglephasefloatmodel.cpp b/libnymea-sunspec/models/sunspecinvertersinglephasefloatmodel.cpp index 4f9b04d..da4df4c 100644 --- a/libnymea-sunspec/models/sunspecinvertersinglephasefloatmodel.cpp +++ b/libnymea-sunspec/models/sunspecinvertersinglephasefloatmodel.cpp @@ -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; diff --git a/libnymea-sunspec/models/sunspecinvertersinglephasefloatmodel.h b/libnymea-sunspec/models/sunspecinvertersinglephasefloatmodel.h index 3fa75ed..ffbdddd 100644 --- a/libnymea-sunspec/models/sunspecinvertersinglephasefloatmodel.h +++ b/libnymea-sunspec/models/sunspecinvertersinglephasefloatmodel.h @@ -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; diff --git a/libnymea-sunspec/models/sunspecinvertersinglephasemodel.cpp b/libnymea-sunspec/models/sunspecinvertersinglephasemodel.cpp index 4f2455c..d4eec7b 100644 --- a/libnymea-sunspec/models/sunspecinvertersinglephasemodel.cpp +++ b/libnymea-sunspec/models/sunspecinvertersinglephasemodel.cpp @@ -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; diff --git a/libnymea-sunspec/models/sunspecinvertersinglephasemodel.h b/libnymea-sunspec/models/sunspecinvertersinglephasemodel.h index 7044acd..714dbcb 100644 --- a/libnymea-sunspec/models/sunspecinvertersinglephasemodel.h +++ b/libnymea-sunspec/models/sunspecinvertersinglephasemodel.h @@ -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; diff --git a/libnymea-sunspec/models/sunspecinvertersplitphasefloatmodel.cpp b/libnymea-sunspec/models/sunspecinvertersplitphasefloatmodel.cpp index bbde705..7b9bbc4 100644 --- a/libnymea-sunspec/models/sunspecinvertersplitphasefloatmodel.cpp +++ b/libnymea-sunspec/models/sunspecinvertersplitphasefloatmodel.cpp @@ -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; diff --git a/libnymea-sunspec/models/sunspecinvertersplitphasefloatmodel.h b/libnymea-sunspec/models/sunspecinvertersplitphasefloatmodel.h index 02b7782..7e93019 100644 --- a/libnymea-sunspec/models/sunspecinvertersplitphasefloatmodel.h +++ b/libnymea-sunspec/models/sunspecinvertersplitphasefloatmodel.h @@ -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; diff --git a/libnymea-sunspec/models/sunspecinvertersplitphasemodel.cpp b/libnymea-sunspec/models/sunspecinvertersplitphasemodel.cpp index 5114fba..f3cf7a8 100644 --- a/libnymea-sunspec/models/sunspecinvertersplitphasemodel.cpp +++ b/libnymea-sunspec/models/sunspecinvertersplitphasemodel.cpp @@ -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; diff --git a/libnymea-sunspec/models/sunspecinvertersplitphasemodel.h b/libnymea-sunspec/models/sunspecinvertersplitphasemodel.h index 1b627f9..1f14a47 100644 --- a/libnymea-sunspec/models/sunspecinvertersplitphasemodel.h +++ b/libnymea-sunspec/models/sunspecinvertersplitphasemodel.h @@ -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; diff --git a/libnymea-sunspec/models/sunspecinverterthreephasefloatmodel.cpp b/libnymea-sunspec/models/sunspecinverterthreephasefloatmodel.cpp index 5fc6f10..51341e4 100644 --- a/libnymea-sunspec/models/sunspecinverterthreephasefloatmodel.cpp +++ b/libnymea-sunspec/models/sunspecinverterthreephasefloatmodel.cpp @@ -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; diff --git a/libnymea-sunspec/models/sunspecinverterthreephasefloatmodel.h b/libnymea-sunspec/models/sunspecinverterthreephasefloatmodel.h index 270f11e..9d61f5e 100644 --- a/libnymea-sunspec/models/sunspecinverterthreephasefloatmodel.h +++ b/libnymea-sunspec/models/sunspecinverterthreephasefloatmodel.h @@ -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; diff --git a/libnymea-sunspec/models/sunspecinverterthreephasemodel.cpp b/libnymea-sunspec/models/sunspecinverterthreephasemodel.cpp index b1a5650..ab7953f 100644 --- a/libnymea-sunspec/models/sunspecinverterthreephasemodel.cpp +++ b/libnymea-sunspec/models/sunspecinverterthreephasemodel.cpp @@ -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; diff --git a/libnymea-sunspec/models/sunspecinverterthreephasemodel.h b/libnymea-sunspec/models/sunspecinverterthreephasemodel.h index 2dc3483..6479dba 100644 --- a/libnymea-sunspec/models/sunspecinverterthreephasemodel.h +++ b/libnymea-sunspec/models/sunspecinverterthreephasemodel.h @@ -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; diff --git a/libnymea-sunspec/models/sunspecirradiancemodel.cpp b/libnymea-sunspec/models/sunspecirradiancemodel.cpp index 56e9b58..4c2f728 100644 --- a/libnymea-sunspec/models/sunspecirradiancemodel.cpp +++ b/libnymea-sunspec/models/sunspecirradiancemodel.cpp @@ -156,8 +156,8 @@ void SunSpecIrradianceModelRepeatingBlock::processBlockData(const QVector 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; diff --git a/libnymea-sunspec/models/sunspeclfrtcmodel.h b/libnymea-sunspec/models/sunspeclfrtcmodel.h index 9fc99f2..e700e83 100644 --- a/libnymea-sunspec/models/sunspeclfrtcmodel.h +++ b/libnymea-sunspec/models/sunspeclfrtcmodel.h @@ -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; diff --git a/libnymea-sunspec/models/sunspeclfrtmodel.cpp b/libnymea-sunspec/models/sunspeclfrtmodel.cpp index b7573a0..735c049 100644 --- a/libnymea-sunspec/models/sunspeclfrtmodel.cpp +++ b/libnymea-sunspec/models/sunspeclfrtmodel.cpp @@ -1465,8 +1465,8 @@ void SunSpecLfrtModelRepeatingBlock::processBlockData(const QVector 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; diff --git a/libnymea-sunspec/models/sunspeclfrtmodel.h b/libnymea-sunspec/models/sunspeclfrtmodel.h index dba0a14..7e90394 100644 --- a/libnymea-sunspec/models/sunspeclfrtmodel.h +++ b/libnymea-sunspec/models/sunspeclfrtmodel.h @@ -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; diff --git a/libnymea-sunspec/models/sunspeclfrtxmodel.cpp b/libnymea-sunspec/models/sunspeclfrtxmodel.cpp index 690d85f..2cf88a3 100644 --- a/libnymea-sunspec/models/sunspeclfrtxmodel.cpp +++ b/libnymea-sunspec/models/sunspeclfrtxmodel.cpp @@ -1465,8 +1465,8 @@ void SunSpecLfrtxModelRepeatingBlock::processBlockData(const QVector 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; diff --git a/libnymea-sunspec/models/sunspeclfrtxmodel.h b/libnymea-sunspec/models/sunspeclfrtxmodel.h index c433e18..41ca03b 100644 --- a/libnymea-sunspec/models/sunspeclfrtxmodel.h +++ b/libnymea-sunspec/models/sunspeclfrtxmodel.h @@ -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; diff --git a/libnymea-sunspec/models/sunspeclithiumionbankmodel.cpp b/libnymea-sunspec/models/sunspeclithiumionbankmodel.cpp index 540d34f..775f531 100644 --- a/libnymea-sunspec/models/sunspeclithiumionbankmodel.cpp +++ b/libnymea-sunspec/models/sunspeclithiumionbankmodel.cpp @@ -585,8 +585,8 @@ void SunSpecLithiumIonBankModelRepeatingBlock::processBlockData(const QVector 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; diff --git a/libnymea-sunspec/models/sunspeclvrtcmodel.h b/libnymea-sunspec/models/sunspeclvrtcmodel.h index 7a73ac4..6df4841 100644 --- a/libnymea-sunspec/models/sunspeclvrtcmodel.h +++ b/libnymea-sunspec/models/sunspeclvrtcmodel.h @@ -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; diff --git a/libnymea-sunspec/models/sunspeclvrtmodel.cpp b/libnymea-sunspec/models/sunspeclvrtmodel.cpp index 236c937..7a67e4f 100644 --- a/libnymea-sunspec/models/sunspeclvrtmodel.cpp +++ b/libnymea-sunspec/models/sunspeclvrtmodel.cpp @@ -1465,8 +1465,8 @@ void SunSpecLvrtModelRepeatingBlock::processBlockData(const QVector 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; diff --git a/libnymea-sunspec/models/sunspeclvrtmodel.h b/libnymea-sunspec/models/sunspeclvrtmodel.h index b183194..96701c5 100644 --- a/libnymea-sunspec/models/sunspeclvrtmodel.h +++ b/libnymea-sunspec/models/sunspeclvrtmodel.h @@ -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; diff --git a/libnymea-sunspec/models/sunspeclvrtxmodel.cpp b/libnymea-sunspec/models/sunspeclvrtxmodel.cpp index f8423d3..21ad4b9 100644 --- a/libnymea-sunspec/models/sunspeclvrtxmodel.cpp +++ b/libnymea-sunspec/models/sunspeclvrtxmodel.cpp @@ -1465,8 +1465,8 @@ void SunSpecLvrtxModelRepeatingBlock::processBlockData(const QVector 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; diff --git a/libnymea-sunspec/models/sunspeclvrtxmodel.h b/libnymea-sunspec/models/sunspeclvrtxmodel.h index 6c9119f..b0a8eb8 100644 --- a/libnymea-sunspec/models/sunspeclvrtxmodel.h +++ b/libnymea-sunspec/models/sunspeclvrtxmodel.h @@ -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; diff --git a/libnymea-sunspec/models/sunspecmetersinglephasefloatmodel.cpp b/libnymea-sunspec/models/sunspecmetersinglephasefloatmodel.cpp index 7365958..8b1b8ab 100644 --- a/libnymea-sunspec/models/sunspecmetersinglephasefloatmodel.cpp +++ b/libnymea-sunspec/models/sunspecmetersinglephasefloatmodel.cpp @@ -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; diff --git a/libnymea-sunspec/models/sunspecmetersinglephasefloatmodel.h b/libnymea-sunspec/models/sunspecmetersinglephasefloatmodel.h index ac42cf8..987929b 100644 --- a/libnymea-sunspec/models/sunspecmetersinglephasefloatmodel.h +++ b/libnymea-sunspec/models/sunspecmetersinglephasefloatmodel.h @@ -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; diff --git a/libnymea-sunspec/models/sunspecmetersinglephasemodel.cpp b/libnymea-sunspec/models/sunspecmetersinglephasemodel.cpp index c46c8e2..a2d7919 100644 --- a/libnymea-sunspec/models/sunspecmetersinglephasemodel.cpp +++ b/libnymea-sunspec/models/sunspecmetersinglephasemodel.cpp @@ -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; diff --git a/libnymea-sunspec/models/sunspecmetersinglephasemodel.h b/libnymea-sunspec/models/sunspecmetersinglephasemodel.h index c717324..a03a751 100644 --- a/libnymea-sunspec/models/sunspecmetersinglephasemodel.h +++ b/libnymea-sunspec/models/sunspecmetersinglephasemodel.h @@ -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; diff --git a/libnymea-sunspec/models/sunspecmetersplitsinglephaseabnmodel.cpp b/libnymea-sunspec/models/sunspecmetersplitsinglephaseabnmodel.cpp index 9efc7ae..265e53f 100644 --- a/libnymea-sunspec/models/sunspecmetersplitsinglephaseabnmodel.cpp +++ b/libnymea-sunspec/models/sunspecmetersplitsinglephaseabnmodel.cpp @@ -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; diff --git a/libnymea-sunspec/models/sunspecmetersplitsinglephaseabnmodel.h b/libnymea-sunspec/models/sunspecmetersplitsinglephaseabnmodel.h index 64f68fb..1f66df5 100644 --- a/libnymea-sunspec/models/sunspecmetersplitsinglephaseabnmodel.h +++ b/libnymea-sunspec/models/sunspecmetersplitsinglephaseabnmodel.h @@ -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; diff --git a/libnymea-sunspec/models/sunspecmetersplitsinglephasefloatmodel.cpp b/libnymea-sunspec/models/sunspecmetersplitsinglephasefloatmodel.cpp index 1442318..10fad6a 100644 --- a/libnymea-sunspec/models/sunspecmetersplitsinglephasefloatmodel.cpp +++ b/libnymea-sunspec/models/sunspecmetersplitsinglephasefloatmodel.cpp @@ -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; diff --git a/libnymea-sunspec/models/sunspecmetersplitsinglephasefloatmodel.h b/libnymea-sunspec/models/sunspecmetersplitsinglephasefloatmodel.h index ce180b3..4e77b1f 100644 --- a/libnymea-sunspec/models/sunspecmetersplitsinglephasefloatmodel.h +++ b/libnymea-sunspec/models/sunspecmetersplitsinglephasefloatmodel.h @@ -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; diff --git a/libnymea-sunspec/models/sunspecmeterthreephasedeltaconnectmodel.cpp b/libnymea-sunspec/models/sunspecmeterthreephasedeltaconnectmodel.cpp index f8a1caf..fc5465d 100644 --- a/libnymea-sunspec/models/sunspecmeterthreephasedeltaconnectmodel.cpp +++ b/libnymea-sunspec/models/sunspecmeterthreephasedeltaconnectmodel.cpp @@ -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; diff --git a/libnymea-sunspec/models/sunspecmeterthreephasedeltaconnectmodel.h b/libnymea-sunspec/models/sunspecmeterthreephasedeltaconnectmodel.h index a9476ac..7e13cdb 100644 --- a/libnymea-sunspec/models/sunspecmeterthreephasedeltaconnectmodel.h +++ b/libnymea-sunspec/models/sunspecmeterthreephasedeltaconnectmodel.h @@ -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; diff --git a/libnymea-sunspec/models/sunspecmeterthreephasemodel.cpp b/libnymea-sunspec/models/sunspecmeterthreephasemodel.cpp index 635ea8c..0d4a11b 100644 --- a/libnymea-sunspec/models/sunspecmeterthreephasemodel.cpp +++ b/libnymea-sunspec/models/sunspecmeterthreephasemodel.cpp @@ -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; diff --git a/libnymea-sunspec/models/sunspecmeterthreephasemodel.h b/libnymea-sunspec/models/sunspecmeterthreephasemodel.h index c819e18..9846e56 100644 --- a/libnymea-sunspec/models/sunspecmeterthreephasemodel.h +++ b/libnymea-sunspec/models/sunspecmeterthreephasemodel.h @@ -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; diff --git a/libnymea-sunspec/models/sunspecmeterthreephasewyeconnectmodel.cpp b/libnymea-sunspec/models/sunspecmeterthreephasewyeconnectmodel.cpp index d9886ac..c3dc4dd 100644 --- a/libnymea-sunspec/models/sunspecmeterthreephasewyeconnectmodel.cpp +++ b/libnymea-sunspec/models/sunspecmeterthreephasewyeconnectmodel.cpp @@ -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; diff --git a/libnymea-sunspec/models/sunspecmeterthreephasewyeconnectmodel.h b/libnymea-sunspec/models/sunspecmeterthreephasewyeconnectmodel.h index 73b54f7..c685bb2 100644 --- a/libnymea-sunspec/models/sunspecmeterthreephasewyeconnectmodel.h +++ b/libnymea-sunspec/models/sunspecmeterthreephasewyeconnectmodel.h @@ -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; diff --git a/libnymea-sunspec/models/sunspecminimetmodel.cpp b/libnymea-sunspec/models/sunspecminimetmodel.cpp index f4e9f98..084fe4d 100644 --- a/libnymea-sunspec/models/sunspecminimetmodel.cpp +++ b/libnymea-sunspec/models/sunspecminimetmodel.cpp @@ -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; diff --git a/libnymea-sunspec/models/sunspecminimetmodel.h b/libnymea-sunspec/models/sunspecminimetmodel.h index 4578f48..07971b0 100644 --- a/libnymea-sunspec/models/sunspecminimetmodel.h +++ b/libnymea-sunspec/models/sunspecminimetmodel.h @@ -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; diff --git a/libnymea-sunspec/models/sunspecmodelfactory.cpp b/libnymea-sunspec/models/sunspecmodelfactory.cpp index 860029a..aa07151 100644 --- a/libnymea-sunspec/models/sunspecmodelfactory.cpp +++ b/libnymea-sunspec/models/sunspecmodelfactory.cpp @@ -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; diff --git a/libnymea-sunspec/models/sunspecmpptmodel.cpp b/libnymea-sunspec/models/sunspecmpptmodel.cpp index 904a98f..91de8f2 100644 --- a/libnymea-sunspec/models/sunspecmpptmodel.cpp +++ b/libnymea-sunspec/models/sunspecmpptmodel.cpp @@ -241,8 +241,8 @@ void SunSpecMpptModelRepeatingBlock::processBlockData(const QVector 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; diff --git a/libnymea-sunspec/models/sunspecmpptmodel.h b/libnymea-sunspec/models/sunspecmpptmodel.h index 07bccb4..e5e6f0f 100644 --- a/libnymea-sunspec/models/sunspecmpptmodel.h +++ b/libnymea-sunspec/models/sunspecmpptmodel.h @@ -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; diff --git a/libnymea-sunspec/models/sunspecnameplatemodel.cpp b/libnymea-sunspec/models/sunspecnameplatemodel.cpp index 0b4662e..e66d33e 100644 --- a/libnymea-sunspec/models/sunspecnameplatemodel.cpp +++ b/libnymea-sunspec/models/sunspecnameplatemodel.cpp @@ -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; diff --git a/libnymea-sunspec/models/sunspecnameplatemodel.h b/libnymea-sunspec/models/sunspecnameplatemodel.h index c26977c..c2bc556 100644 --- a/libnymea-sunspec/models/sunspecnameplatemodel.h +++ b/libnymea-sunspec/models/sunspecnameplatemodel.h @@ -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; diff --git a/libnymea-sunspec/models/sunspecpricingmodel.cpp b/libnymea-sunspec/models/sunspecpricingmodel.cpp index a500819..1229c1d 100644 --- a/libnymea-sunspec/models/sunspecpricingmodel.cpp +++ b/libnymea-sunspec/models/sunspecpricingmodel.cpp @@ -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; diff --git a/libnymea-sunspec/models/sunspecpricingmodel.h b/libnymea-sunspec/models/sunspecpricingmodel.h index 252f073..627e43f 100644 --- a/libnymea-sunspec/models/sunspecpricingmodel.h +++ b/libnymea-sunspec/models/sunspecpricingmodel.h @@ -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; diff --git a/libnymea-sunspec/models/sunspecreactivecurrentmodel.cpp b/libnymea-sunspec/models/sunspecreactivecurrentmodel.cpp index 973a08b..12a2f04 100644 --- a/libnymea-sunspec/models/sunspecreactivecurrentmodel.cpp +++ b/libnymea-sunspec/models/sunspecreactivecurrentmodel.cpp @@ -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; diff --git a/libnymea-sunspec/models/sunspecreactivecurrentmodel.h b/libnymea-sunspec/models/sunspecreactivecurrentmodel.h index d7f03d7..6ffc8dd 100644 --- a/libnymea-sunspec/models/sunspecreactivecurrentmodel.h +++ b/libnymea-sunspec/models/sunspecreactivecurrentmodel.h @@ -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; diff --git a/libnymea-sunspec/models/sunspecrefpointmodel.cpp b/libnymea-sunspec/models/sunspecrefpointmodel.cpp index f800ae8..3be28eb 100644 --- a/libnymea-sunspec/models/sunspecrefpointmodel.cpp +++ b/libnymea-sunspec/models/sunspecrefpointmodel.cpp @@ -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; diff --git a/libnymea-sunspec/models/sunspecrefpointmodel.h b/libnymea-sunspec/models/sunspecrefpointmodel.h index 71efc74..f8d8a4c 100644 --- a/libnymea-sunspec/models/sunspecrefpointmodel.h +++ b/libnymea-sunspec/models/sunspecrefpointmodel.h @@ -42,7 +42,7 @@ class SunSpecRefPointModel : public SunSpecModel Q_OBJECT public: - explicit SunSpecRefPointModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr); + explicit SunSpecRefPointModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr); ~SunSpecRefPointModel() override; QString name() const override; diff --git a/libnymea-sunspec/models/sunspecschedulemodel.cpp b/libnymea-sunspec/models/sunspecschedulemodel.cpp index 890e22c..707ba38 100644 --- a/libnymea-sunspec/models/sunspecschedulemodel.cpp +++ b/libnymea-sunspec/models/sunspecschedulemodel.cpp @@ -1050,8 +1050,8 @@ void SunSpecScheduleModelRepeatingBlock::processBlockData(const QVector } -SunSpecScheduleModel::SunSpecScheduleModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) : - SunSpecModel(connection, modbusStartRegister, 133, modelLength, parent) +SunSpecScheduleModel::SunSpecScheduleModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) : + SunSpecModel(connection, modbusStartRegister, 133, modelLength, byteOrder, parent) { m_modelBlockType = SunSpecModel::ModelBlockTypeFixedAndRepeating; diff --git a/libnymea-sunspec/models/sunspecschedulemodel.h b/libnymea-sunspec/models/sunspecschedulemodel.h index 1987ce9..d6959dd 100644 --- a/libnymea-sunspec/models/sunspecschedulemodel.h +++ b/libnymea-sunspec/models/sunspecschedulemodel.h @@ -309,7 +309,7 @@ public: Q_DECLARE_FLAGS(ModenaFlags, Modena) Q_FLAG(Modena) - explicit SunSpecScheduleModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr); + explicit SunSpecScheduleModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr); ~SunSpecScheduleModel() override; QString name() const override; diff --git a/libnymea-sunspec/models/sunspecsecureacmeterselectedreadingsmodel.cpp b/libnymea-sunspec/models/sunspecsecureacmeterselectedreadingsmodel.cpp index 8d30457..74ea32a 100644 --- a/libnymea-sunspec/models/sunspecsecureacmeterselectedreadingsmodel.cpp +++ b/libnymea-sunspec/models/sunspecsecureacmeterselectedreadingsmodel.cpp @@ -79,8 +79,8 @@ void SunSpecSecureAcMeterSelectedReadingsModelRepeatingBlock::processBlockData(c } -SunSpecSecureAcMeterSelectedReadingsModel::SunSpecSecureAcMeterSelectedReadingsModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) : - SunSpecModel(connection, modbusStartRegister, 220, modelLength, parent) +SunSpecSecureAcMeterSelectedReadingsModel::SunSpecSecureAcMeterSelectedReadingsModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) : + SunSpecModel(connection, modbusStartRegister, 220, modelLength, byteOrder, parent) { m_modelBlockType = SunSpecModel::ModelBlockTypeFixedAndRepeating; diff --git a/libnymea-sunspec/models/sunspecsecureacmeterselectedreadingsmodel.h b/libnymea-sunspec/models/sunspecsecureacmeterselectedreadingsmodel.h index 1080596..9b15448 100644 --- a/libnymea-sunspec/models/sunspecsecureacmeterselectedreadingsmodel.h +++ b/libnymea-sunspec/models/sunspecsecureacmeterselectedreadingsmodel.h @@ -104,7 +104,7 @@ public: Q_DECLARE_FLAGS(EvtFlags, Evt) Q_FLAG(Evt) - explicit SunSpecSecureAcMeterSelectedReadingsModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr); + explicit SunSpecSecureAcMeterSelectedReadingsModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr); ~SunSpecSecureAcMeterSelectedReadingsModel() override; QString name() const override; diff --git a/libnymea-sunspec/models/sunspecsettingsmodel.cpp b/libnymea-sunspec/models/sunspecsettingsmodel.cpp index f203f84..1355510 100644 --- a/libnymea-sunspec/models/sunspecsettingsmodel.cpp +++ b/libnymea-sunspec/models/sunspecsettingsmodel.cpp @@ -31,8 +31,8 @@ #include "sunspecsettingsmodel.h" #include "sunspecconnection.h" -SunSpecSettingsModel::SunSpecSettingsModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) : - SunSpecModel(connection, modbusStartRegister, 121, modelLength, parent) +SunSpecSettingsModel::SunSpecSettingsModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) : + SunSpecModel(connection, modbusStartRegister, 121, modelLength, byteOrder, parent) { m_modelBlockType = SunSpecModel::ModelBlockTypeFixed; diff --git a/libnymea-sunspec/models/sunspecsettingsmodel.h b/libnymea-sunspec/models/sunspecsettingsmodel.h index 88fe0e4..fb72ca9 100644 --- a/libnymea-sunspec/models/sunspecsettingsmodel.h +++ b/libnymea-sunspec/models/sunspecsettingsmodel.h @@ -61,7 +61,7 @@ public: }; Q_ENUM(Connph) - explicit SunSpecSettingsModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr); + explicit SunSpecSettingsModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr); ~SunSpecSettingsModel() override; QString name() const override; diff --git a/libnymea-sunspec/models/sunspecsolarmodulemodel.cpp b/libnymea-sunspec/models/sunspecsolarmodulemodel.cpp index 5241ca1..d2fc9aa 100644 --- a/libnymea-sunspec/models/sunspecsolarmodulemodel.cpp +++ b/libnymea-sunspec/models/sunspecsolarmodulemodel.cpp @@ -31,8 +31,8 @@ #include "sunspecsolarmodulemodel.h" #include "sunspecconnection.h" -SunSpecSolarModuleModel::SunSpecSolarModuleModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) : - SunSpecModel(connection, modbusStartRegister, 502, modelLength, parent) +SunSpecSolarModuleModel::SunSpecSolarModuleModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) : + SunSpecModel(connection, modbusStartRegister, 502, modelLength, byteOrder, parent) { m_modelBlockType = SunSpecModel::ModelBlockTypeFixed; diff --git a/libnymea-sunspec/models/sunspecsolarmodulemodel.h b/libnymea-sunspec/models/sunspecsolarmodulemodel.h index fbef78a..c2aa698 100644 --- a/libnymea-sunspec/models/sunspecsolarmodulemodel.h +++ b/libnymea-sunspec/models/sunspecsolarmodulemodel.h @@ -82,7 +82,7 @@ public: Q_DECLARE_FLAGS(EvtFlags, Evt) Q_FLAG(Evt) - explicit SunSpecSolarModuleModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr); + explicit SunSpecSolarModuleModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr); ~SunSpecSolarModuleModel() override; QString name() const override; diff --git a/libnymea-sunspec/models/sunspecstatusmodel.cpp b/libnymea-sunspec/models/sunspecstatusmodel.cpp index c71bf64..01ba783 100644 --- a/libnymea-sunspec/models/sunspecstatusmodel.cpp +++ b/libnymea-sunspec/models/sunspecstatusmodel.cpp @@ -31,8 +31,8 @@ #include "sunspecstatusmodel.h" #include "sunspecconnection.h" -SunSpecStatusModel::SunSpecStatusModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) : - SunSpecModel(connection, modbusStartRegister, 122, modelLength, parent) +SunSpecStatusModel::SunSpecStatusModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) : + SunSpecModel(connection, modbusStartRegister, 122, modelLength, byteOrder, parent) { m_modelBlockType = SunSpecModel::ModelBlockTypeFixed; diff --git a/libnymea-sunspec/models/sunspecstatusmodel.h b/libnymea-sunspec/models/sunspecstatusmodel.h index ab143c1..952deaf 100644 --- a/libnymea-sunspec/models/sunspecstatusmodel.h +++ b/libnymea-sunspec/models/sunspecstatusmodel.h @@ -110,7 +110,7 @@ public: Q_DECLARE_FLAGS(RtstFlags, Rtst) Q_FLAG(Rtst) - explicit SunSpecStatusModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr); + explicit SunSpecStatusModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr); ~SunSpecStatusModel() override; QString name() const override; diff --git a/libnymea-sunspec/models/sunspecstoragemodel.cpp b/libnymea-sunspec/models/sunspecstoragemodel.cpp index e6b758e..747a239 100644 --- a/libnymea-sunspec/models/sunspecstoragemodel.cpp +++ b/libnymea-sunspec/models/sunspecstoragemodel.cpp @@ -31,8 +31,8 @@ #include "sunspecstoragemodel.h" #include "sunspecconnection.h" -SunSpecStorageModel::SunSpecStorageModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) : - SunSpecModel(connection, modbusStartRegister, 124, modelLength, parent) +SunSpecStorageModel::SunSpecStorageModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) : + SunSpecModel(connection, modbusStartRegister, 124, modelLength, byteOrder, parent) { m_modelBlockType = SunSpecModel::ModelBlockTypeFixed; diff --git a/libnymea-sunspec/models/sunspecstoragemodel.h b/libnymea-sunspec/models/sunspecstoragemodel.h index 97df2ba..40dbc6f 100644 --- a/libnymea-sunspec/models/sunspecstoragemodel.h +++ b/libnymea-sunspec/models/sunspecstoragemodel.h @@ -66,7 +66,7 @@ public: Q_DECLARE_FLAGS(Storctl_modFlags, Storctl_mod) Q_FLAG(Storctl_mod) - explicit SunSpecStorageModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr); + explicit SunSpecStorageModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr); ~SunSpecStorageModel() override; QString name() const override; diff --git a/libnymea-sunspec/models/sunspecstringcombineradvancedmodel.cpp b/libnymea-sunspec/models/sunspecstringcombineradvancedmodel.cpp index 5765ce4..bcca919 100644 --- a/libnymea-sunspec/models/sunspecstringcombineradvancedmodel.cpp +++ b/libnymea-sunspec/models/sunspecstringcombineradvancedmodel.cpp @@ -255,8 +255,8 @@ void SunSpecStringCombinerAdvancedModelRepeatingBlock::processBlockData(const QV } -SunSpecStringCombinerAdvancedModel::SunSpecStringCombinerAdvancedModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) : - SunSpecModel(connection, modbusStartRegister, 404, modelLength, parent) +SunSpecStringCombinerAdvancedModel::SunSpecStringCombinerAdvancedModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) : + SunSpecModel(connection, modbusStartRegister, 404, modelLength, byteOrder, parent) { m_modelBlockType = SunSpecModel::ModelBlockTypeFixedAndRepeating; diff --git a/libnymea-sunspec/models/sunspecstringcombineradvancedmodel.h b/libnymea-sunspec/models/sunspecstringcombineradvancedmodel.h index 4175f60..938881d 100644 --- a/libnymea-sunspec/models/sunspecstringcombineradvancedmodel.h +++ b/libnymea-sunspec/models/sunspecstringcombineradvancedmodel.h @@ -147,7 +147,7 @@ public: Q_DECLARE_FLAGS(EvtFlags, Evt) Q_FLAG(Evt) - explicit SunSpecStringCombinerAdvancedModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr); + explicit SunSpecStringCombinerAdvancedModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr); ~SunSpecStringCombinerAdvancedModel() override; QString name() const override; diff --git a/libnymea-sunspec/models/sunspecstringcombinercurrentmodel.cpp b/libnymea-sunspec/models/sunspecstringcombinercurrentmodel.cpp index fdf114f..e60b171 100644 --- a/libnymea-sunspec/models/sunspecstringcombinercurrentmodel.cpp +++ b/libnymea-sunspec/models/sunspecstringcombinercurrentmodel.cpp @@ -158,8 +158,8 @@ void SunSpecStringCombinerCurrentModelRepeatingBlock::processBlockData(const QVe } -SunSpecStringCombinerCurrentModel::SunSpecStringCombinerCurrentModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) : - SunSpecModel(connection, modbusStartRegister, 403, modelLength, parent) +SunSpecStringCombinerCurrentModel::SunSpecStringCombinerCurrentModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) : + SunSpecModel(connection, modbusStartRegister, 403, modelLength, byteOrder, parent) { m_modelBlockType = SunSpecModel::ModelBlockTypeFixedAndRepeating; diff --git a/libnymea-sunspec/models/sunspecstringcombinercurrentmodel.h b/libnymea-sunspec/models/sunspecstringcombinercurrentmodel.h index 491ce01..97eb362 100644 --- a/libnymea-sunspec/models/sunspecstringcombinercurrentmodel.h +++ b/libnymea-sunspec/models/sunspecstringcombinercurrentmodel.h @@ -132,7 +132,7 @@ public: Q_DECLARE_FLAGS(EvtFlags, Evt) Q_FLAG(Evt) - explicit SunSpecStringCombinerCurrentModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr); + explicit SunSpecStringCombinerCurrentModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr); ~SunSpecStringCombinerCurrentModel() override; QString name() const override; diff --git a/libnymea-sunspec/models/sunspectrackercontrollermodel.cpp b/libnymea-sunspec/models/sunspectrackercontrollermodel.cpp index dcfecd2..40307db 100644 --- a/libnymea-sunspec/models/sunspectrackercontrollermodel.cpp +++ b/libnymea-sunspec/models/sunspectrackercontrollermodel.cpp @@ -275,8 +275,8 @@ void SunSpecTrackerControllerModelRepeatingBlock::processBlockData(const QVector } -SunSpecTrackerControllerModel::SunSpecTrackerControllerModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) : - SunSpecModel(connection, modbusStartRegister, 601, modelLength, parent) +SunSpecTrackerControllerModel::SunSpecTrackerControllerModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) : + SunSpecModel(connection, modbusStartRegister, 601, modelLength, byteOrder, parent) { m_modelBlockType = SunSpecModel::ModelBlockTypeFixedAndRepeating; diff --git a/libnymea-sunspec/models/sunspectrackercontrollermodel.h b/libnymea-sunspec/models/sunspectrackercontrollermodel.h index f39d5fb..095b0d0 100644 --- a/libnymea-sunspec/models/sunspectrackercontrollermodel.h +++ b/libnymea-sunspec/models/sunspectrackercontrollermodel.h @@ -144,7 +144,7 @@ public: Q_DECLARE_FLAGS(GlblalmFlags, Glblalm) Q_FLAG(Glblalm) - explicit SunSpecTrackerControllerModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr); + explicit SunSpecTrackerControllerModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr); ~SunSpecTrackerControllerModel() override; QString name() const override; diff --git a/libnymea-sunspec/models/sunspecvoltvarmodel.cpp b/libnymea-sunspec/models/sunspecvoltvarmodel.cpp index 05eb49d..d465148 100644 --- a/libnymea-sunspec/models/sunspecvoltvarmodel.cpp +++ b/libnymea-sunspec/models/sunspecvoltvarmodel.cpp @@ -1575,8 +1575,8 @@ void SunSpecVoltVarModelRepeatingBlock::processBlockData(const QVector } -SunSpecVoltVarModel::SunSpecVoltVarModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) : - SunSpecModel(connection, modbusStartRegister, 126, modelLength, parent) +SunSpecVoltVarModel::SunSpecVoltVarModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) : + SunSpecModel(connection, modbusStartRegister, 126, modelLength, byteOrder, parent) { m_modelBlockType = SunSpecModel::ModelBlockTypeFixedAndRepeating; diff --git a/libnymea-sunspec/models/sunspecvoltvarmodel.h b/libnymea-sunspec/models/sunspecvoltvarmodel.h index 40fb019..25f1e66 100644 --- a/libnymea-sunspec/models/sunspecvoltvarmodel.h +++ b/libnymea-sunspec/models/sunspecvoltvarmodel.h @@ -322,7 +322,7 @@ public: Q_DECLARE_FLAGS(ModenaFlags, Modena) Q_FLAG(Modena) - explicit SunSpecVoltVarModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr); + explicit SunSpecVoltVarModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr); ~SunSpecVoltVarModel() override; QString name() const override; diff --git a/libnymea-sunspec/models/sunspecvoltwattmodel.cpp b/libnymea-sunspec/models/sunspecvoltwattmodel.cpp index 3c4bb12..fe4ea07 100644 --- a/libnymea-sunspec/models/sunspecvoltwattmodel.cpp +++ b/libnymea-sunspec/models/sunspecvoltwattmodel.cpp @@ -1595,8 +1595,8 @@ void SunSpecVoltWattModelRepeatingBlock::processBlockData(const QVector } -SunSpecVoltWattModel::SunSpecVoltWattModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) : - SunSpecModel(connection, modbusStartRegister, 132, modelLength, parent) +SunSpecVoltWattModel::SunSpecVoltWattModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) : + SunSpecModel(connection, modbusStartRegister, 132, modelLength, byteOrder, parent) { m_modelBlockType = SunSpecModel::ModelBlockTypeFixedAndRepeating; diff --git a/libnymea-sunspec/models/sunspecvoltwattmodel.h b/libnymea-sunspec/models/sunspecvoltwattmodel.h index 54c235d..26d16d7 100644 --- a/libnymea-sunspec/models/sunspecvoltwattmodel.h +++ b/libnymea-sunspec/models/sunspecvoltwattmodel.h @@ -321,7 +321,7 @@ public: Q_DECLARE_FLAGS(ModenaFlags, Modena) Q_FLAG(Modena) - explicit SunSpecVoltWattModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr); + explicit SunSpecVoltWattModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr); ~SunSpecVoltWattModel() override; QString name() const override; diff --git a/libnymea-sunspec/models/sunspecwattpfmodel.cpp b/libnymea-sunspec/models/sunspecwattpfmodel.cpp index 57ed8bc..9ef97ac 100644 --- a/libnymea-sunspec/models/sunspecwattpfmodel.cpp +++ b/libnymea-sunspec/models/sunspecwattpfmodel.cpp @@ -1579,8 +1579,8 @@ void SunSpecWattPfModelRepeatingBlock::processBlockData(const QVector b } -SunSpecWattPfModel::SunSpecWattPfModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) : - SunSpecModel(connection, modbusStartRegister, 131, modelLength, parent) +SunSpecWattPfModel::SunSpecWattPfModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) : + SunSpecModel(connection, modbusStartRegister, 131, modelLength, byteOrder, parent) { m_modelBlockType = SunSpecModel::ModelBlockTypeFixedAndRepeating; diff --git a/libnymea-sunspec/models/sunspecwattpfmodel.h b/libnymea-sunspec/models/sunspecwattpfmodel.h index 38f0b43..2a35442 100644 --- a/libnymea-sunspec/models/sunspecwattpfmodel.h +++ b/libnymea-sunspec/models/sunspecwattpfmodel.h @@ -312,7 +312,7 @@ public: Q_DECLARE_FLAGS(ModenaFlags, Modena) Q_FLAG(Modena) - explicit SunSpecWattPfModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr); + explicit SunSpecWattPfModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr); ~SunSpecWattPfModel() override; QString name() const override; diff --git a/libnymea-sunspec/sunspecmodel.cpp b/libnymea-sunspec/sunspecmodel.cpp index 6589841..dc00816 100644 --- a/libnymea-sunspec/sunspecmodel.cpp +++ b/libnymea-sunspec/sunspecmodel.cpp @@ -33,12 +33,13 @@ Q_LOGGING_CATEGORY(dcSunSpecModelData, "SunSpecModelData") -SunSpecModel::SunSpecModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelId, quint16 modelLength, QObject *parent) : +SunSpecModel::SunSpecModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelId, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) : QObject(parent), m_connection(connection), m_modbusStartRegister(modbusStartRegister), m_modelId(modelId), - m_modelLength(modelLength) + m_modelLength(modelLength), + m_byteOrder(byteOrder) { m_initTimer.setSingleShot(true); m_initTimer.setInterval(10000); @@ -79,11 +80,6 @@ SunSpecDataPoint::ByteOrder SunSpecModel::byteOrder() const return m_byteOrder; } -void SunSpecModel::setByteOrder(SunSpecDataPoint::ByteOrder byteOrder) -{ - m_byteOrder = byteOrder; -} - QHash SunSpecModel::dataPoints() const { return m_dataPoints; diff --git a/libnymea-sunspec/sunspecmodel.h b/libnymea-sunspec/sunspecmodel.h index 1ed622f..62f8d34 100644 --- a/libnymea-sunspec/sunspecmodel.h +++ b/libnymea-sunspec/sunspecmodel.h @@ -63,7 +63,7 @@ public: QString versionString; } CommonModelInfo; - explicit SunSpecModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelId, quint16 modelLength, QObject *parent = nullptr); + explicit SunSpecModel(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelId, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr); virtual ~SunSpecModel() = default; SunSpecConnection *connection() const; @@ -80,8 +80,6 @@ public: quint16 modbusStartRegister() const; SunSpecDataPoint::ByteOrder byteOrder() const; - void setByteOrder(SunSpecDataPoint::ByteOrder byteOrder); - QHash dataPoints() const; QVector blockData() const; diff --git a/libnymea-sunspec/tools/generate-models.py b/libnymea-sunspec/tools/generate-models.py index ef78abe..22f9ea7 100644 --- a/libnymea-sunspec/tools/generate-models.py +++ b/libnymea-sunspec/tools/generate-models.py @@ -1027,7 +1027,7 @@ def writeHeaderFile(headerFileName, className, modelId): writeClassFlags(fileDescriptor, className, dataPoints) # Constructor - writeLine(fileDescriptor, ' explicit %s(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent = nullptr);' % className) + writeLine(fileDescriptor, ' explicit %s(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent = nullptr);' % className) writeLine(fileDescriptor, ' ~%s() override; ' % className) writeLine(fileDescriptor) @@ -1092,8 +1092,8 @@ def writeSourceFile(sourceFileName, className, modelId): writeRepeatingBlockClassImplementation(fileDescriptor, className, modelId) # Constructor - writeLine(fileDescriptor, '%s::%s(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, QObject *parent) :' % (className, className)) - writeLine(fileDescriptor, ' SunSpecModel(connection, modbusStartRegister, %s, modelLength, parent)' % modelId) + writeLine(fileDescriptor, '%s::%s(SunSpecConnection *connection, quint16 modbusStartRegister, quint16 modelLength, SunSpecDataPoint::ByteOrder byteOrder, QObject *parent) :' % (className, className)) + writeLine(fileDescriptor, ' SunSpecModel(connection, modbusStartRegister, %s, modelLength, byteOrder, parent)' % modelId) writeLine(fileDescriptor, '{') #assertMessage = 'QString("model length %1 given in the constructor does not match the model length from the specs %2.").arg(modelLength).arg(m_modelLengthSunSpec).toLatin1()' #writeLine(fileDescriptor, ' //Q_ASSERT_X(modelLength == m_modelLengthSunSpec, "%s", %s);' % (className, assertMessage)) @@ -1305,9 +1305,7 @@ def writeModelFactorySource(fileDescriptor): for cn in classes: enumName = 'ModelId' + cn.replace('Model', '').replace('SunSpec', '') writeLine(fileDescriptor, ' case %s: {' % enumName) - writeLine(fileDescriptor, ' %s *model = new %s(connection, modbusStartRegister, modelLength, connection);' % (cn, cn)) - writeLine(fileDescriptor, ' model->setByteOrder(byteOrder);') - writeLine(fileDescriptor, ' return model;') + writeLine(fileDescriptor, ' return new %s(connection, modbusStartRegister, modelLength, byteOrder, connection);' % (cn)) writeLine(fileDescriptor, ' };') writeLine(fileDescriptor, ' default:') diff --git a/sunspec/integrationpluginsunspec.cpp b/sunspec/integrationpluginsunspec.cpp index 3d38565..a6e2c0a 100644 --- a/sunspec/integrationpluginsunspec.cpp +++ b/sunspec/integrationpluginsunspec.cpp @@ -221,6 +221,7 @@ void IntegrationPluginSunSpec::setupThing(ThingSetupInfo *info) || thing->thingClassId() == solarEdgeConnectionThingClassId || thing->thingClassId() == kostalConnectionThingClassId) { setupConnection(info); + } else if (thing->thingClassId() == sunspecThreePhaseInverterThingClassId || thing->thingClassId() == sunspecSplitPhaseInverterThingClassId || thing->thingClassId() == sunspecSinglePhaseInverterThingClassId ) { @@ -232,6 +233,7 @@ void IntegrationPluginSunSpec::setupThing(ThingSetupInfo *info) setupInverter(info); }); } + } else if (thing->thingClassId() == sunspecThreePhaseMeterThingClassId || thing->thingClassId() == sunspecSplitPhaseMeterThingClassId || thing->thingClassId() == sunspecSinglePhaseMeterThingClassId ) { @@ -243,6 +245,7 @@ void IntegrationPluginSunSpec::setupThing(ThingSetupInfo *info) setupMeter(info); }); } + } else if (thing->thingClassId() == sunspecStorageThingClassId) { Thing *parentThing = myThings().findById(thing->parentId()); if (parentThing->setupStatus() == Thing::ThingSetupStatusComplete) { @@ -252,6 +255,7 @@ void IntegrationPluginSunSpec::setupThing(ThingSetupInfo *info) setupStorage(info); }); } + } else if (thing->thingClassId() == solarEdgeBatteryThingClassId) { Thing *parentThing = myThings().findById(thing->parentId()); if (parentThing->setupStatus() == Thing::ThingSetupStatusComplete) { @@ -261,6 +265,7 @@ void IntegrationPluginSunSpec::setupThing(ThingSetupInfo *info) setupSolarEdgeBattery(info); }); } + } else { Q_ASSERT_X(false, "setupThing", QString("Unhandled thingClassId: %1").arg(info->thing()->thingClassId().toString()).toUtf8()); }