Add support for both 1-phase as 3-phase meters

Author: mluiten

go.mod

@@ -75,7 +75,7 @@ require (
 	github.com/lunixbochs/struc v0.0.0-20241101090106-8d528fa2c543
 	github.com/mabunixda/wattpilot v1.8.5
 	github.com/mitchellh/go-homedir v1.1.0
-	github.com/mluiten/evcc-homewizard-v2 v0.2.0
+	github.com/mluiten/evcc-homewizard-v2 v0.3.0
 	github.com/modelcontextprotocol/go-sdk v1.1.0
 	github.com/muka/go-bluetooth v0.0.0-20240701044517-04c4f09c514e
 	github.com/mxschmitt/golang-combinations v1.2.0

go.sum

@@ -516,8 +516,8 @@ github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:F
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
 github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
-github.com/mluiten/evcc-homewizard-v2 v0.2.0 h1:W9bhbxQN5PCzaIxkFF68VJk5gA6GOmMgEqmBjh2gGks=
-github.com/mluiten/evcc-homewizard-v2 v0.2.0/go.mod h1:0gWZsWfzmBhqoG0SEbHdx6ohOE7EyRl+2ZQHos+y/yM=
+github.com/mluiten/evcc-homewizard-v2 v0.3.0 h1:b4ZzhXnBE/ZpeiDsMXhfSpKZmNz+kb5jmTgSgA5gJVQ=
+github.com/mluiten/evcc-homewizard-v2 v0.3.0/go.mod h1:0gWZsWfzmBhqoG0SEbHdx6ohOE7EyRl+2ZQHos+y/yM=
 github.com/modelcontextprotocol/go-sdk v1.1.0 h1:Qjayg53dnKC4UZ+792W21e4BpwEZBzwgRW6LrjLWSwA=
 github.com/modelcontextprotocol/go-sdk v1.1.0/go.mod h1:6fM3LCm3yV7pAs8isnKLn07oKtB0MP9LHd3DfAcKw10=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=

meter/homewizard-battery.go

@@ -19,7 +19,7 @@ func init() {
 type HomeWizardBattery struct {
 	log            *util.Logger
 	device         *device.BatteryDevice
-	controller     *device.P1Device
+	controller     *device.P1MeterDevice
 	controllerOnce sync.Once
 	capacity       float64
 	maxCharge      float64 // Maximum charge power in W
@@ -68,7 +68,7 @@ func NewHomeWizardBatteryFromConfig(other map[string]any) (api.Meter, error) {
 }
 
 // getController resolves the controller P1 meter (lazy initialization to avoid timing issues)
-func (m *HomeWizardBattery) getController() (*device.P1Device, error) {
+func (m *HomeWizardBattery) getController() (*device.P1MeterDevice, error) {
 	var err error
 
 	m.controllerOnce.Do(func() {
@@ -88,7 +88,8 @@ func (m *HomeWizardBattery) getController() (*device.P1Device, error) {
 			return
 		}
 
-		m.controller = controllerP1.device
+		// Store P1MeterDevice for battery control
+		m.controller = controllerP1.p1MeterDevice
 		m.log.DEBUG.Printf("resolved controller: %s", m.controller.Host())
 	})
 
@@ -117,35 +118,21 @@ var _ api.Meter = (*HomeWizardBattery)(nil)
 
 // CurrentPower implements the api.Meter interface
 func (m *HomeWizardBattery) CurrentPower() (float64, error) {
-	// Get power directly from battery device
-	measurement, err := m.device.GetMeasurement()
-	if err != nil {
-		return 0, err
-	}
-	// Invert the battery power, because HW reports negative = discharging and positive = charging
-	return -1 * measurement.PowerW, nil
+	return m.device.GetPower()
 }
 
 var _ api.MeterEnergy = (*HomeWizardBattery)(nil)
 
 // TotalEnergy implements the api.MeterEnergy interface
 func (m *HomeWizardBattery) TotalEnergy() (float64, error) {
-	measurement, err := m.device.GetMeasurement()
-	if err != nil {
-		return 0, err
-	}
-	return measurement.EnergyImportkWh, nil
+	return m.device.GetTotalEnergy()
 }
 
 var _ api.Battery = (*HomeWizardBattery)(nil)
 
 // Soc implements the api.Battery interface
 func (m *HomeWizardBattery) Soc() (float64, error) {
-	measurement, err := m.device.GetMeasurement()
-	if err != nil {
-		return 0, err
-	}
-	return measurement.StateOfChargePct, nil
+	return m.device.GetSoc()
 }
 
 var _ api.BatteryCapacity = (*HomeWizardBattery)(nil)
@@ -189,7 +176,7 @@ func (m *HomeWizardBattery) SetBatteryMode(mode api.BatteryMode) error {
 
 	m.log.INFO.Printf("converted to HomeWizard mode: %s", hwMode)
 
-	// Set battery mode via controller P1 meter
+	// Set battery mode via controller P1 meter's wrapper method
 	if err := controller.SetBatteryMode(hwMode); err != nil {
 		m.log.ERROR.Printf("failed to set battery mode: %v", err)
 		return err

meter/homewizard-common.go

@@ -0,0 +1,67 @@
+package meter
+
+import (
+	"github.com/evcc-io/evcc/api"
+	"github.com/evcc-io/evcc/util"
+)
+
+// meterDevice interface abstracts P1MeterDevice and KWHMeterDevice
+type meterDevice interface {
+	GetPower(invertForPV bool) (float64, error)
+	GetPhasePowers(phases int, invertForPV bool) (float64, float64, float64, error)
+	GetPhaseCurrents(phases int) (float64, float64, float64, error)
+	GetPhaseVoltages(phases int) (float64, float64, float64, error)
+	GetTotalEnergy(usePVExport bool) (float64, error)
+}
+
+// HomeWizardMeter provides common functionality for all HomeWizard meters
+type HomeWizardMeter struct {
+	log    *util.Logger
+	device meterDevice
+	usage  string // "pv", "grid", etc.
+	phases int    // 1 or 3
+}
+
+var _ api.Meter = (*HomeWizardMeter)(nil)
+
+// CurrentPower implements the api.Meter interface
+func (m *HomeWizardMeter) CurrentPower() (float64, error) {
+	return m.device.GetPower(m.usage == "pv")
+}
+
+var _ api.MeterEnergy = (*HomeWizardMeter)(nil)
+
+// TotalEnergy implements the api.MeterEnergy interface
+func (m *HomeWizardMeter) TotalEnergy() (float64, error) {
+	// For PV meters, return export energy (production)
+	// For grid meters, return import energy (consumption)
+	return m.device.GetTotalEnergy(m.usage == "pv")
+}
+
+var _ api.PhaseCurrents = (*HomeWizardMeter)(nil)
+
+// Currents implements the api.PhaseCurrents interface
+func (m *HomeWizardMeter) Currents() (float64, float64, float64, error) {
+	return m.device.GetPhaseCurrents(m.phases)
+}
+
+var _ api.PhaseVoltages = (*HomeWizardMeter)(nil)
+
+// Voltages implements the api.PhaseVoltages interface
+func (m *HomeWizardMeter) Voltages() (float64, float64, float64, error) {
+	return m.device.GetPhaseVoltages(m.phases)
+}
+
+var _ api.PhasePowers = (*HomeWizardMeter)(nil)
+
+// Powers implements the api.PhasePowers interface
+func (m *HomeWizardMeter) Powers() (float64, float64, float64, error) {
+	return m.device.GetPhasePowers(m.phases, m.usage == "pv")
+}
+
+var _ api.PhaseGetter = (*HomeWizardMeter)(nil)
+
+// GetPhases implements the api.PhaseGetter interface
+func (m *HomeWizardMeter) GetPhases() (int, error) {
+	return m.phases, nil
+}

meter/homewizard-kwh.go

@@ -13,21 +13,21 @@ func init() {
 	registry.Add("homewizard-kwh", NewHomeWizardKWHFromConfig)
 }
 
-// HomeWizardKWH implements the api.Meter interface for kWh meters
+// HomeWizardKWH is a wrapper for kWh meters using the common HomeWizardMeter base
 type HomeWizardKWH struct {
-	log    *util.Logger
-	device *device.KWHDevice
-	usage  string // "pv" or "grid"
+	*HomeWizardMeter
 }
 
 func NewHomeWizardKWHFromConfig(other map[string]any) (api.Meter, error) {
 	cc := struct {
 		Host    string
 		Token   string
-		Usage   string
+		Usage   string // "pv" or "grid"
+		Phases  int    // 1 or 3
 		Timeout time.Duration
 	}{
 		Usage:   "pv",
+		Phases:  3,
 		Timeout: device.DefaultTimeout,
 	}
 
@@ -40,46 +40,29 @@ func NewHomeWizardKWHFromConfig(other map[string]any) (api.Meter, error) {
 		return nil, fmt.Errorf("missing host or token - run 'evcc token homewizard'")
 	}
 
-	m := &HomeWizardKWH{
-		log:    util.NewLogger("homewizard-kwh"),
-		device: device.NewKWHDevice(cc.Host, cc.Token, cc.Timeout),
-		usage:  cc.Usage,
+	// Validate phases
+	if cc.Phases != 1 && cc.Phases != 3 {
+		return nil, fmt.Errorf("invalid phases value %d: must be 1 or 3", cc.Phases)
 	}
 
+	log := util.NewLogger("homewizard-kwh")
+	kwhDevice := device.NewKWHMeterDevice(cc.Host, cc.Token, cc.Timeout)
+
 	// Start device connection and wait for it to succeed
-	if err := m.device.StartAndWait(cc.Timeout); err != nil {
+	if err := kwhDevice.StartAndWait(cc.Timeout); err != nil {
 		return nil, err
 	}
 
-	m.log.INFO.Printf("configured kWh meter at %s", cc.Host)
+	log.INFO.Printf("configured kWh meter at %s (%d-phase, usage=%s)", cc.Host, cc.Phases, cc.Usage)
 
-	return m, nil
-}
-
-var _ api.Meter = (*HomeWizardKWH)(nil)
-
-// CurrentPower implements the api.Meter interface
-func (m *HomeWizardKWH) CurrentPower() (float64, error) {
-	measurement, err := m.device.GetMeasurement()
-	if err != nil {
-		return 0, err
-	}
-
-	// Invert power for PV (production shows as negative)
-	// Don't invert for grid (import = positive, export = negative)
-	if m.usage == "pv" {
-		return -1 * measurement.PowerW, nil
+	m := &HomeWizardKWH{
+		HomeWizardMeter: &HomeWizardMeter{
+			log:    log,
+			device: kwhDevice,
+			usage:  cc.Usage,
+			phases: cc.Phases,
+		},
 	}
-	return measurement.PowerW, nil
-}
 
-var _ api.MeterEnergy = (*HomeWizardKWH)(nil)
-
-// TotalEnergy implements the api.MeterEnergy interface
-func (m *HomeWizardKWH) TotalEnergy() (float64, error) {
-	measurement, err := m.device.GetMeasurement()
-	if err != nil {
-		return 0, err
-	}
-	return measurement.EnergyImportkWh, nil
+	return m, nil
 }

meter/homewizard-p1.go

@@ -13,18 +13,20 @@ func init() {
 	registry.Add("homewizard-p1", NewHomeWizardP1FromConfig)
 }
 
-// HomeWizardP1 implements the api.Meter interface for P1 meters
+// HomeWizardP1 is a wrapper for P1 meters using the common HomeWizardMeter base
 type HomeWizardP1 struct {
-	log    *util.Logger
-	device *device.P1Device
+	*HomeWizardMeter
+	p1MeterDevice *device.P1MeterDevice // Keep reference for battery control
 }
 
 func NewHomeWizardP1FromConfig(other map[string]any) (api.Meter, error) {
 	cc := struct {
 		Host    string
 		Token   string
+		Phases  int // 1 or 3
 		Timeout time.Duration
 	}{
+		Phases:  3,
 		Timeout: device.DefaultTimeout,
 	}
 
@@ -37,61 +39,37 @@ func NewHomeWizardP1FromConfig(other map[string]any) (api.Meter, error) {
 		return nil, fmt.Errorf("missing host or token - run 'evcc token homewizard'")
 	}
 
-	m := &HomeWizardP1{
-		log:    util.NewLogger("homewizard-p1"),
-		device: device.NewP1Device(cc.Host, cc.Token, cc.Timeout),
+	// Validate phases
+	if cc.Phases != 1 && cc.Phases != 3 {
+		return nil, fmt.Errorf("invalid phases value %d: must be 1 or 3", cc.Phases)
 	}
 
-	// Start device connection and wait for it to succeed
-	if err := m.device.StartAndWait(cc.Timeout); err != nil {
-		return nil, err
-	}
+	log := util.NewLogger("homewizard-p1")
 
-	m.log.INFO.Printf("configured P1 meter at %s", cc.Host)
+	// Create P1MeterDevice (includes battery control)
+	p1MeterDevice := device.NewP1MeterDevice(cc.Host, cc.Token, cc.Timeout)
 
-	return m, nil
-}
-
-var _ api.Meter = (*HomeWizardP1)(nil)
-
-// CurrentPower implements the api.Meter interface
-func (m *HomeWizardP1) CurrentPower() (float64, error) {
-	measurement, err := m.device.GetMeasurement()
-	if err != nil {
-		return 0, err
+	// Start device connection and wait for it to succeed
+	if err := p1MeterDevice.StartAndWait(cc.Timeout); err != nil {
+		return nil, err
 	}
-	return measurement.PowerW, nil
-}
 
-var _ api.MeterEnergy = (*HomeWizardP1)(nil)
+	log.INFO.Printf("configured P1 meter at %s (%d-phase)", cc.Host, cc.Phases)
 
-// TotalEnergy implements the api.MeterEnergy interface
-func (m *HomeWizardP1) TotalEnergy() (float64, error) {
-	measurement, err := m.device.GetMeasurement()
-	if err != nil {
-		return 0, err
+	m := &HomeWizardP1{
+		HomeWizardMeter: &HomeWizardMeter{
+			log:    log,
+			device: p1MeterDevice,
+			usage:  "grid", // P1 meters are always grid meters
+			phases: cc.Phases,
+		},
+		p1MeterDevice: p1MeterDevice,
 	}
-	return measurement.EnergyImportT1kWh + measurement.EnergyImportT2kWh, nil
-}
-
-var _ api.PhaseCurrents = (*HomeWizardP1)(nil)
 
-// Currents implements the api.PhaseCurrents interface
-func (m *HomeWizardP1) Currents() (float64, float64, float64, error) {
-	measurement, err := m.device.GetMeasurement()
-	if err != nil {
-		return 0, 0, 0, err
-	}
-	return measurement.CurrentL1A, measurement.CurrentL2A, measurement.CurrentL3A, nil
+	return m, nil
 }
 
-var _ api.PhaseVoltages = (*HomeWizardP1)(nil)
-
-// Voltages implements the api.PhaseVoltages interface
-func (m *HomeWizardP1) Voltages() (float64, float64, float64, error) {
-	measurement, err := m.device.GetMeasurement()
-	if err != nil {
-		return 0, 0, 0, err
-	}
-	return measurement.VoltageL1V, measurement.VoltageL2V, measurement.VoltageL3V, nil
+// SetBatteryMode sets battery mode via P1 meter (for battery controller)
+func (m *HomeWizardP1) SetBatteryMode(mode string) error {
+	return m.p1MeterDevice.SetBatteryMode(mode)
 }