HEMS: make Dimmed/Curtailed tri-state (once more) (#30712)

api/api.go

@@ -287,8 +287,8 @@ type Circuit interface {
 // HEMS exposes the runtime state of the home energy management system.
 type HEMS interface {
 	SetUpdated(func())
-	Dimmed() bool
-	Curtailed() bool
+	Dimmed() *bool                // nil = no statement
+	Curtailed() *bool             // nil = no statement
 	MaxConsumptionPower() float64 // 0 = no limit
 	MaxProductionPower() *float64 // nil = no limit
 }

api/mock.go

@@ -1173,10 +1173,10 @@ func (m *MockHEMS) EXPECT() *MockHEMSMockRecorder {
 }
 
 // Curtailed mocks base method.
-func (m *MockHEMS) Curtailed() bool {
+func (m *MockHEMS) Curtailed() *bool {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "Curtailed")
-	ret0, _ := ret[0].(bool)
+	ret0, _ := ret[0].(*bool)
 	return ret0
 }
 
@@ -1187,10 +1187,10 @@ func (mr *MockHEMSMockRecorder) Curtailed() *gomock.Call {
 }
 
 // Dimmed mocks base method.
-func (m *MockHEMS) Dimmed() bool {
+func (m *MockHEMS) Dimmed() *bool {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "Dimmed")
-	ret0, _ := ret[0].(bool)
+	ret0, _ := ret[0].(*bool)
 	return ret0
 }
 

assets/js/types/evcc.ts

@@ -42,8 +42,8 @@ export interface HemsConfig {
 }
 
 export interface HemsStatus {
-  dimmed: boolean;
-  curtailed: boolean;
+  dimmed?: boolean;
+  curtailed?: boolean;
   maxConsumptionPower?: number;
   maxProductionPower?: number;
 }

assets/js/views/Config.vue

@@ -805,7 +805,7 @@ export default defineComponent({
 					value: status.maxConsumptionPower,
 					warning: true,
 				};
-			} else {
+			} else if (status.dimmed !== undefined) {
 				result["dimmed"] = { value: status.dimmed };
 			}
 			if (status.curtailed && status.maxProductionPower !== undefined) {
@@ -813,7 +813,7 @@ export default defineComponent({
 					value: status.maxProductionPower,
 					warning: true,
 				};
-			} else {
+			} else if (status.curtailed !== undefined) {
 				result["curtailed"] = { value: status.curtailed };
 			}
 

cmd/root.go

@@ -350,8 +350,8 @@ func runRoot(cmd *cobra.Command, args []string) {
 					Config:     conf.HEMS.Redacted(),
 					YamlSource: yamlSource.hems,
 					Status: struct {
-						Dimmed              bool     `json:"dimmed"`
-						Curtailed           bool     `json:"curtailed"`
+						Dimmed              *bool    `json:"dimmed,omitempty"`
+						Curtailed           *bool    `json:"curtailed,omitempty"`
 						MaxConsumptionPower float64  `json:"maxConsumptionPower,omitempty"`
 						MaxProductionPower  *float64 `json:"maxProductionPower,omitempty"`
 					}{

core/helper.go

@@ -83,7 +83,7 @@ func hemsDimmed(hems api.HEMS) *bool {
 		return nil
 	}
 
-	return new(hems.Dimmed())
+	return hems.Dimmed()
 }
 
 // hemsCurtailed returns the HEMS curtail status, nil-safe
@@ -92,5 +92,5 @@ func hemsCurtailed(hems api.HEMS) *bool {
 		return nil
 	}
 
-	return new(hems.Curtailed())
+	return hems.Curtailed()
 }

hems/eebus/eebus.go

@@ -294,17 +294,17 @@ func (c *EEBus) setProductionLimit(limit float64, active bool) {
 var _ api.HEMS = (*EEBus)(nil)
 
 // Dimmed implements api.HEMS, derived from consumptionLimitActivated.
-func (c *EEBus) Dimmed() bool {
+func (c *EEBus) Dimmed() *bool {
 	c.mux.RLock()
 	defer c.mux.RUnlock()
-	return !c.consumptionLimitActivated.IsZero()
+	return new(!c.consumptionLimitActivated.IsZero())
 }
 
 // Curtailed implements api.HEMS, derived from productionLimitActivated.
-func (c *EEBus) Curtailed() bool {
+func (c *EEBus) Curtailed() *bool {
 	c.mux.RLock()
 	defer c.mux.RUnlock()
-	return !c.productionLimitActivated.IsZero()
+	return new(!c.productionLimitActivated.IsZero())
 }
 
 // MaxConsumptionPower implements api.HEMS, returning the consumption cap

hems/eebus/eebus_test.go

@@ -49,14 +49,14 @@ func newTestEEBus(t *testing.T) *EEBus {
 // assertConsumptionLimit checks the HEMS consumption state through the api.HEMS surface.
 func assertConsumptionLimit(t *testing.T, c *EEBus, limit float64) {
 	t.Helper()
-	assert.Equal(t, limit > 0, c.Dimmed())
+	assert.Equal(t, new(limit > 0), c.Dimmed())
 	assert.Equal(t, limit, c.MaxConsumptionPower())
 }
 
 // assertProductionLimit checks the HEMS production state through the api.HEMS surface.
 func assertProductionLimit(t *testing.T, c *EEBus, active bool) {
 	t.Helper()
-	assert.Equal(t, active, c.Curtailed())
+	assert.Equal(t, new(active), c.Curtailed())
 }
 
 // TestRun_HeartbeatLost_EntersFailsafe verifies the LPC-911/LPP-911 transition:

hems/fnn/fnn.go

@@ -223,25 +223,25 @@ func (c *Fnn) setConsumptionLimit(limit float64) error {
 var _ api.HEMS = (*Fnn)(nil)
 
 // Dimmed implements api.HEMS.
-func (c *Fnn) Dimmed() bool {
+func (c *Fnn) Dimmed() *bool {
 	if c.w4 == nil {
-		return false
+		return nil
 	}
 
 	c.mu.Lock()
 	defer c.mu.Unlock()
-	return c.consumptionLimit > 0
+	return new(c.consumptionLimit > 0)
 }
 
 // Curtailed implements api.HEMS.
-func (c *Fnn) Curtailed() bool {
+func (c *Fnn) Curtailed() *bool {
 	if c.w3 == nil {
-		return false
+		return nil
 	}
 
 	c.mu.Lock()
 	defer c.mu.Unlock()
-	return c.productionLimit != nil
+	return new(c.productionLimit != nil)
 }
 
 // MaxConsumptionPower implements api.HEMS.

hems/relay/relay.go

@@ -137,15 +137,16 @@ func (c *Relay) setConsumptionLimit(limit float64) error {
 var _ api.HEMS = (*Relay)(nil)
 
 // Dimmed implements api.HEMS, derived from the active consumption limit.
-func (c *Relay) Dimmed() bool {
+func (c *Relay) Dimmed() *bool {
 	c.mu.Lock()
 	defer c.mu.Unlock()
-	return c.limit != nil
+	return new(c.limit != nil)
 }
 
-// Curtailed implements api.HEMS. Relay does not curtail production.
-func (c *Relay) Curtailed() bool {
-	return false
+// Curtailed implements api.HEMS. Relay does not curtail production and
+// hence makes no statement.
+func (c *Relay) Curtailed() *bool {
+	return nil
 }
 
 // MaxConsumptionPower implements api.HEMS, returning the active wattage cap.