Abort setup of SunSpec repeating blocks if repeating block data size is unexpected. Improve warning message to clarify this behaviour. Fix indentation in generated code. Regenerate SunSpec model classes.

libnymea-sunspec/models/sunspecflowbatterymodel.cpp

@@ -176,8 +176,10 @@ void SunSpecFlowBatteryModel::setupRepeatingBlocks()
                                         << repeatingBlocksDataSize
                                         << "(repeating block size:"
                                         << m_repeatingBlockLength
-                                            << "), extra bytes:"
+                                        << ", extra bytes:"
-                                            << repeatingBlocksDataSize % m_repeatingBlockLength;
+                                        << repeatingBlocksDataSize % m_repeatingBlockLength
+                                        << "). Repeating blocks will not be handled!";
+        return;
     }
     const auto numberOfBlocks = repeatingBlocksDataSize / m_repeatingBlockLength;
     const auto repeatingBlocksOffset = m_fixedBlockLength + headerLength;

libnymea-sunspec/models/sunspecflowbatterymodel.h

@@ -44,7 +44,7 @@ class SunSpecFlowBatteryModelRepeatingBlock : public SunSpecModelRepeatingBlock
     Q_OBJECT
 public:
 
-    explicit SunSpecFlowBatteryModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecFlowBatteryModel *parent);
+    explicit SunSpecFlowBatteryModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecFlowBatteryModel *parent = nullptr);
     ~SunSpecFlowBatteryModelRepeatingBlock() override = default;
 
     SunSpecFlowBatteryModel *parentModel() const;

libnymea-sunspec/models/sunspecflowbatterymodulemodel.cpp

@@ -176,8 +176,10 @@ void SunSpecFlowBatteryModuleModel::setupRepeatingBlocks()
                                         << repeatingBlocksDataSize
                                         << "(repeating block size:"
                                         << m_repeatingBlockLength
-                                            << "), extra bytes:"
+                                        << ", extra bytes:"
-                                            << repeatingBlocksDataSize % m_repeatingBlockLength;
+                                        << repeatingBlocksDataSize % m_repeatingBlockLength
+                                        << "). Repeating blocks will not be handled!";
+        return;
     }
     const auto numberOfBlocks = repeatingBlocksDataSize / m_repeatingBlockLength;
     const auto repeatingBlocksOffset = m_fixedBlockLength + headerLength;

libnymea-sunspec/models/sunspecflowbatterymodulemodel.h

@@ -44,7 +44,7 @@ class SunSpecFlowBatteryModuleModelRepeatingBlock : public SunSpecModelRepeating
     Q_OBJECT
 public:
 
-    explicit SunSpecFlowBatteryModuleModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecFlowBatteryModuleModel *parent);
+    explicit SunSpecFlowBatteryModuleModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecFlowBatteryModuleModel *parent = nullptr);
     ~SunSpecFlowBatteryModuleModelRepeatingBlock() override = default;
 
     SunSpecFlowBatteryModuleModel *parentModel() const;

libnymea-sunspec/models/sunspecflowbatterystackmodel.cpp

@@ -176,8 +176,10 @@ void SunSpecFlowBatteryStackModel::setupRepeatingBlocks()
                                         << repeatingBlocksDataSize
                                         << "(repeating block size:"
                                         << m_repeatingBlockLength
-                                            << "), extra bytes:"
+                                        << ", extra bytes:"
-                                            << repeatingBlocksDataSize % m_repeatingBlockLength;
+                                        << repeatingBlocksDataSize % m_repeatingBlockLength
+                                        << "). Repeating blocks will not be handled!";
+        return;
     }
     const auto numberOfBlocks = repeatingBlocksDataSize / m_repeatingBlockLength;
     const auto repeatingBlocksOffset = m_fixedBlockLength + headerLength;

libnymea-sunspec/models/sunspecflowbatterystackmodel.h

@@ -44,7 +44,7 @@ class SunSpecFlowBatteryStackModelRepeatingBlock : public SunSpecModelRepeatingB
     Q_OBJECT
 public:
 
-    explicit SunSpecFlowBatteryStackModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecFlowBatteryStackModel *parent);
+    explicit SunSpecFlowBatteryStackModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecFlowBatteryStackModel *parent = nullptr);
     ~SunSpecFlowBatteryStackModelRepeatingBlock() override = default;
 
     SunSpecFlowBatteryStackModel *parentModel() const;

libnymea-sunspec/models/sunspecflowbatterystringmodel.cpp

@@ -1133,8 +1133,10 @@ void SunSpecFlowBatteryStringModel::setupRepeatingBlocks()
                                         << repeatingBlocksDataSize
                                         << "(repeating block size:"
                                         << m_repeatingBlockLength
-                                            << "), extra bytes:"
+                                        << ", extra bytes:"
-                                            << repeatingBlocksDataSize % m_repeatingBlockLength;
+                                        << repeatingBlocksDataSize % m_repeatingBlockLength
+                                        << "). Repeating blocks will not be handled!";
+        return;
     }
     const auto numberOfBlocks = repeatingBlocksDataSize / m_repeatingBlockLength;
     const auto repeatingBlocksOffset = m_fixedBlockLength + headerLength;

libnymea-sunspec/models/sunspecflowbatterystringmodel.h

@@ -167,7 +167,7 @@ public:
     Q_DECLARE_FLAGS(Modevt2Flags, Modevt2)
     Q_FLAG(Modevt2)
 
-    explicit SunSpecFlowBatteryStringModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecFlowBatteryStringModel *parent);
+    explicit SunSpecFlowBatteryStringModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecFlowBatteryStringModel *parent = nullptr);
     ~SunSpecFlowBatteryStringModelRepeatingBlock() override = default;
 
     SunSpecFlowBatteryStringModel *parentModel() const;

libnymea-sunspec/models/sunspecfreqwattmodel.cpp

@@ -2083,8 +2083,10 @@ void SunSpecFreqWattModel::setupRepeatingBlocks()
                                         << repeatingBlocksDataSize
                                         << "(repeating block size:"
                                         << m_repeatingBlockLength
-                                            << "), extra bytes:"
+                                        << ", extra bytes:"
-                                            << repeatingBlocksDataSize % m_repeatingBlockLength;
+                                        << repeatingBlocksDataSize % m_repeatingBlockLength
+                                        << "). Repeating blocks will not be handled!";
+        return;
     }
     const auto numberOfBlocks = repeatingBlocksDataSize / m_repeatingBlockLength;
     const auto repeatingBlocksOffset = m_fixedBlockLength + headerLength;

libnymea-sunspec/models/sunspecfreqwattmodel.h

@@ -50,7 +50,7 @@ public:
     };
     Q_ENUM(Readonly)
 
-    explicit SunSpecFreqWattModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecFreqWattModel *parent);
+    explicit SunSpecFreqWattModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecFreqWattModel *parent = nullptr);
     ~SunSpecFreqWattModelRepeatingBlock() override = default;
 
     SunSpecFreqWattModel *parentModel() const;

libnymea-sunspec/models/sunspechfrtcmodel.cpp

@@ -1813,8 +1813,10 @@ void SunSpecHfrtcModel::setupRepeatingBlocks()
                                         << repeatingBlocksDataSize
                                         << "(repeating block size:"
                                         << m_repeatingBlockLength
-                                            << "), extra bytes:"
+                                        << ", extra bytes:"
-                                            << repeatingBlocksDataSize % m_repeatingBlockLength;
+                                        << repeatingBlocksDataSize % m_repeatingBlockLength
+                                        << "). Repeating blocks will not be handled!";
+        return;
     }
     const auto numberOfBlocks = repeatingBlocksDataSize / m_repeatingBlockLength;
     const auto repeatingBlocksOffset = m_fixedBlockLength + headerLength;

libnymea-sunspec/models/sunspechfrtcmodel.h

@@ -50,7 +50,7 @@ public:
     };
     Q_ENUM(Readonly)
 
-    explicit SunSpecHfrtcModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecHfrtcModel *parent);
+    explicit SunSpecHfrtcModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecHfrtcModel *parent = nullptr);
     ~SunSpecHfrtcModelRepeatingBlock() override = default;
 
     SunSpecHfrtcModel *parentModel() const;

libnymea-sunspec/models/sunspechfrtmodel.cpp

@@ -1813,8 +1813,10 @@ void SunSpecHfrtModel::setupRepeatingBlocks()
                                         << repeatingBlocksDataSize
                                         << "(repeating block size:"
                                         << m_repeatingBlockLength
-                                            << "), extra bytes:"
+                                        << ", extra bytes:"
-                                            << repeatingBlocksDataSize % m_repeatingBlockLength;
+                                        << repeatingBlocksDataSize % m_repeatingBlockLength
+                                        << "). Repeating blocks will not be handled!";
+        return;
     }
     const auto numberOfBlocks = repeatingBlocksDataSize / m_repeatingBlockLength;
     const auto repeatingBlocksOffset = m_fixedBlockLength + headerLength;

libnymea-sunspec/models/sunspechfrtmodel.h

@@ -50,7 +50,7 @@ public:
     };
     Q_ENUM(Readonly)
 
-    explicit SunSpecHfrtModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecHfrtModel *parent);
+    explicit SunSpecHfrtModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecHfrtModel *parent = nullptr);
     ~SunSpecHfrtModelRepeatingBlock() override = default;
 
     SunSpecHfrtModel *parentModel() const;

libnymea-sunspec/models/sunspechfrtxmodel.cpp

@@ -1814,8 +1814,10 @@ void SunSpecHfrtxModel::setupRepeatingBlocks()
                                         << repeatingBlocksDataSize
                                         << "(repeating block size:"
                                         << m_repeatingBlockLength
-                                            << "), extra bytes:"
+                                        << ", extra bytes:"
-                                            << repeatingBlocksDataSize % m_repeatingBlockLength;
+                                        << repeatingBlocksDataSize % m_repeatingBlockLength
+                                        << "). Repeating blocks will not be handled!";
+        return;
     }
     const auto numberOfBlocks = repeatingBlocksDataSize / m_repeatingBlockLength;
     const auto repeatingBlocksOffset = m_fixedBlockLength + headerLength;

libnymea-sunspec/models/sunspechfrtxmodel.h

@@ -50,7 +50,7 @@ public:
     };
     Q_ENUM(Readonly)
 
-    explicit SunSpecHfrtxModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecHfrtxModel *parent);
+    explicit SunSpecHfrtxModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecHfrtxModel *parent = nullptr);
     ~SunSpecHfrtxModelRepeatingBlock() override = default;
 
     SunSpecHfrtxModel *parentModel() const;

libnymea-sunspec/models/sunspechvrtcmodel.cpp

@@ -1813,8 +1813,10 @@ void SunSpecHvrtcModel::setupRepeatingBlocks()
                                         << repeatingBlocksDataSize
                                         << "(repeating block size:"
                                         << m_repeatingBlockLength
-                                            << "), extra bytes:"
+                                        << ", extra bytes:"
-                                            << repeatingBlocksDataSize % m_repeatingBlockLength;
+                                        << repeatingBlocksDataSize % m_repeatingBlockLength
+                                        << "). Repeating blocks will not be handled!";
+        return;
     }
     const auto numberOfBlocks = repeatingBlocksDataSize / m_repeatingBlockLength;
     const auto repeatingBlocksOffset = m_fixedBlockLength + headerLength;

libnymea-sunspec/models/sunspechvrtcmodel.h

@@ -50,7 +50,7 @@ public:
     };
     Q_ENUM(Readonly)
 
-    explicit SunSpecHvrtcModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecHvrtcModel *parent);
+    explicit SunSpecHvrtcModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecHvrtcModel *parent = nullptr);
     ~SunSpecHvrtcModelRepeatingBlock() override = default;
 
     SunSpecHvrtcModel *parentModel() const;

libnymea-sunspec/models/sunspechvrtmodel.cpp

@@ -1813,8 +1813,10 @@ void SunSpecHvrtModel::setupRepeatingBlocks()
                                         << repeatingBlocksDataSize
                                         << "(repeating block size:"
                                         << m_repeatingBlockLength
-                                            << "), extra bytes:"
+                                        << ", extra bytes:"
-                                            << repeatingBlocksDataSize % m_repeatingBlockLength;
+                                        << repeatingBlocksDataSize % m_repeatingBlockLength
+                                        << "). Repeating blocks will not be handled!";
+        return;
     }
     const auto numberOfBlocks = repeatingBlocksDataSize / m_repeatingBlockLength;
     const auto repeatingBlocksOffset = m_fixedBlockLength + headerLength;

libnymea-sunspec/models/sunspechvrtmodel.h

@@ -50,7 +50,7 @@ public:
     };
     Q_ENUM(Readonly)
 
-    explicit SunSpecHvrtModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecHvrtModel *parent);
+    explicit SunSpecHvrtModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecHvrtModel *parent = nullptr);
     ~SunSpecHvrtModelRepeatingBlock() override = default;
 
     SunSpecHvrtModel *parentModel() const;

libnymea-sunspec/models/sunspechvrtxmodel.cpp

@@ -1814,8 +1814,10 @@ void SunSpecHvrtxModel::setupRepeatingBlocks()
                                         << repeatingBlocksDataSize
                                         << "(repeating block size:"
                                         << m_repeatingBlockLength
-                                            << "), extra bytes:"
+                                        << ", extra bytes:"
-                                            << repeatingBlocksDataSize % m_repeatingBlockLength;
+                                        << repeatingBlocksDataSize % m_repeatingBlockLength
+                                        << "). Repeating blocks will not be handled!";
+        return;
     }
     const auto numberOfBlocks = repeatingBlocksDataSize / m_repeatingBlockLength;
     const auto repeatingBlocksOffset = m_fixedBlockLength + headerLength;

libnymea-sunspec/models/sunspechvrtxmodel.h

@@ -50,7 +50,7 @@ public:
     };
     Q_ENUM(Readonly)
 
-    explicit SunSpecHvrtxModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecHvrtxModel *parent);
+    explicit SunSpecHvrtxModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecHvrtxModel *parent = nullptr);
     ~SunSpecHvrtxModelRepeatingBlock() override = default;
 
     SunSpecHvrtxModel *parentModel() const;

libnymea-sunspec/models/sunspecirradiancemodel.cpp

@@ -234,8 +234,10 @@ void SunSpecIrradianceModel::setupRepeatingBlocks()
                                         << repeatingBlocksDataSize
                                         << "(repeating block size:"
                                         << m_repeatingBlockLength
-                                            << "), extra bytes:"
+                                        << ", extra bytes:"
-                                            << repeatingBlocksDataSize % m_repeatingBlockLength;
+                                        << repeatingBlocksDataSize % m_repeatingBlockLength
+                                        << "). Repeating blocks will not be handled!";
+        return;
     }
     const auto numberOfBlocks = repeatingBlocksDataSize / m_repeatingBlockLength;
     const auto repeatingBlocksOffset = m_fixedBlockLength + headerLength;

libnymea-sunspec/models/sunspecirradiancemodel.h

@@ -44,7 +44,7 @@ class SunSpecIrradianceModelRepeatingBlock : public SunSpecModelRepeatingBlock
     Q_OBJECT
 public:
 
-    explicit SunSpecIrradianceModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecIrradianceModel *parent);
+    explicit SunSpecIrradianceModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecIrradianceModel *parent = nullptr);
     ~SunSpecIrradianceModelRepeatingBlock() override = default;
 
     SunSpecIrradianceModel *parentModel() const;

libnymea-sunspec/models/sunspeclfrtcmodel.cpp

@@ -1813,8 +1813,10 @@ void SunSpecLfrtcModel::setupRepeatingBlocks()
                                         << repeatingBlocksDataSize
                                         << "(repeating block size:"
                                         << m_repeatingBlockLength
-                                            << "), extra bytes:"
+                                        << ", extra bytes:"
-                                            << repeatingBlocksDataSize % m_repeatingBlockLength;
+                                        << repeatingBlocksDataSize % m_repeatingBlockLength
+                                        << "). Repeating blocks will not be handled!";
+        return;
     }
     const auto numberOfBlocks = repeatingBlocksDataSize / m_repeatingBlockLength;
     const auto repeatingBlocksOffset = m_fixedBlockLength + headerLength;

libnymea-sunspec/models/sunspeclfrtcmodel.h

@@ -50,7 +50,7 @@ public:
     };
     Q_ENUM(Readonly)
 
-    explicit SunSpecLfrtcModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecLfrtcModel *parent);
+    explicit SunSpecLfrtcModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecLfrtcModel *parent = nullptr);
     ~SunSpecLfrtcModelRepeatingBlock() override = default;
 
     SunSpecLfrtcModel *parentModel() const;

libnymea-sunspec/models/sunspeclfrtmodel.cpp

@@ -1813,8 +1813,10 @@ void SunSpecLfrtModel::setupRepeatingBlocks()
                                         << repeatingBlocksDataSize
                                         << "(repeating block size:"
                                         << m_repeatingBlockLength
-                                            << "), extra bytes:"
+                                        << ", extra bytes:"
-                                            << repeatingBlocksDataSize % m_repeatingBlockLength;
+                                        << repeatingBlocksDataSize % m_repeatingBlockLength
+                                        << "). Repeating blocks will not be handled!";
+        return;
     }
     const auto numberOfBlocks = repeatingBlocksDataSize / m_repeatingBlockLength;
     const auto repeatingBlocksOffset = m_fixedBlockLength + headerLength;

libnymea-sunspec/models/sunspeclfrtmodel.h

@@ -50,7 +50,7 @@ public:
     };
     Q_ENUM(Readonly)
 
-    explicit SunSpecLfrtModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecLfrtModel *parent);
+    explicit SunSpecLfrtModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecLfrtModel *parent = nullptr);
     ~SunSpecLfrtModelRepeatingBlock() override = default;
 
     SunSpecLfrtModel *parentModel() const;

libnymea-sunspec/models/sunspeclfrtxmodel.cpp

@@ -1814,8 +1814,10 @@ void SunSpecLfrtxModel::setupRepeatingBlocks()
                                         << repeatingBlocksDataSize
                                         << "(repeating block size:"
                                         << m_repeatingBlockLength
-                                            << "), extra bytes:"
+                                        << ", extra bytes:"
-                                            << repeatingBlocksDataSize % m_repeatingBlockLength;
+                                        << repeatingBlocksDataSize % m_repeatingBlockLength
+                                        << "). Repeating blocks will not be handled!";
+        return;
     }
     const auto numberOfBlocks = repeatingBlocksDataSize / m_repeatingBlockLength;
     const auto repeatingBlocksOffset = m_fixedBlockLength + headerLength;

libnymea-sunspec/models/sunspeclfrtxmodel.h

@@ -50,7 +50,7 @@ public:
     };
     Q_ENUM(Readonly)
 
-    explicit SunSpecLfrtxModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecLfrtxModel *parent);
+    explicit SunSpecLfrtxModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecLfrtxModel *parent = nullptr);
     ~SunSpecLfrtxModelRepeatingBlock() override = default;
 
     SunSpecLfrtxModel *parentModel() const;

libnymea-sunspec/models/sunspeclithiumionbankmodel.cpp

@@ -1168,8 +1168,10 @@ void SunSpecLithiumIonBankModel::setupRepeatingBlocks()
                                         << repeatingBlocksDataSize
                                         << "(repeating block size:"
                                         << m_repeatingBlockLength
-                                            << "), extra bytes:"
+                                        << ", extra bytes:"
-                                            << repeatingBlocksDataSize % m_repeatingBlockLength;
+                                        << repeatingBlocksDataSize % m_repeatingBlockLength
+                                        << "). Repeating blocks will not be handled!";
+        return;
     }
     const auto numberOfBlocks = repeatingBlocksDataSize / m_repeatingBlockLength;
     const auto repeatingBlocksOffset = m_fixedBlockLength + headerLength;

libnymea-sunspec/models/sunspeclithiumionbankmodel.h

@@ -156,7 +156,7 @@ public:
     Q_DECLARE_FLAGS(Strevt1Flags, Strevt1)
     Q_FLAG(Strevt1)
 
-    explicit SunSpecLithiumIonBankModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecLithiumIonBankModel *parent);
+    explicit SunSpecLithiumIonBankModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecLithiumIonBankModel *parent = nullptr);
     ~SunSpecLithiumIonBankModelRepeatingBlock() override = default;
 
     SunSpecLithiumIonBankModel *parentModel() const;

libnymea-sunspec/models/sunspeclithiumionmodulemodel.cpp

@@ -714,8 +714,10 @@ void SunSpecLithiumIonModuleModel::setupRepeatingBlocks()
                                         << repeatingBlocksDataSize
                                         << "(repeating block size:"
                                         << m_repeatingBlockLength
-                                            << "), extra bytes:"
+                                        << ", extra bytes:"
-                                            << repeatingBlocksDataSize % m_repeatingBlockLength;
+                                        << repeatingBlocksDataSize % m_repeatingBlockLength
+                                        << "). Repeating blocks will not be handled!";
+        return;
     }
     const auto numberOfBlocks = repeatingBlocksDataSize / m_repeatingBlockLength;
     const auto repeatingBlocksOffset = m_fixedBlockLength + headerLength;

libnymea-sunspec/models/sunspeclithiumionmodulemodel.h

@@ -50,7 +50,7 @@ public:
     Q_DECLARE_FLAGS(CellstFlags, Cellst)
     Q_FLAG(Cellst)
 
-    explicit SunSpecLithiumIonModuleModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecLithiumIonModuleModel *parent);
+    explicit SunSpecLithiumIonModuleModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecLithiumIonModuleModel *parent = nullptr);
     ~SunSpecLithiumIonModuleModelRepeatingBlock() override = default;
 
     SunSpecLithiumIonModuleModel *parentModel() const;

libnymea-sunspec/models/sunspeclithiumionstringmodel.cpp

@@ -1246,8 +1246,10 @@ void SunSpecLithiumIonStringModel::setupRepeatingBlocks()
                                         << repeatingBlocksDataSize
                                         << "(repeating block size:"
                                         << m_repeatingBlockLength
-                                            << "), extra bytes:"
+                                        << ", extra bytes:"
-                                            << repeatingBlocksDataSize % m_repeatingBlockLength;
+                                        << repeatingBlocksDataSize % m_repeatingBlockLength
+                                        << "). Repeating blocks will not be handled!";
+        return;
     }
     const auto numberOfBlocks = repeatingBlocksDataSize / m_repeatingBlockLength;
     const auto repeatingBlocksOffset = m_fixedBlockLength + headerLength;

libnymea-sunspec/models/sunspeclithiumionstringmodel.h

@@ -44,7 +44,7 @@ class SunSpecLithiumIonStringModelRepeatingBlock : public SunSpecModelRepeatingB
     Q_OBJECT
 public:
 
-    explicit SunSpecLithiumIonStringModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecLithiumIonStringModel *parent);
+    explicit SunSpecLithiumIonStringModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecLithiumIonStringModel *parent = nullptr);
     ~SunSpecLithiumIonStringModelRepeatingBlock() override = default;
 
     SunSpecLithiumIonStringModel *parentModel() const;

libnymea-sunspec/models/sunspeclvrtcmodel.cpp

@@ -1813,8 +1813,10 @@ void SunSpecLvrtcModel::setupRepeatingBlocks()
                                         << repeatingBlocksDataSize
                                         << "(repeating block size:"
                                         << m_repeatingBlockLength
-                                            << "), extra bytes:"
+                                        << ", extra bytes:"
-                                            << repeatingBlocksDataSize % m_repeatingBlockLength;
+                                        << repeatingBlocksDataSize % m_repeatingBlockLength
+                                        << "). Repeating blocks will not be handled!";
+        return;
     }
     const auto numberOfBlocks = repeatingBlocksDataSize / m_repeatingBlockLength;
     const auto repeatingBlocksOffset = m_fixedBlockLength + headerLength;

libnymea-sunspec/models/sunspeclvrtcmodel.h

@@ -50,7 +50,7 @@ public:
     };
     Q_ENUM(Readonly)
 
-    explicit SunSpecLvrtcModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecLvrtcModel *parent);
+    explicit SunSpecLvrtcModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecLvrtcModel *parent = nullptr);
     ~SunSpecLvrtcModelRepeatingBlock() override = default;
 
     SunSpecLvrtcModel *parentModel() const;

libnymea-sunspec/models/sunspeclvrtmodel.cpp

@@ -1813,8 +1813,10 @@ void SunSpecLvrtModel::setupRepeatingBlocks()
                                         << repeatingBlocksDataSize
                                         << "(repeating block size:"
                                         << m_repeatingBlockLength
-                                            << "), extra bytes:"
+                                        << ", extra bytes:"
-                                            << repeatingBlocksDataSize % m_repeatingBlockLength;
+                                        << repeatingBlocksDataSize % m_repeatingBlockLength
+                                        << "). Repeating blocks will not be handled!";
+        return;
     }
     const auto numberOfBlocks = repeatingBlocksDataSize / m_repeatingBlockLength;
     const auto repeatingBlocksOffset = m_fixedBlockLength + headerLength;

libnymea-sunspec/models/sunspeclvrtmodel.h

@@ -50,7 +50,7 @@ public:
     };
     Q_ENUM(Readonly)
 
-    explicit SunSpecLvrtModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecLvrtModel *parent);
+    explicit SunSpecLvrtModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecLvrtModel *parent = nullptr);
     ~SunSpecLvrtModelRepeatingBlock() override = default;
 
     SunSpecLvrtModel *parentModel() const;

libnymea-sunspec/models/sunspeclvrtxmodel.cpp

@@ -1814,8 +1814,10 @@ void SunSpecLvrtxModel::setupRepeatingBlocks()
                                         << repeatingBlocksDataSize
                                         << "(repeating block size:"
                                         << m_repeatingBlockLength
-                                            << "), extra bytes:"
+                                        << ", extra bytes:"
-                                            << repeatingBlocksDataSize % m_repeatingBlockLength;
+                                        << repeatingBlocksDataSize % m_repeatingBlockLength
+                                        << "). Repeating blocks will not be handled!";
+        return;
     }
     const auto numberOfBlocks = repeatingBlocksDataSize / m_repeatingBlockLength;
     const auto repeatingBlocksOffset = m_fixedBlockLength + headerLength;

libnymea-sunspec/models/sunspeclvrtxmodel.h

@@ -50,7 +50,7 @@ public:
     };
     Q_ENUM(Readonly)
 
-    explicit SunSpecLvrtxModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecLvrtxModel *parent);
+    explicit SunSpecLvrtxModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecLvrtxModel *parent = nullptr);
     ~SunSpecLvrtxModelRepeatingBlock() override = default;
 
     SunSpecLvrtxModel *parentModel() const;

libnymea-sunspec/models/sunspecmpptmodel.cpp

@@ -452,8 +452,10 @@ void SunSpecMpptModel::setupRepeatingBlocks()
                                         << repeatingBlocksDataSize
                                         << "(repeating block size:"
                                         << m_repeatingBlockLength
-                                            << "), extra bytes:"
+                                        << ", extra bytes:"
-                                            << repeatingBlocksDataSize % m_repeatingBlockLength;
+                                        << repeatingBlocksDataSize % m_repeatingBlockLength
+                                        << "). Repeating blocks will not be handled!";
+        return;
     }
     const auto numberOfBlocks = repeatingBlocksDataSize / m_repeatingBlockLength;
     const auto repeatingBlocksOffset = m_fixedBlockLength + headerLength;

libnymea-sunspec/models/sunspecmpptmodel.h

@@ -86,7 +86,7 @@ public:
     Q_DECLARE_FLAGS(DcevtFlags, Dcevt)
     Q_FLAG(Dcevt)
 
-    explicit SunSpecMpptModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecMpptModel *parent);
+    explicit SunSpecMpptModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecMpptModel *parent = nullptr);
     ~SunSpecMpptModelRepeatingBlock() override = default;
 
     SunSpecMpptModel *parentModel() const;

libnymea-sunspec/models/sunspecschedulemodel.cpp

@@ -1252,8 +1252,10 @@ void SunSpecScheduleModel::setupRepeatingBlocks()
                                         << repeatingBlocksDataSize
                                         << "(repeating block size:"
                                         << m_repeatingBlockLength
-                                            << "), extra bytes:"
+                                        << ", extra bytes:"
-                                            << repeatingBlocksDataSize % m_repeatingBlockLength;
+                                        << repeatingBlocksDataSize % m_repeatingBlockLength
+                                        << "). Repeating blocks will not be handled!";
+        return;
     }
     const auto numberOfBlocks = repeatingBlocksDataSize / m_repeatingBlockLength;
     const auto repeatingBlocksOffset = m_fixedBlockLength + headerLength;

libnymea-sunspec/models/sunspecschedulemodel.h

@@ -83,7 +83,7 @@ public:
     };
     Q_ENUM(Ytyp)
 
-    explicit SunSpecScheduleModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecScheduleModel *parent);
+    explicit SunSpecScheduleModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecScheduleModel *parent = nullptr);
     ~SunSpecScheduleModelRepeatingBlock() override = default;
 
     SunSpecScheduleModel *parentModel() const;

libnymea-sunspec/models/sunspecsecureacmeterselectedreadingsmodel.cpp

@@ -799,8 +799,10 @@ void SunSpecSecureAcMeterSelectedReadingsModel::setupRepeatingBlocks()
                                         << repeatingBlocksDataSize
                                         << "(repeating block size:"
                                         << m_repeatingBlockLength
-                                            << "), extra bytes:"
+                                        << ", extra bytes:"
-                                            << repeatingBlocksDataSize % m_repeatingBlockLength;
+                                        << repeatingBlocksDataSize % m_repeatingBlockLength
+                                        << "). Repeating blocks will not be handled!";
+        return;
     }
     const auto numberOfBlocks = repeatingBlocksDataSize / m_repeatingBlockLength;
     const auto repeatingBlocksOffset = m_fixedBlockLength + headerLength;

libnymea-sunspec/models/sunspecsecureacmeterselectedreadingsmodel.h

@@ -44,7 +44,7 @@ class SunSpecSecureAcMeterSelectedReadingsModelRepeatingBlock : public SunSpecMo
     Q_OBJECT
 public:
 
-    explicit SunSpecSecureAcMeterSelectedReadingsModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecSecureAcMeterSelectedReadingsModel *parent);
+    explicit SunSpecSecureAcMeterSelectedReadingsModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecSecureAcMeterSelectedReadingsModel *parent = nullptr);
     ~SunSpecSecureAcMeterSelectedReadingsModelRepeatingBlock() override = default;
 
     SunSpecSecureAcMeterSelectedReadingsModel *parentModel() const;

libnymea-sunspec/models/sunspecstringcombineradvancedmodel.cpp

@@ -752,8 +752,10 @@ void SunSpecStringCombinerAdvancedModel::setupRepeatingBlocks()
                                         << repeatingBlocksDataSize
                                         << "(repeating block size:"
                                         << m_repeatingBlockLength
-                                            << "), extra bytes:"
+                                        << ", extra bytes:"
-                                            << repeatingBlocksDataSize % m_repeatingBlockLength;
+                                        << repeatingBlocksDataSize % m_repeatingBlockLength
+                                        << "). Repeating blocks will not be handled!";
+        return;
     }
     const auto numberOfBlocks = repeatingBlocksDataSize / m_repeatingBlockLength;
     const auto repeatingBlocksOffset = m_fixedBlockLength + headerLength;

libnymea-sunspec/models/sunspecstringcombineradvancedmodel.h

@@ -68,7 +68,7 @@ public:
     Q_DECLARE_FLAGS(InevtFlags, Inevt)
     Q_FLAG(Inevt)
 
-    explicit SunSpecStringCombinerAdvancedModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecStringCombinerAdvancedModel *parent);
+    explicit SunSpecStringCombinerAdvancedModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecStringCombinerAdvancedModel *parent = nullptr);
     ~SunSpecStringCombinerAdvancedModelRepeatingBlock() override = default;
 
     SunSpecStringCombinerAdvancedModel *parentModel() const;

libnymea-sunspec/models/sunspecstringcombinercurrentmodel.cpp

@@ -496,8 +496,10 @@ void SunSpecStringCombinerCurrentModel::setupRepeatingBlocks()
                                         << repeatingBlocksDataSize
                                         << "(repeating block size:"
                                         << m_repeatingBlockLength
-                                            << "), extra bytes:"
+                                        << ", extra bytes:"
-                                            << repeatingBlocksDataSize % m_repeatingBlockLength;
+                                        << repeatingBlocksDataSize % m_repeatingBlockLength
+                                        << "). Repeating blocks will not be handled!";
+        return;
     }
     const auto numberOfBlocks = repeatingBlocksDataSize / m_repeatingBlockLength;
     const auto repeatingBlocksOffset = m_fixedBlockLength + headerLength;

libnymea-sunspec/models/sunspecstringcombinercurrentmodel.h

@@ -68,7 +68,7 @@ public:
     Q_DECLARE_FLAGS(InevtFlags, Inevt)
     Q_FLAG(Inevt)
 
-    explicit SunSpecStringCombinerCurrentModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecStringCombinerCurrentModel *parent);
+    explicit SunSpecStringCombinerCurrentModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecStringCombinerCurrentModel *parent = nullptr);
     ~SunSpecStringCombinerCurrentModelRepeatingBlock() override = default;
 
     SunSpecStringCombinerCurrentModel *parentModel() const;

libnymea-sunspec/models/sunspectrackercontrollermodel.cpp

@@ -610,8 +610,10 @@ void SunSpecTrackerControllerModel::setupRepeatingBlocks()
                                         << repeatingBlocksDataSize
                                         << "(repeating block size:"
                                         << m_repeatingBlockLength
-                                            << "), extra bytes:"
+                                        << ", extra bytes:"
-                                            << repeatingBlocksDataSize % m_repeatingBlockLength;
+                                        << repeatingBlocksDataSize % m_repeatingBlockLength
+                                        << "). Repeating blocks will not be handled!";
+        return;
     }
     const auto numberOfBlocks = repeatingBlocksDataSize / m_repeatingBlockLength;
     const auto repeatingBlocksOffset = m_fixedBlockLength + headerLength;

libnymea-sunspec/models/sunspectrackercontrollermodel.h

@@ -59,7 +59,7 @@ public:
     Q_DECLARE_FLAGS(AlmFlags, Alm)
     Q_FLAG(Alm)
 
-    explicit SunSpecTrackerControllerModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecTrackerControllerModel *parent);
+    explicit SunSpecTrackerControllerModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecTrackerControllerModel *parent = nullptr);
     ~SunSpecTrackerControllerModelRepeatingBlock() override = default;
 
     SunSpecTrackerControllerModel *parentModel() const;

libnymea-sunspec/models/sunspecvoltvarmodel.cpp

@@ -1926,8 +1926,10 @@ void SunSpecVoltVarModel::setupRepeatingBlocks()
                                         << repeatingBlocksDataSize
                                         << "(repeating block size:"
                                         << m_repeatingBlockLength
-                                            << "), extra bytes:"
+                                        << ", extra bytes:"
-                                            << repeatingBlocksDataSize % m_repeatingBlockLength;
+                                        << repeatingBlocksDataSize % m_repeatingBlockLength
+                                        << "). Repeating blocks will not be handled!";
+        return;
     }
     const auto numberOfBlocks = repeatingBlocksDataSize / m_repeatingBlockLength;
     const auto repeatingBlocksOffset = m_fixedBlockLength + headerLength;

libnymea-sunspec/models/sunspecvoltvarmodel.h

@@ -57,7 +57,7 @@ public:
     };
     Q_ENUM(Readonly)
 
-    explicit SunSpecVoltVarModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecVoltVarModel *parent);
+    explicit SunSpecVoltVarModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecVoltVarModel *parent = nullptr);
     ~SunSpecVoltVarModelRepeatingBlock() override = default;
 
     SunSpecVoltVarModel *parentModel() const;

libnymea-sunspec/models/sunspecvoltwattmodel.cpp

@@ -1948,8 +1948,10 @@ void SunSpecVoltWattModel::setupRepeatingBlocks()
                                         << repeatingBlocksDataSize
                                         << "(repeating block size:"
                                         << m_repeatingBlockLength
-                                            << "), extra bytes:"
+                                        << ", extra bytes:"
-                                            << repeatingBlocksDataSize % m_repeatingBlockLength;
+                                        << repeatingBlocksDataSize % m_repeatingBlockLength
+                                        << "). Repeating blocks will not be handled!";
+        return;
     }
     const auto numberOfBlocks = repeatingBlocksDataSize / m_repeatingBlockLength;
     const auto repeatingBlocksOffset = m_fixedBlockLength + headerLength;

libnymea-sunspec/models/sunspecvoltwattmodel.h

@@ -56,7 +56,7 @@ public:
     };
     Q_ENUM(Readonly)
 
-    explicit SunSpecVoltWattModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecVoltWattModel *parent);
+    explicit SunSpecVoltWattModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecVoltWattModel *parent = nullptr);
     ~SunSpecVoltWattModelRepeatingBlock() override = default;
 
     SunSpecVoltWattModel *parentModel() const;

libnymea-sunspec/models/sunspecwattpfmodel.cpp

@@ -1932,8 +1932,10 @@ void SunSpecWattPfModel::setupRepeatingBlocks()
                                         << repeatingBlocksDataSize
                                         << "(repeating block size:"
                                         << m_repeatingBlockLength
-                                            << "), extra bytes:"
+                                        << ", extra bytes:"
-                                            << repeatingBlocksDataSize % m_repeatingBlockLength;
+                                        << repeatingBlocksDataSize % m_repeatingBlockLength
+                                        << "). Repeating blocks will not be handled!";
+        return;
     }
     const auto numberOfBlocks = repeatingBlocksDataSize / m_repeatingBlockLength;
     const auto repeatingBlocksOffset = m_fixedBlockLength + headerLength;

libnymea-sunspec/models/sunspecwattpfmodel.h

@@ -50,7 +50,7 @@ public:
     };
     Q_ENUM(Readonly)
 
-    explicit SunSpecWattPfModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecWattPfModel *parent);
+    explicit SunSpecWattPfModelRepeatingBlock(quint16 blockIndex, quint16 blockSize, quint16 modbusStartRegister, SunSpecWattPfModel *parent = nullptr);
     ~SunSpecWattPfModelRepeatingBlock() override = default;
 
     SunSpecWattPfModel *parentModel() const;

libnymea-sunspec/tools/generate-models.py

@@ -827,8 +827,10 @@ def writeSetupRepeatingBlocksImplementation(fileDescriptor, className):
     writeLine(fileDescriptor, '                                        << repeatingBlocksDataSize')
     writeLine(fileDescriptor, '                                        << "(repeating block size:"')
     writeLine(fileDescriptor, '                                        << m_repeatingBlockLength')
-    writeLine(fileDescriptor, '                                            << "), extra bytes:"')
+    writeLine(fileDescriptor, '                                        << ", extra bytes:"')
-    writeLine(fileDescriptor, '                                            << repeatingBlocksDataSize % m_repeatingBlockLength;')
+    writeLine(fileDescriptor, '                                        << repeatingBlocksDataSize % m_repeatingBlockLength')
+    writeLine(fileDescriptor, '                                        << "). Repeating blocks will not be handled!";')
+    writeLine(fileDescriptor, '        return;')
     writeLine(fileDescriptor, '    }')
     writeLine(fileDescriptor, '    const auto numberOfBlocks = repeatingBlocksDataSize / m_repeatingBlockLength;')
     writeLine(fileDescriptor, '    const auto repeatingBlocksOffset = m_fixedBlockLength + headerLength;')