Merge branch 'master' into feat/e3dc-wb

Author: premultiply

core/site_optimizer.go

@@ -536,7 +536,7 @@ func applySmartCostLimit(lp loadpoint.API, demand []float32, grid api.Rates, min
 		demand = make([]float32, minLen)
 	}
 
-	for i := 0; i < maxLen; i++ {
+	for i := range maxLen {
 		if grid[i].Value <= *costLimit {
 			demand[i] = float32(maxPower / slotsPerHour)
 		}

meter/goodwe-wifi.go

@@ -20,7 +20,7 @@ func init() {
 
 //go:generate go tool decorate -f decorateGoodWeWifi -b *goodWeWiFi -r api.Meter -t "api.Battery,Soc,func() (float64, error)" -t "api.BatteryCapacity,Capacity,func() float64"
 
-// TODO deprecated remove
+// TODO deprecated
 
 func NewGoodWeWifiFromConfig(other map[string]any) (api.Meter, error) {
 	cc := struct {

meter/homeassistant.go

@@ -26,7 +26,7 @@ func NewHomeAssistantFromConfig(other map[string]any) (api.Meter, error) {
 	cc := struct {
 		URI      string
 		Token_   string `mapstructure:"token"` // TODO deprecated
-		Home     string // TODO deprecated, backward compatibility (v0.210.x)
+		Home     string // TODO deprecated
 		Power    string
 		Energy   string
 		Currents []string

templates/definition/meter/solis-hybrid-s.yaml

@@ -118,13 +118,25 @@ render: |
   {{- end }}
   {{- if eq .usage "battery" }}
   power:
-    source: modbus
-    {{- include "modbus" . | indent 2 }}
-    register:
-      type: input
-      address: 33149 # Battery power
-      decode: int32
-    scale: -1
+    source: calc
+    mul:
+    - source: modbus
+      {{- include "modbus" . | indent 4 }}
+      register:
+        type: input
+        address: 33149 # Battery power
+        decode: uint32
+    - source: calc
+      add:
+      - source: modbus
+        {{- include "modbus" . | indent 6 }}
+        register:
+          type: input
+          address: 33135 # Battery current direction
+          decode: uint16 # 0：charge, 1：discharge
+        scale: 2
+      - source: const
+        value: -1
   energy:
     source: modbus
     {{- include "modbus" . | indent 2 }}