From e646bfbdde2633d2cc90f5e83d9906034487fdc5 Mon Sep 17 00:00:00 2001 From: Roeland Date: Sat, 9 Nov 2024 00:05:29 +0100 Subject: [PATCH 1/3] try patching tripower by not adding dummy values first. --- sma/CHANGELOG.md | 4 ++++ sma/config.yaml | 2 +- sma/src/emeter.py | 4 ---- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sma/CHANGELOG.md b/sma/CHANGELOG.md index 4fe72e8..1841ad7 100644 --- a/sma/CHANGELOG.md +++ b/sma/CHANGELOG.md @@ -1,5 +1,9 @@ +## 0.1.4-rc1 + +- patching for tripower + ## 0.1.3 - Extend package to support tripower inverters diff --git a/sma/config.yaml b/sma/config.yaml index a0c4327..615cb3d 100644 --- a/sma/config.yaml +++ b/sma/config.yaml @@ -1,6 +1,6 @@ name: "SMA Energy Meter emulator" description: "Simulate one or more SMA energy meters based on mqtt messages." -version: "0.1.3" +version: "0.1.4" slug: sma url: "https://github.com/Roeland54/SMA-Energy-Meter-emulator" arch: diff --git a/sma/src/emeter.py b/sma/src/emeter.py index 5b87237..dd0fa72 100644 --- a/sma/src/emeter.py +++ b/sma/src/emeter.py @@ -78,10 +78,6 @@ def begin(self, timeStampMs): # Add dummy values for measurements to make sure the package always contains these. Solves tripower inverters not recognizing the data as valid. # Totals - self.addMeasurementValue(emeterPacket.SMA_POSITIVE_ACTIVE_POWER, 0) - self.addCounterValue(emeterPacket.SMA_POSITIVE_ACTIVE_ENERGY, 0) - self.addMeasurementValue(emeterPacket.SMA_NEGATIVE_ACTIVE_POWER, 0) - self.addCounterValue(emeterPacket.SMA_NEGATIVE_ACTIVE_ENERGY, 0) self.addMeasurementValue(emeterPacket.SMA_POSITIVE_REACTIVE_POWER, 0) self.addCounterValue(emeterPacket.SMA_POSITIVE_REACTIVE_ENERGY, 0) self.addMeasurementValue(emeterPacket.SMA_NEGATIVE_REACTIVE_POWER, 0) From c28061554c4ef5444d75a591c8c7aeb21e4a6226 Mon Sep 17 00:00:00 2001 From: Roeland Date: Sat, 9 Nov 2024 16:08:46 +0100 Subject: [PATCH 2/3] fix SMA_VOLTAGE_L1 id value --- sma/CHANGELOG.md | 2 +- sma/config.yaml | 2 +- sma/src/emeter.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sma/CHANGELOG.md b/sma/CHANGELOG.md index 1841ad7..149d9f1 100644 --- a/sma/CHANGELOG.md +++ b/sma/CHANGELOG.md @@ -1,6 +1,6 @@ -## 0.1.4-rc1 +## 0.1.4-rc2 - patching for tripower diff --git a/sma/config.yaml b/sma/config.yaml index 615cb3d..98c2b32 100644 --- a/sma/config.yaml +++ b/sma/config.yaml @@ -1,6 +1,6 @@ name: "SMA Energy Meter emulator" description: "Simulate one or more SMA energy meters based on mqtt messages." -version: "0.1.4" +version: "0.1.4-rc2" slug: sma url: "https://github.com/Roeland54/SMA-Energy-Meter-emulator" arch: diff --git a/sma/src/emeter.py b/sma/src/emeter.py index dd0fa72..e479674 100644 --- a/sma/src/emeter.py +++ b/sma/src/emeter.py @@ -54,7 +54,7 @@ class emeterPacket: SMA_CURRENT_L1 = 0x001F0400 SMA_CURRENT_L2 = 0x00330400 SMA_CURRENT_L3 = 0x00470400 - SMA_VOLTAGE_L1 = 0x00020400 + SMA_VOLTAGE_L1 = 0x00320400 SMA_VOLTAGE_L2 = 0x00340400 SMA_VOLTAGE_L3 = 0x00480400 SMA_VERSION = 0x90000000 From 0929217f31a30cc8bf39e531c130bff38017a5c6 Mon Sep 17 00:00:00 2001 From: Roeland Date: Sun, 10 Nov 2024 19:42:40 +0100 Subject: [PATCH 3/3] versionbump --- sma/CHANGELOG.md | 4 ++-- sma/config.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sma/CHANGELOG.md b/sma/CHANGELOG.md index 149d9f1..47f1776 100644 --- a/sma/CHANGELOG.md +++ b/sma/CHANGELOG.md @@ -1,8 +1,8 @@ -## 0.1.4-rc2 +## 0.1.4 -- patching for tripower +- patch for tripower inverters ## 0.1.3 diff --git a/sma/config.yaml b/sma/config.yaml index 98c2b32..615cb3d 100644 --- a/sma/config.yaml +++ b/sma/config.yaml @@ -1,6 +1,6 @@ name: "SMA Energy Meter emulator" description: "Simulate one or more SMA energy meters based on mqtt messages." -version: "0.1.4-rc2" +version: "0.1.4" slug: sma url: "https://github.com/Roeland54/SMA-Energy-Meter-emulator" arch: