Merge remote-tracking branch 'origin/master'

Author: weblate

api/api.go

@@ -185,6 +185,12 @@ type SocLimiter interface {
 	GetLimitSoc() (int64, error)
 }
 
+// Dimmer provides §14a dimming
+type Dimmer interface {
+	Dimmed() (bool, error)
+	Dim(bool) error
+}
+
 // ChargeController allows to start/stop the charging session on the vehicle side
 type ChargeController interface {
 	ChargeEnable(bool) error

charger/sgready-boost.go

@@ -53,7 +53,7 @@ func NewSgReadyBoostFromConfig(ctx context.Context, other map[string]interface{}
 func NewSgReadyBoost(ctx context.Context, embed *embed, charger api.Charger) (*SgReady, error) {
 	modeS := func(mode int64) error {
 		switch mode {
-		case Dimm:
+		case Dim:
 			return api.ErrNotAvailable
 		case Normal:
 			return charger.Enable(false)

charger/sgready.go

@@ -47,7 +47,7 @@ func init() {
 
 const (
 	_      int64 = iota
-	Dimm         // 1
+	Dim          // 1
 	Normal       // 2
 	Boost        // 3
 )
@@ -134,8 +134,8 @@ func (wb *SgReady) Status() (api.ChargeStatus, error) {
 		return api.StatusNone, err
 	}
 
-	if mode == Dimm {
-		return api.StatusNone, errors.New("dimm mode")
+	if mode == Dim {
+		return api.StatusNone, errors.New("dim mode")
 	}
 
 	status := map[int64]api.ChargeStatus{Boost: api.StatusC, Normal: api.StatusB}
@@ -161,6 +161,30 @@ func (wb *SgReady) Enable(enable bool) error {
 	return wb.setMaxPower(wb.power)
 }
 
+var _ api.Dimmer = (*SgReady)(nil)
+
+// Dimmed implements the api.Dimmer interface
+func (wb *SgReady) Dimmed() (bool, error) {
+	mode, err := wb.getMode()
+	return mode == Dim, err
+}
+
+// Dimm implements the api.Dimmer interface
+func (wb *SgReady) Dim(dim bool) error {
+	mode := Normal
+	if dim {
+		mode = Dim
+	}
+
+	if err := wb.modeS(mode); err != nil {
+		return err
+	}
+
+	wb.mode = Dim
+
+	return nil
+}
+
 // MaxCurrent implements the api.Charger interface
 func (wb *SgReady) MaxCurrent(current int64) error {
 	return wb.MaxCurrentMillis(float64(current))

core/keys/loadpoint.go

@@ -36,6 +36,7 @@ const (
 	Enabled   = "enabled"   // loadpoint enabled
 	Connected = "connected" // connected
 	Charging  = "charging"  // charging
+	Dimmed    = "dimmed"    // dimmed pseudo-status
 
 	// loadpoint setpoint
 	OfferedCurrent = "offeredCurrent" // offered current

core/loadpoint.go

@@ -1847,6 +1847,31 @@ func (lp *Loadpoint) Update(sitePower, batteryBoostPower float64, consumption, f
 	lp.publishChargeProgress()
 	lp.PublishEffectiveValues()
 
+	// §14a
+	if dimmer, ok := lp.charger.(api.Dimmer); ok {
+		dimmed, err := dimmer.Dimmed()
+		if err != nil {
+			lp.log.ERROR.Printf("dimmed: %v", err)
+			return
+		}
+
+		dim := lp.circuit != nil && lp.circuit.Dimmed()
+
+		if dim != dimmed {
+			if err := dimmer.Dim(dim); err != nil {
+				lp.log.ERROR.Printf("dim: %v", err)
+				return
+			}
+
+			lp.publish(keys.Dimmed, dim)
+			lp.log.INFO.Printf("§14a dim: %t", dim)
+		}
+
+		if dim {
+			return
+		}
+	}
+
 	// read and publish status
 	welcomeCharge, err := lp.updateChargerStatus()
 	if err != nil {