wip

evcc-io · Dec 28, 2024 · 3446f54 · 3446f54
1 parent cd60918
commit 3446f54
Show file tree

Hide file tree

Showing 90 changed files with 142 additions and 142 deletions.
diff --git a/charger/charger.go b/charger/charger.go
@@ -24,7 +24,7 @@ func init() {
 	registry.AddCtx(api.Custom, NewConfigurableFromConfig)
 }
 
-//go:generate decorate -f decorateCustom -b *Charger -r api.Charger -t "api.ChargerEx,MaxCurrentMillis,func(float64) error" -t "api.Identifier,Identify,func() (string, error)" -t "api.PhaseSwitcher,Phases1p3p,func(int) error" -t "api.Resurrector,WakeUp,func() error" -t "api.Battery,Soc,func() (float64, error)" -t "api.Meter,CurrentPower,func() (float64, error)" -t "api.EnergyImport,EnergyImport,func() (float64, error)" -t "api.PhaseCurrents,Currents,func() (float64, float64, float64, error)" -t "api.PhaseVoltages,Voltages,func() (float64, float64, float64, error)"
+//go:generate decorate -f decorateCustom -b *Charger -r api.Charger -t "api.ChargerEx,MaxCurrentMillis,func(float64) error" -t "api.Identifier,Identify,func() (string, error)" -t "api.PhaseSwitcher,Phases1p3p,func(int) error" -t "api.Resurrector,WakeUp,func() error" -t "api.Battery,Soc,func() (float64, error)" -t "api.Meter,CurrentPower,func() (float64, error)" -t "api.ImportImport,ImportImport,func() (float64, error)" -t "api.PhaseCurrents,Currents,func() (float64, float64, float64, error)" -t "api.PhaseVoltages,Voltages,func() (float64, float64, float64, error)"
 
 // NewConfigurableFromConfig creates a new configurable charger
 func NewConfigurableFromConfig(ctx context.Context, other map[string]interface{}) (api.Charger, error) {
@@ -39,7 +39,7 @@ func NewConfigurableFromConfig(ctx context.Context, other map[string]interface{}
 
 		// optional measurements
 		Power  *provider.Config
-		Energy *provider.Config
+		Import *provider.Config
 
 		Currents, Voltages []provider.Config
 	}
@@ -132,7 +132,7 @@ func NewConfigurableFromConfig(ctx context.Context, other map[string]interface{}
 	}
 
 	// decorate measurements
-	powerG, energyG, err := meter.BuildMeasurements(ctx, cc.Power, cc.Energy)
+	powerG, importG, _, err := meter.BuildMeasurements(ctx, cc.Power, cc.Import, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -142,7 +142,7 @@ func NewConfigurableFromConfig(ctx context.Context, other map[string]interface{}
 		return nil, err
 	}
 
-	return decorateCustom(c, maxcurrentmillis, identify, phases1p3p, wakeup, soc, powerG, energyG, currentsG, voltagesG), nil
+	return decorateCustom(c, maxcurrentmillis, identify, phases1p3p, wakeup, soc, powerG, importG, currentsG, voltagesG), nil
 }
 
 // NewConfigurable creates a new charger

diff --git a/evcc.dist.yaml b/evcc.dist.yaml
@@ -62,7 +62,7 @@ meters:
     rtu: true # rs485 device connected using ethernet adapter
     id: 2
     power: Power # default value, optionally override
-    energy: Sum # default value, optionally override
+    import: Sum # default value, optionally override
   - name: pv
     type: ...
   - name: battery

diff --git a/templates/definition/meter/abb-ab.yaml b/templates/definition/meter/abb-ab.yaml
@@ -13,7 +13,7 @@ render: |
   {{- include "modbus" . }}
   model: abb
   power: Power
-  energy: Import
+  import: Import
   currents:
     - CurrentL1
     - CurrentL2

diff --git a/templates/definition/meter/acrel-adw300.yaml b/templates/definition/meter/acrel-adw300.yaml
@@ -21,7 +21,7 @@ render: |
     {{- if eq .usage "pv" }}
     scale: -1
     {{- end }}
-  energy:
+  import:
     source: modbus
     {{- include "modbus" . | indent 2 }}
     register:

diff --git a/templates/definition/meter/alpha-ess-smile.yaml b/templates/definition/meter/alpha-ess-smile.yaml
@@ -38,7 +38,7 @@ render: |
       address: 33 # 0x21 Total Active power (Grid Meter)
       type: holding
       decode: int32
-  energy:
+  import:
     source: modbus
     {{- include "modbus" . | indent 2 }}
     register:
@@ -115,7 +115,7 @@ render: |
         address: 1075 # 0x433 PV6 power
         type: holding
         decode: uint32
-  energy:
+  import:
     source: modbus
     {{- include "modbus" . | indent 2 }}
     register:
@@ -132,7 +132,7 @@ render: |
       address: 294 # 0x126 Battery Power
       type: holding
       decode: int16
-  energy:
+  import:
     source: modbus
     {{- include "modbus" . | indent 2 }}
     register:

diff --git a/templates/definition/meter/apsystems-ez1.yaml b/templates/definition/meter/apsystems-ez1.yaml
@@ -14,7 +14,7 @@ render: |
     source: http
     uri: http://{{ .host }}:8050/getOutputData
     jq: .data.p1+.data.p2
-  energy:
+  import:
     source: http
     uri: http://{{ .host }}:8050/getOutputData
     jq: .data.te1+.data.te2

diff --git a/templates/definition/meter/be-mpm3pm.yaml b/templates/definition/meter/be-mpm3pm.yaml
@@ -13,7 +13,7 @@ render: |
   {{- include "modbus" . }}
   model: MPM
   power: Power
-  energy: Import
+  import: Import
   currents:
     - CurrentL1
     - CurrentL2

diff --git a/templates/definition/meter/bge_tech_ds100.yaml b/templates/definition/meter/bge_tech_ds100.yaml
@@ -21,7 +21,7 @@ render: |
     {{- if eq .usage "pv" }}
     scale: -1
     {{- end }}
-  energy:
+  import:
     source: modbus
     {{- include "modbus" . | indent 2 }}
     register:

diff --git a/templates/definition/meter/bge_tech_ws100.yaml b/templates/definition/meter/bge_tech_ws100.yaml
@@ -21,7 +21,7 @@ render: |
     {{- if eq .usage "pv" }}
     scale: -1
     {{- end }}
-  energy:
+  import:
     source: modbus
     {{- include "modbus" . | indent 2 }}
     register:

diff --git a/templates/definition/meter/cg-em24.yaml b/templates/definition/meter/cg-em24.yaml
@@ -16,7 +16,7 @@ render: |
   {{- include "modbus" . }}
   model: cgem24
   power: Power
-  energy: Import
+  import: Import
   currents:
     - CurrentL1
     - CurrentL2

diff --git a/templates/definition/meter/cg-emt1xx.yaml b/templates/definition/meter/cg-emt1xx.yaml
@@ -21,7 +21,7 @@ render: |
       type: input
       decode: int32
     scale: {{ if eq .usage "pv" }}-{{ end }}0.1
-  energy:
+  import:
     source: modbus
     {{- include "modbus" . | indent 2 }}
     register:

diff --git a/templates/definition/meter/cg-emt3xx.yaml b/templates/definition/meter/cg-emt3xx.yaml
@@ -28,7 +28,7 @@ render: |
   {{- include "modbus" . }}
   model: cgex3x0
   power: Power
-  energy: Import
+  import: Import
   currents:
     - CurrentL1
     - CurrentL2

diff --git a/templates/definition/meter/demo-battery.yaml b/templates/definition/meter/demo-battery.yaml
@@ -60,7 +60,7 @@ render: |
     source: const
     value: {{ .power }}
   {{- if .energy }}
-  energy:
+  import:
     source: const
     value: {{ .energy}}
   {{- end }}

diff --git a/templates/definition/meter/demo-meter.yaml b/templates/definition/meter/demo-meter.yaml
@@ -47,7 +47,7 @@ render: |
     source: const
     value: {{ .power }}
   {{- if .energy }}
-  energy:
+  import:
     source: const
     value: {{ .energy}}
   {{- end }}

diff --git a/templates/definition/meter/deye-hybrid-3p.yaml b/templates/definition/meter/deye-hybrid-3p.yaml
@@ -36,7 +36,7 @@ render: |
       address: 625 # Grid side total power
       type: holding
       decode: int16
-  energy:
+  import:
     source: modbus
     {{- include "modbus" . | indent 2 }}
     register:
@@ -95,7 +95,7 @@ render: |
         address: 675 # "PV4 input power"
         type: holding
         decode: uint16
-  energy:
+  import:
     source: modbus
     {{- include "modbus" . | indent 2 }}
     register:
@@ -112,7 +112,7 @@ render: |
       address: 590 # "Battery output power"
       type: holding
       decode: int16
-  energy:
+  import:
     source: modbus
     {{- include "modbus" . | indent 2 }}
     register:

diff --git a/templates/definition/meter/deye-hybrid-hp3.yaml b/templates/definition/meter/deye-hybrid-hp3.yaml
@@ -35,7 +35,7 @@ render: |
       address: 625 # Grid side total power
       type: holding
       decode: int16
-  energy:
+  import:
     source: modbus
     {{- include "modbus" . | indent 2 }}
     register:
@@ -98,7 +98,7 @@ render: |
         type: holding
         decode: uint16
       scale: 10
-  energy:
+  import:
     source: modbus
     {{- include "modbus" . | indent 2 }}
     register:
@@ -116,7 +116,7 @@ render: |
       type: holding
       decode: int16
     scale: 10
-  energy:
+  import:
     source: modbus
     {{- include "modbus" . | indent 2 }}
     register:

diff --git a/templates/definition/meter/deye-mi.yaml b/templates/definition/meter/deye-mi.yaml
@@ -31,7 +31,7 @@ render: |
       type: holding
       decode: uint32
     scale: 0.1
-  energy:
+  import:
     source: modbus
     {{- include "modbus" . | indent 2 }}
     register:

diff --git a/templates/definition/meter/deye-storage.yaml b/templates/definition/meter/deye-storage.yaml
@@ -25,7 +25,7 @@ render: |
       address: 169 # "Total grid power"
       type: holding
       decode: int16
-  energy:
+  import:
     source: calc
     add:
     - source: modbus
@@ -71,7 +71,7 @@ render: |
         address: 189 # "PV4 input power"
         type: holding
         decode: uint16
-  energy:
+  import:
     source: modbus
     {{- include "modbus" . | indent 2 }}
     register:
@@ -88,7 +88,7 @@ render: |
       address: 190 # "Battery output power"
       type: holding
       decode: int16
-  energy:
+  import:
     source: modbus
     {{- include "modbus" . | indent 2 }}
     register:

diff --git a/templates/definition/meter/deye-string.yaml b/templates/definition/meter/deye-string.yaml
@@ -24,7 +24,7 @@ render: |
       type: holding
       decode: uint32
     scale: 0.1
-  energy:
+  import:
     source: modbus
     {{- include "modbus" . | indent 2 }}
     register:

diff --git a/templates/definition/meter/dsmr.yaml b/templates/definition/meter/dsmr.yaml
@@ -20,5 +20,5 @@ render: |
   type: dsmr
   uri: {{ .host }}:{{ .port }}
   {{- if .energy }}
-  energy: {{ .energy }}
+  import: {{ .energy }}
   {{- end }}
diff --git a/templates/definition/meter/dzg.yaml b/templates/definition/meter/dzg.yaml
@@ -13,7 +13,7 @@ render: |
   {{- include "modbus" . }}
   model: dzg
   power: ImportPower
-  energy: Import
+  import: Import
   currents:
     - CurrentL1
     - CurrentL2

diff --git a/templates/definition/meter/eastron-sdm120.yaml b/templates/definition/meter/eastron-sdm120.yaml
@@ -20,7 +20,7 @@ render: |
     {{- if eq .usage "pv" }}
     scale: -1
     {{- end }}
-  energy:
+  import:
     source: modbus
     {{- include "modbus" . | indent 2 }}
     register:

diff --git a/templates/definition/meter/eastron-sdm220_230.yaml b/templates/definition/meter/eastron-sdm220_230.yaml
@@ -19,4 +19,4 @@ render: |
   {{- include "modbus" . }}
   model: sdm220
   power: Power
-  energy: Import
+  import: Import
diff --git a/templates/definition/meter/eastron-sdm72.yaml b/templates/definition/meter/eastron-sdm72.yaml
@@ -13,4 +13,4 @@ render: |
   {{- include "modbus" . }}
   model: sdm72
   power: Power
-  energy: Import
+  import: Import
diff --git a/templates/definition/meter/eastron-sdm72v2_630.yaml b/templates/definition/meter/eastron-sdm72v2_630.yaml
@@ -25,7 +25,7 @@ render: |
   {{- include "modbus" . }}
   model: sdm
   power: Power
-  energy: Import
+  import: Import
   currents:
     - CurrentL1
     - CurrentL2

diff --git a/templates/definition/meter/enphase.yaml b/templates/definition/meter/enphase.yaml
@@ -42,7 +42,7 @@ render: |
     insecure: true
     {{- end }}
     jq: if .production[] | select(.measurementType == "production").activeCount >= 1 then .production[] | select(.measurementType == "production").wNow else .production[] | select(.type == "inverters").wNow end
-  energy:
+  import:
     source: http
     uri: http://{{ .host }}/production.json
     {{- if .token }}

diff --git a/templates/definition/meter/fox-ess-h3.yaml b/templates/definition/meter/fox-ess-h3.yaml
@@ -46,7 +46,7 @@ render: |
         type: holding
         decode: int16
       scale: -1
-  energy:
+  import:
     source: modbus
     {{- include "modbus" . | indent 2 }}
     register:

diff --git a/templates/definition/meter/fronius-gen24.yaml b/templates/definition/meter/fronius-gen24.yaml
@@ -32,7 +32,7 @@ render: |
     value:
       - 203:W
       - 213:W
-  energy:
+  import:
     source: sunspec
     uri: {{ .host }}:{{ .port }}
     id: 200
@@ -125,7 +125,7 @@ render: |
       uri: {{ .host }}:{{ .port }}
       id: 1
       value: 160:4:DCW # mppt 4 discharge
-  energy:
+  import:
     source: sunspec
     uri: {{ .host }}:{{ .port }}
     id: 1

diff --git a/templates/definition/meter/go-e-controller.yaml b/templates/definition/meter/go-e-controller.yaml
@@ -14,7 +14,7 @@ render: |
     source: http
     uri: http://{{ .host }}/api/status?filter=ccp
     jq: .ccp[1]
-  energy:
+  import:
     source: http
     uri: http://{{ .host }}/api/status?filter=cec
     jq: .cec[1][0]/1000
@@ -24,7 +24,7 @@ render: |
     source: http
     uri: http://{{ .host }}/api/status?filter=ccp
     jq: .ccp[4]
-  energy:
+  import:
     source: http
     uri: http://{{ .host }}/api/status?filter=cec
     jq: .cec[4][0]/1000

diff --git a/templates/definition/meter/goodwe-dt.yaml b/templates/definition/meter/goodwe-dt.yaml
@@ -20,7 +20,7 @@ render: |
       address: 781 # Actual Power
       type: holding
       decode: uint16
-  energy:
+  import:
     source: modbus
     {{- include "modbus" . | indent 2 }}
     register: # manual non-sunspec register configuration