Skip to content

Commit 6bddfe6

Browse files
DerAndereAndiDerAndereAndi
committed
Merge branch 'release/v0.6.2'
2 parents 105fc17 + 3a63976 commit 6bddfe6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+904
-327
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# eebus-go
22

3-
[![Build Status](https://github.com/enbility/eebus-go/actions/workflows/default.yml/badge.svg?branch=main)](https://github.com/enbility/eebus-go/actions/workflows/default.yml/badge.svg?branch=main)
3+
[![Build Status](https://github.com/enbility/eebus-go/actions/workflows/default.yml/badge.svg?branch=master)](https://github.com/enbility/eebus-go/actions/workflows/default.yml/badge.svg?branch=master)
44
[![GoDoc](https://img.shields.io/badge/godoc-reference-5272B4)](https://godoc.org/github.com/enbility/eebus-go)
5-
[![Coverage Status](https://coveralls.io/repos/github/enbility/eebus-go/badge.svg?branch=main)](https://coveralls.io/github/enbility/eebus-go?branch=main)
5+
[![Coverage Status](https://coveralls.io/repos/github/enbility/eebus-go/badge.svg?branch=master)](https://coveralls.io/github/enbility/eebus-go?branch=master)
66
[![Go report](https://goreportcard.com/badge/github.com/enbility/eebus-go)](https://goreportcard.com/report/github.com/enbility/eebus-go)
77
[![CodeFactor](https://www.codefactor.io/repository/github/enbility/eebus-go/badge)](https://www.codefactor.io/repository/github/enbility/eebus-go)
88

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ module github.com/enbility/eebus-go
33
go 1.21.1
44

55
require (
6-
github.com/enbility/ship-go v0.5.2
7-
github.com/enbility/spine-go v0.6.1
6+
github.com/enbility/ship-go v0.5.3
7+
github.com/enbility/spine-go v0.6.2
88
github.com/stretchr/testify v1.9.0
99
)
1010

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ github.com/ahmetb/go-linq/v3 v3.2.0 h1:BEuMfp+b59io8g5wYzNoFe9pWPalRklhlhbiU3hYZ
22
github.com/ahmetb/go-linq/v3 v3.2.0/go.mod h1:haQ3JfOeWK8HpVxMtHHEMPVgBKiYyQ+f1/kLZh/cj9U=
33
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
44
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
5-
github.com/enbility/ship-go v0.5.2 h1:T9+YuP5ZpofKd463PLKq78fAaPAcGMnRAcv8c8aD5yU=
6-
github.com/enbility/ship-go v0.5.2/go.mod h1:jewJWYQ10jNhsnhS1C4jESx3CNmDa5HNWZjBhkTug5Y=
7-
github.com/enbility/spine-go v0.6.1 h1:6NAPE7PmCQsmfiZy/dLpnFZXEw8RK9H4USGniIw9r+Q=
8-
github.com/enbility/spine-go v0.6.1/go.mod h1:pRGS+C5rZ5rhxTAA1whU8fC9p7lH5ixyut++yEZe470=
5+
github.com/enbility/ship-go v0.5.3 h1:P8eA/WDz3hq18zEKzqCB697OA1sVFiZkTF51Cx4tyGU=
6+
github.com/enbility/ship-go v0.5.3/go.mod h1:jewJWYQ10jNhsnhS1C4jESx3CNmDa5HNWZjBhkTug5Y=
7+
github.com/enbility/spine-go v0.6.2 h1:uxEUGLcaaA3PzkaTYTe4Ic64PElFlMQcfcES0O4Dk1c=
8+
github.com/enbility/spine-go v0.6.2/go.mod h1:6AbRXzd0fLVGFJdT60YQACe1WskwdjiznCfljQ+Ud6s=
99
github.com/enbility/zeroconf/v2 v2.0.0-20240210101930-d0004078577b h1:sg3c6LJ4eWffwtt9SW0lgcIX4Oh274vwdJnNFNNrDco=
1010
github.com/enbility/zeroconf/v2 v2.0.0-20240210101930-d0004078577b/go.mod h1:BjzRRiYX6mWdOgku1xxDE+NsV8PijTby7Q7BkYVdfDU=
1111
github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=

‎usecases/api/cs_lpc.go‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,18 @@ type CsLPCInterface interface {
8181

8282
// Scenario 4
8383

84-
// return nominal maximum active (real) power the Controllable System is
85-
// allowed to consume due to the customer's contract.
86-
ContractualConsumptionNominalMax() (float64, error)
84+
// return nominal maximum active (real) power the Controllable System is allowed to consume.
85+
//
86+
// If the local device type is an EnergyManagementSystem, the contractual consumption
87+
// nominal max is returned, otherwise the power consumption nominal max is returned.
88+
ConsumptionNominalMax() (float64, error)
8789

88-
// set nominal maximum active (real) power the Controllable System is
89-
// allowed to consume due to the customer's contract.
90+
// set power nominal maximum active (real) power the Controllable System is allowed to consume.
91+
//
92+
// If the local device type is an EnergyManagementSystem, the contractual consumption
93+
// nominal max is set, otherwise the power consumption nominal max is set.
9094
//
9195
// parameters:
92-
// - value: contractual nominal max power consumption in W
93-
SetContractualConsumptionNominalMax(value float64) (resultErr error)
96+
// - value: nominal max power consumption in W
97+
SetConsumptionNominalMax(value float64) (resultErr error)
9498
}

‎usecases/api/cs_lpp.go‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,18 @@ type CsLPPInterface interface {
8181

8282
// Scenario 4
8383

84-
// return nominal maximum active (real) power the Controllable System is
85-
// allowed to produce due to the customer's contract.
86-
ContractualProductionNominalMax() (float64, error)
84+
// return nominal maximum active (real) power the Controllable System is allowed to produce.
85+
//
86+
// If the local device type is an EnergyManagementSystem, the contractual production
87+
// nominal max is returned, otherwise the power production nominal max is returned.
88+
ProductionNominalMax() (float64, error)
8789

88-
// set nominal maximum active (real) power the Controllable System is
89-
// allowed to produce due to the customer's contract.
90+
// set power nominal maximum active (real) power the Controllable System is allowed to produce.
91+
//
92+
// If the local device type is an EnergyManagementSystem, the contractual production
93+
// nominal max is set, otherwise the power production nominal max is set.
9094
//
9195
// parameters:
92-
// - value: contractual nominal max power production in W
93-
SetContractualProductionNominalMax(value float64) (resultErr error)
96+
// - value: nominal max power production in W
97+
SetProductionNominalMax(value float64) (resultErr error)
9498
}

‎usecases/api/eg_lpc.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@ type EgLPCInterface interface {
8383
// Scenario 4
8484

8585
// return nominal maximum active (real) power the Controllable System is
86-
// able to consume according to the device label or data sheet.
86+
// able to consume according to the contract (EMS), device label or data sheet.
8787
//
8888
// parameters:
8989
// - entity: the entity of the e.g. EVSE
90-
PowerConsumptionNominalMax(entity spineapi.EntityRemoteInterface) (float64, error)
90+
ConsumptionNominalMax(entity spineapi.EntityRemoteInterface) (float64, error)
9191
}

‎usecases/api/eg_lpp.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@ type EgLPPInterface interface {
8383
// Scenario 4
8484

8585
// return nominal maximum active (real) power the Controllable System is
86-
// able to produce according to the device label or data sheet.
86+
// able to produce according to the contract (EMS), device label or data sheet.
8787
//
8888
// parameters:
8989
// - entity: the entity of the e.g. EVSE
90-
PowerProductionNominalMax(entity spineapi.EntityRemoteInterface) (float64, error)
90+
ProductionNominalMax(entity spineapi.EntityRemoteInterface) (float64, error)
9191
}

‎usecases/api/types.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ type LoadLimitsPhase struct {
2222
Phase model.ElectricalConnectionPhaseNameType // the phase
2323
IsChangeable bool // if the value can be changed via write, ignored when writing data
2424
IsActive bool // if the limit is active
25-
Value float64 // the limit in A
25+
Value float64 // the limit
2626
}
2727

2828
// Defines a limit data set
2929
type LoadLimit struct {
3030
Duration time.Duration // the duration of the limit,
3131
IsChangeable bool // if the value can be changed via write, ignored when writing data
3232
IsActive bool // if the limit is active
33-
Value float64 // the limit in A
33+
Value float64 // the limit
3434
}
3535

3636
// identification

‎usecases/cem/cevc/types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package cevc
33
import "github.com/enbility/eebus-go/api"
44

55
const (
6-
// Update of the list of remote entites supporting the Use Case
6+
// Update of the list of remote entities supporting the Use Case
77
//
88
// Use `RemoteEntities` to get the current data
99
UseCaseSupportUpdate api.EventType = "cem-cevc-UseCaseSupportUpdate"

‎usecases/cem/evcc/types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const (
1111
)
1212

1313
const (
14-
// Update of the list of remote entites supporting the Use Case
14+
// Update of the list of remote entities supporting the Use Case
1515
//
1616
// Use `RemoteEntities` to get the current data
1717
UseCaseSupportUpdate api.EventType = "cem-evcc-UseCaseSupportUpdate"

0 commit comments

Comments
 (0)