From 38e86fe73dfd3b639f62f78eba5494e740e38086 Mon Sep 17 00:00:00 2001
From: Marcel Goerentz <57457529+marcelGoerentz@users.noreply.github.com>
Date: Tue, 16 Dec 2025 08:33:46 +0100
Subject: [PATCH] Vehicles: add maximum power, improves planner (#25303)

Signed-off-by: Marcel Goerentz <m.goerentz@t-online.de>
Co-authored-by: Michael Geers <michael@geers.tv>
---
 api/actionconfig.go                          |  5 ++++
 assets/js/components/Config/VehicleModal.vue | 25 +++++++++++++++++++-
 core/loadpoint_effective.go                  |  5 ++++
 core/site_vehicles.go                        |  2 ++
 i18n/de.json                                 |  2 ++
 i18n/en.json                                 |  2 ++
 util/templates/defaults.yaml                 | 13 ++++++++++
 util/templates/includes/vehicle-common.tpl   |  5 +++-
 8 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/api/actionconfig.go b/api/actionconfig.go
index f48742ce7..654908de4 100644
--- a/api/actionconfig.go
+++ b/api/actionconfig.go
@@ -13,6 +13,7 @@ type ActionConfig struct {
 	Priority   int        `mapstructure:"priority,omitempty"`   // Priority
 	MinCurrent float64    `mapstructure:"minCurrent,omitempty"` // Minimum Current
 	MaxCurrent float64    `mapstructure:"maxCurrent,omitempty"` // Maximum Current
+	MaxPower   float64    `mapstructure:"maxPower,omitempty"`   // Maximum Charging Power
 }
 
 // String implements Stringer and returns the ActionConfig as comma-separated key:value string
@@ -38,6 +39,10 @@ func (a ActionConfig) GetMaxCurrent() (float64, bool) {
 	return a.MaxCurrent, a.MaxCurrent > 0
 }
 
+func (a ActionConfig) GetMaxPower() (float64, bool) {
+	return a.MaxPower, a.MaxPower > 0
+}
+
 func (a ActionConfig) GetPriority() (int, bool) {
 	return a.Priority, a.Priority > 0
 }
diff --git a/assets/js/components/Config/VehicleModal.vue b/assets/js/components/Config/VehicleModal.vue
index 6336317fe..3e9af7905 100644
--- a/assets/js/components/Config/VehicleModal.vue
+++ b/assets/js/components/Config/VehicleModal.vue
@@ -97,6 +97,21 @@
 				</FormRow>
 			</div>
 
+			<FormRow
+				id="vehicleParamMaxPower"
+				:label="$t('config.vehicle.maximumPower')"
+				:help="$t('config.vehicle.maximumPowerHelp')"
+			>
+				<PropertyField
+					id="vehicleParamMaxPower"
+					v-model="values.maxPower"
+					type="Float"
+					unit="W"
+					size="w-25 w-min-200"
+					class="me-2"
+				/>
+			</FormRow>
+
 			<FormRow
 				id="vehicleParamPriority"
 				:label="$t('config.vehicle.priority')"
@@ -149,7 +164,15 @@ const initialValues = {
 	yaml: undefined,
 	template: null,
 };
-const CUSTOM_FIELDS = ["minCurrent", "maxCurrent", "priority", "identifiers", "phases", "mode"];
+const CUSTOM_FIELDS = [
+	"minCurrent",
+	"maxCurrent",
+	"maxPower",
+	"priority",
+	"identifiers",
+	"phases",
+	"mode",
+];
 
 export default defineComponent({
 	name: "VehicleModal",
diff --git a/core/loadpoint_effective.go b/core/loadpoint_effective.go
index 10a3a92ee..010454b84 100644
--- a/core/loadpoint_effective.go
+++ b/core/loadpoint_effective.go
@@ -232,5 +232,10 @@ func (lp *Loadpoint) EffectiveMaxPower() float64 {
 
 // effectiveMaxPower returns the effective max power taking vehicle capabilities and phase scaling into account
 func (lp *Loadpoint) effectiveMaxPower() float64 {
+	if lp.vehicle != nil {
+		if maxPower, ok := lp.vehicle.OnIdentified().GetMaxPower(); ok {
+			return maxPower
+		}
+	}
 	return Voltage * lp.effectiveMaxCurrent() * float64(lp.maxActivePhases())
 }
diff --git a/core/site_vehicles.go b/core/site_vehicles.go
index a2e88fda8..043a669f4 100644
--- a/core/site_vehicles.go
+++ b/core/site_vehicles.go
@@ -27,6 +27,7 @@ type vehicleStruct struct {
 	LimitSoc       int                 `json:"limitSoc,omitempty"`
 	MinCurrent     float64             `json:"minCurrent,omitempty"`
 	MaxCurrent     float64             `json:"maxCurrent,omitempty"`
+	MaxPower       float64             `json:"maxPower,omitempty"`
 	Priority       int                 `json:"priority,omitempty"`
 	Features       []string            `json:"features,omitempty"`
 	Plan           *planStruct         `json:"plan,omitempty"`
@@ -60,6 +61,7 @@ func (site *Site) publishVehicles() {
 			LimitSoc:       v.GetLimitSoc(),
 			MinCurrent:     ac.MinCurrent,
 			MaxCurrent:     ac.MaxCurrent,
+			MaxPower:       ac.MaxPower,
 			Priority:       ac.Priority,
 			Features:       lo.Map(instance.Features(), func(f api.Feature, _ int) string { return f.String() }),
 			Plan:           plan,
diff --git a/i18n/de.json b/i18n/de.json
index 0c62bc8c2..e44d4eb91 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -640,6 +640,8 @@
       "maximumCurrentHelp": "Muss größer als der minimale Strom sein.",
       "maximumPhases": "Maximale Phasen",
       "maximumPhasesHelp": "Mit wie vielen Phasen kann dieses Fahrzeug laden? Wird zur Berechnung der Mindestladeleistung und im Planer verwendet.",
+      "maximumPower": "Maximale Ladeleistung",
+      "maximumPowerHelp": "Maximale Leistung die das Fahrzeug beziehen kann.",
       "minimumCurrent": "Minimaler Strom",
       "minimumCurrentHelp": "Nur unter 6A, wenn du weißt, was du tust.",
       "online": "Fahrzeuge mit Schnittstelle",
diff --git a/i18n/en.json b/i18n/en.json
index f91ee5c6b..72fde60b1 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -640,6 +640,8 @@
       "maximumCurrentHelp": "Must be greater than minimum current.",
       "maximumPhases": "Maximum phases",
       "maximumPhasesHelp": "How many phases can this vehicle charge with? Used to calculate required minimum solar surplus and plan duration.",
+      "maximumPower": "Maximum charging power",
+      "maximumPowerHelp": "Maximum power the vehicle can consume",
       "minimumCurrent": "Minimum current",
       "minimumCurrentHelp": "Only go below 6A if you know what you're doing.",
       "online": "Vehicles with online API",
diff --git a/util/templates/defaults.yaml b/util/templates/defaults.yaml
index 1fd32dd37..ecb56ee98 100644
--- a/util/templates/defaults.yaml
+++ b/util/templates/defaults.yaml
@@ -166,6 +166,15 @@ params:
       en: The maximum amperage per connected phase that can be used
     example: 16
     type: int
+  - name: maxpower
+    unit: W
+    description:
+      de: Maximale Ladeleistung des Fahrzeugs
+      en: Maximum vehicle charging power
+    help:
+      de: Definiert die maximale Ladeleistung des Fahrzeugs. Hilft, die Ladeplanung zu verbessern, wenn das Fahrzeug üblicherweise weniger Strom nutzt als angeboten oder höhere Ströme bei einphasigem Laden erlaubt als bei dreiphasigem. Der bereitgestellte Strom des Ladepunktes wird nicht beeinflusst.
+      en: Defines the maximum charging power of the vehicle. Helps improve charge plan accuracy when the vehicle typically uses less than the offered current or supports higher single-phase current compared to three-phase. The offered current of the loadpoint is not affected.
+    type: int
   - name: identifiers
     description:
       de: Identifikation
@@ -469,6 +478,8 @@ presets:
       advanced: true
     - name: maxCurrent
       advanced: true
+    - name: maxPower
+      advanced: true
     - name: identifiers
       advanced: true
     - name: priority
@@ -490,6 +501,8 @@ presets:
       advanced: true
     - name: maxCurrent
       advanced: true
+    - name: maxPower
+      advanced: true
     - name: identifiers
       advanced: true
     - name: priority
diff --git a/util/templates/includes/vehicle-common.tpl b/util/templates/includes/vehicle-common.tpl
index e5158ee5c..bad12e6e5 100644
--- a/util/templates/includes/vehicle-common.tpl
+++ b/util/templates/includes/vehicle-common.tpl
@@ -12,7 +12,7 @@ capacity: {{ .capacity }}
 phases: {{ .phases }}
 {{- end }}
 
-{{- if or .mode .minCurrent .maxCurrent .priority }}
+{{- if or .mode .minCurrent .maxCurrent .maxPower .priority }}
 onIdentify:
 {{- if .mode }}
   mode: {{ .mode }}
@@ -23,6 +23,9 @@ onIdentify:
 {{- if .maxCurrent }}
   maxCurrent: {{ .maxCurrent }}
 {{- end }}
+{{- if .maxPower }}
+  maxPower: {{ .maxPower }}
+{{- end }}
 {{- if .priority }}
   priority: {{ .priority }}
 {{- end }}