From 8aa372d06f465c5e725c1826dde926fb854a83f8 Mon Sep 17 00:00:00 2001 From: TomF79 <93859783+TomF79@users.noreply.github.com> Date: Thu, 23 Jan 2025 21:27:05 +0100 Subject: [PATCH 1/5] Fronius Gen24: remove ChaGriSet and InOutWRte_ Remove ChaGriSet Remove InOutWRte Add InWrte Add MinRsvPct --- templates/definition/meter/fronius-gen24.yaml | 39 ++++++++----------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/templates/definition/meter/fronius-gen24.yaml b/templates/definition/meter/fronius-gen24.yaml index 447c65f17f..9bf69f12ea 100644 --- a/templates/definition/meter/fronius-gen24.yaml +++ b/templates/definition/meter/fronius-gen24.yaml @@ -144,37 +144,37 @@ render: | source: sequence set: - source: const - value: 0 # off + value: 0 set: source: sunspec uri: {{ .host }}:{{ .port }} id: 1 - value: 124:0:ChaGriSet + value: 124:0:StorCtl_Mod - source: const - value: 0 + value: 100 # % set: source: sunspec uri: {{ .host }}:{{ .port }} id: 1 - value: 124:0:StorCtl_Mod - - source: const + value: 124:0:OutWRte + - source: const value: 100 # % set: source: sunspec uri: {{ .host }}:{{ .port }} id: 1 - value: 124:0:OutWRte - - case: 2 # hold - set: - source: sequence - set: - - source: const - value: 0 # off + value: 124:0:InWRte + - source: const + value: 5 # % set: source: sunspec uri: {{ .host }}:{{ .port }} id: 1 - value: 124:0:ChaGriSet + value: 124:0:MinRsvPct + - case: 2 # hold + set: + source: sequence + set: - source: const value: 2 set: @@ -189,19 +189,12 @@ render: | uri: {{ .host }}:{{ .port }} id: 1 value: 124:0:OutWRte - - source: const - value: 0 # s - set: - source: sunspec - uri: {{ .host }}:{{ .port }} - id: 1 - value: 124:0:InOutWRte_RvrtTms - case: 3 # charge set: source: sequence set: - source: const - value: 1 # off + value: 1 # on set: source: sunspec uri: {{ .host }}:{{ .port }} @@ -222,11 +215,11 @@ render: | id: 1 value: 124:0:OutWRte - source: const - value: 0 # s + value: 99 # % set: source: sunspec uri: {{ .host }}:{{ .port }} id: 1 - value: 124:0:InOutWRte_RvrtTms + value: 124:0:MinRsvPct capacity: {{ .capacity }} # kWh {{- end }} From 3d2dd71777607a9319dbe2208f16982cef10c083 Mon Sep 17 00:00:00 2001 From: TomF79 <93859783+TomF79@users.noreply.github.com> Date: Fri, 24 Jan 2025 08:36:39 +0100 Subject: [PATCH 2/5] wrong format --- templates/definition/meter/fronius-gen24.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/definition/meter/fronius-gen24.yaml b/templates/definition/meter/fronius-gen24.yaml index 9bf69f12ea..b7a8ad11fe 100644 --- a/templates/definition/meter/fronius-gen24.yaml +++ b/templates/definition/meter/fronius-gen24.yaml @@ -157,14 +157,14 @@ render: | uri: {{ .host }}:{{ .port }} id: 1 value: 124:0:OutWRte - - source: const + - source: const value: 100 # % set: source: sunspec uri: {{ .host }}:{{ .port }} id: 1 value: 124:0:InWRte - - source: const + - source: const value: 5 # % set: source: sunspec From f119055856426516b50ff79544904ec2779921be Mon Sep 17 00:00:00 2001 From: premultiply <4681172+premultiply@users.noreply.github.com> Date: Sun, 26 Jan 2025 22:06:08 +0100 Subject: [PATCH 3/5] simplify --- templates/definition/meter/fronius-gen24.yaml | 21 ------------------- 1 file changed, 21 deletions(-) diff --git a/templates/definition/meter/fronius-gen24.yaml b/templates/definition/meter/fronius-gen24.yaml index b7a8ad11fe..082f2fcc05 100644 --- a/templates/definition/meter/fronius-gen24.yaml +++ b/templates/definition/meter/fronius-gen24.yaml @@ -157,20 +157,6 @@ render: | uri: {{ .host }}:{{ .port }} id: 1 value: 124:0:OutWRte - - source: const - value: 100 # % - set: - source: sunspec - uri: {{ .host }}:{{ .port }} - id: 1 - value: 124:0:InWRte - - source: const - value: 5 # % - set: - source: sunspec - uri: {{ .host }}:{{ .port }} - id: 1 - value: 124:0:MinRsvPct - case: 2 # hold set: source: sequence @@ -214,12 +200,5 @@ render: | uri: {{ .host }}:{{ .port }} id: 1 value: 124:0:OutWRte - - source: const - value: 99 # % - set: - source: sunspec - uri: {{ .host }}:{{ .port }} - id: 1 - value: 124:0:MinRsvPct capacity: {{ .capacity }} # kWh {{- end }} From 4f36f6153d3caa963ba78dde9a9d97843e1b94a6 Mon Sep 17 00:00:00 2001 From: premultiply <4681172+premultiply@users.noreply.github.com> Date: Sun, 26 Jan 2025 22:07:47 +0100 Subject: [PATCH 4/5] keep watchdog --- templates/definition/meter/fronius-gen24.yaml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/templates/definition/meter/fronius-gen24.yaml b/templates/definition/meter/fronius-gen24.yaml index 082f2fcc05..685c87d7dd 100644 --- a/templates/definition/meter/fronius-gen24.yaml +++ b/templates/definition/meter/fronius-gen24.yaml @@ -175,12 +175,19 @@ render: | uri: {{ .host }}:{{ .port }} id: 1 value: 124:0:OutWRte + - source: const + value: 0 # s + set: + source: sunspec + uri: {{ .host }}:{{ .port }} + id: 1 + value: 124:0:InOutWRte_RvrtTms - case: 3 # charge set: source: sequence set: - source: const - value: 1 # on + value: 1 # off set: source: sunspec uri: {{ .host }}:{{ .port }} @@ -200,5 +207,12 @@ render: | uri: {{ .host }}:{{ .port }} id: 1 value: 124:0:OutWRte + - source: const + value: 0 # s + set: + source: sunspec + uri: {{ .host }}:{{ .port }} + id: 1 + value: 124:0:InOutWRte_RvrtTms capacity: {{ .capacity }} # kWh {{- end }} From 95ddd4e004564f50c752c63dd6127afe08ec28f6 Mon Sep 17 00:00:00 2001 From: premultiply <4681172+premultiply@users.noreply.github.com> Date: Sun, 26 Jan 2025 22:11:48 +0100 Subject: [PATCH 5/5] remove watchdog --- templates/definition/meter/fronius-gen24.yaml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/templates/definition/meter/fronius-gen24.yaml b/templates/definition/meter/fronius-gen24.yaml index 685c87d7dd..6e2c082f94 100644 --- a/templates/definition/meter/fronius-gen24.yaml +++ b/templates/definition/meter/fronius-gen24.yaml @@ -175,13 +175,6 @@ render: | uri: {{ .host }}:{{ .port }} id: 1 value: 124:0:OutWRte - - source: const - value: 0 # s - set: - source: sunspec - uri: {{ .host }}:{{ .port }} - id: 1 - value: 124:0:InOutWRte_RvrtTms - case: 3 # charge set: source: sequence @@ -207,12 +200,5 @@ render: | uri: {{ .host }}:{{ .port }} id: 1 value: 124:0:OutWRte - - source: const - value: 0 # s - set: - source: sunspec - uri: {{ .host }}:{{ .port }} - id: 1 - value: 124:0:InOutWRte_RvrtTms capacity: {{ .capacity }} # kWh {{- end }}