BenderCC: add soc (ISO 15118) (#14360)

charger/bender.go

@@ -54,6 +54,7 @@ const (
 	bendRegChargedEnergy          = 716  // Sum of charged energy for the current session (Wh)
 	bendRegChargingDuration       = 718  // Duration since beginning of charge (Seconds)
 	bendRegUserID                 = 720  // User ID (OCPP IdTag) from the current session. Bytes 0 to 19.
+	bendRegEVBatteryState         = 730  // EV Battery State (% 0-100)
 	bendRegEVCCID                 = 741  // ASCII representation of the Hex. Values corresponding to the EVCCID. Bytes 0 to 11.
 	bendRegHemsCurrentLimit       = 1000 // Current limit of the HEMS module (A)
 
@@ -81,7 +82,7 @@ func NewBenderCCFromConfig(other map[string]interface{}) (api.Charger, error) {
 	return NewBenderCC(cc.URI, cc.ID)
 }
 
-//go:generate go run ../cmd/tools/decorate.go -f decorateBenderCC -b *BenderCC -r api.Charger -t "api.Meter,CurrentPower,func() (float64, error)" -t "api.PhaseCurrents,Currents,func() (float64, float64, float64, error)" -t "api.PhaseVoltages,Voltages,func() (float64, float64, float64, error)" -t "api.ChargeRater,ChargedEnergy,func() (float64, error)" -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.Identifier,Identify,func() (string, error)"
+//go:generate go run ../cmd/tools/decorate.go -f decorateBenderCC -b *BenderCC -r api.Charger -t "api.Meter,CurrentPower,func() (float64, error)" -t "api.PhaseCurrents,Currents,func() (float64, float64, float64, error)" -t "api.PhaseVoltages,Voltages,func() (float64, float64, float64, error)" -t "api.ChargeRater,ChargedEnergy,func() (float64, error)" -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.Battery,Soc,func() (float64, error)" -t "api.Identifier,Identify,func() (string, error)"
 
 // NewBenderCC creates BenderCC charger
 func NewBenderCC(uri string, id uint8) (api.Charger, error) {
@@ -113,6 +114,7 @@ func NewBenderCC(uri string, id uint8) (api.Charger, error) {
 		voltages      func() (float64, float64, float64, error)
 		chargedEnergy func() (float64, error)
 		totalEnergy   func() (float64, error)
+		soc           func() (float64, error)
 		identify      func() (string, error)
 	)
 
@@ -132,6 +134,12 @@ func NewBenderCC(uri string, id uint8) (api.Charger, error) {
 		if b, err := wb.conn.ReadHoldingRegisters(bendRegVoltages, 2); err == nil && binary.BigEndian.Uint32(b) > 0 {
 			voltages = wb.voltages
 		}
+
+		if !wb.legacy {
+			if _, err := wb.conn.ReadHoldingRegisters(bendRegEVBatteryState, 1); err == nil {
+				soc = wb.soc
+			}
+		}
 	}
 
 	// check rfid
@@ -139,7 +147,7 @@ func NewBenderCC(uri string, id uint8) (api.Charger, error) {
 		identify = wb.identify
 	}
 
-	return decorateBenderCC(wb, currentPower, currents, voltages, chargedEnergy, totalEnergy, identify), nil
+	return decorateBenderCC(wb, currentPower, currents, voltages, chargedEnergy, totalEnergy, soc, identify), nil
 }
 
 // Status implements the api.Charger interface
@@ -311,6 +319,24 @@ func (wb *BenderCC) identify() (string, error) {
 	return bytesAsString(b), nil
 }
 
+// soc implements the api.Battery interface
+func (wb *BenderCC) soc() (float64, error) {
+	b, err := wb.conn.ReadHoldingRegisters(bendRegSmartVehicleDetected, 1)
+	if err != nil {
+		return 0, err
+	}
+
+	if binary.BigEndian.Uint16(b) == 1 {
+		b, err = wb.conn.ReadHoldingRegisters(bendRegEVBatteryState, 1)
+		if err != nil {
+			return 0, err
+		}
+		return float64(binary.BigEndian.Uint16(b)), nil
+	}
+
+	return 0, api.ErrNotAvailable
+}
+
 var _ api.Diagnosis = (*BenderCC)(nil)
 
 // Diagnose implements the api.Diagnosis interface