diff --git a/templates/definition/meter/enphase.yaml b/templates/definition/meter/enphase.yaml index 2b94cea16..3e8bdf9bf 100644 --- a/templates/definition/meter/enphase.yaml +++ b/templates/definition/meter/enphase.yaml @@ -23,7 +23,6 @@ render: | power: source: http uri: http://{{ .host }}/production.json - method: GET {{- if .token }} auth: type: bearer @@ -36,7 +35,6 @@ render: | power: source: http uri: http://{{ .host }}/production.json - method: GET {{- if .token }} auth: type: bearer @@ -47,7 +45,6 @@ render: | energy: source: http uri: http://{{ .host }}/production.json - method: GET {{- if .token }} auth: type: bearer @@ -61,7 +58,6 @@ render: | power: source: http uri: http://{{ .host }}/production.json - method: GET {{- if .token }} auth: type: bearer @@ -72,7 +68,6 @@ render: | soc: source: http uri: http://{{ .host }}/ivp/ensemble/inventory - method: GET {{- if .token }} auth: type: bearer diff --git a/templates/definition/meter/slimmelezer.yaml b/templates/definition/meter/slimmelezer.yaml index f473addfc..608e79f46 100644 --- a/templates/definition/meter/slimmelezer.yaml +++ b/templates/definition/meter/slimmelezer.yaml @@ -17,14 +17,12 @@ render: | add: - source: http uri: http://{{ .host }}/sensor/power_delivered - method: GET headers: - content-type: application/json jq: .value scale: 1000 - source: http uri: http://{{ .host }}/sensor/power_returned - method: GET headers: - content-type: application/json jq: .value @@ -34,32 +32,27 @@ render: | add: - source: http uri: http://{{ .host }}/sensor/energy_delivered_tariff1 - method: GET headers: - content-type: application/json jq: .value - source: http uri: http://{{ .host }}/sensor/energy_delivered_tariff2 - method: GET headers: - content-type: application/json jq: .value currents: - source: http uri: http://{{ .host }}/sensor/current_l1 - method: GET headers: - content-type: application/json jq: .value - source: http uri: http://{{ .host }}/sensor/current_l2 - method: GET headers: - content-type: application/json jq: .value - source: http uri: http://{{ .host }}/sensor/current_l3 - method: GET headers: - content-type: application/json jq: .value @@ -68,14 +61,12 @@ render: | add: - source: http uri: http://{{ .host }}/sensor/power_delivered_l1 - method: GET headers: - content-type: application/json jq: .value scale: 1000 - source: http uri: http://{{ .host }}/sensor/power_returned_l1 - method: GET headers: - content-type: application/json jq: .value @@ -84,14 +75,12 @@ render: | add: - source: http uri: http://{{ .host }}/sensor/power_delivered_l2 - method: GET headers: - content-type: application/json jq: .value scale: 1000 - source: http uri: http://{{ .host }}/sensor/power_returned_l2 - method: GET headers: - content-type: application/json jq: .value @@ -100,14 +89,12 @@ render: | add: - source: http uri: http://{{ .host }}/sensor/power_delivered_l3 - method: GET headers: - content-type: application/json jq: .value scale: 1000 - source: http uri: http://{{ .host }}/sensor/power_returned_l3 - method: GET headers: - content-type: application/json jq: .value diff --git a/templates/definition/meter/youless.yaml b/templates/definition/meter/youless.yaml index de8cc30a4..65f820bc7 100644 --- a/templates/definition/meter/youless.yaml +++ b/templates/definition/meter/youless.yaml @@ -19,23 +19,19 @@ render: | power: source: http uri: http://{{ .host }}/e - method: GET jq: .[0]|.pwr energy: source: http uri: http://{{ .host }}/e - method: GET jq: .[0]|.p1+.p2 {{- end }} {{- if eq .usage "pv" }} power: source: http uri: http://{{ .host }}/e - method: GET jq: .[0].ps0 energy: source: http uri: http://{{ .host }}/e - method: GET jq: .[0].cs0 {{- end }} diff --git a/templates/definition/vehicle/evnotify.yaml b/templates/definition/vehicle/evnotify.yaml index 331c38f1b..1583078bc 100644 --- a/templates/definition/vehicle/evnotify.yaml +++ b/templates/definition/vehicle/evnotify.yaml @@ -29,6 +29,5 @@ render: | soc: source: http uri: https://app.evnotify.de/soc?akey={{ urlEncode .akey }}&token={{ urlEncode .token }} # evNotify Server + AKEY - method: GET jq: .soc_display {{ include "vehicle-identify" . }}