DriveSomethingGreater: more data points (#30762)

templates/definition/vehicle/audi.yaml

@@ -3,7 +3,7 @@ covers: ["etron"]
 products:
   - brand: Audi
     description:
-      generic: myAudi
+      generic: EU Data Act
 params:
   - preset: vehicle-base
   - name: vin
@@ -13,4 +13,4 @@ render: |
   type: drivesomethinggreater
   brand: Audi
   {{ include "vehicle-base" . }}
-  {{ include "vehicle-features" . }}
+  {{ include "vehicle-features" (merge (dict "basefeatures" (list "streaming")) .) }}

templates/definition/vehicle/drivesomethinggreater.yaml

@@ -1,4 +1,5 @@
 template: drivesomethinggreater
+deprecated: true
 products:
   - brand: Volkswagen
     description:
@@ -50,4 +51,4 @@ render: |
   type: drivesomethinggreater
   brand: {{ .brand }}
   {{ include "vehicle-base" . }}
-  {{ include "vehicle-features" . }}
+  {{ include "vehicle-features" (merge (dict "basefeatures" (list "streaming")) .) }}

templates/definition/vehicle/iso15118.yaml

@@ -21,7 +21,7 @@ params:
   - preset: vehicle-climater
 render: |
   type: custom
-  {{- include "vehicle-common" . }}
+  {{ include "vehicle-common" . }}
   {{ include "vehicle-features" (merge (dict "basefeatures" (list "offline")) .) }}
   soc:
     source: const

templates/definition/vehicle/seat-cupra.yaml

@@ -1,8 +1,8 @@
 template: cupra
 products:
-  - brand: Seat
+  - brand: Cupra
     description:
-      generic: CUPRA Connect Gen4 (Born, Formentor, Tavascan)
+      generic: EU Data Act
 params:
   - preset: vehicle-base
   - preset: vehicle-features
@@ -10,4 +10,4 @@ render: |
   type: drivesomethinggreater
   brand: Cupra
   {{ include "vehicle-base" . }}
-  {{ include "vehicle-features" . }}
+  {{ include "vehicle-features" (merge (dict "basefeatures" (list "streaming")) .) }}

templates/definition/vehicle/vw.yaml

@@ -3,7 +3,7 @@ covers: ["id"]
 products:
   - brand: Volkswagen
     description:
-      generic: We Connect ID
+      generic: EU Data Act
 requirements:
   description:
     de: e-Golf, e-Up, ID Familie
@@ -19,4 +19,4 @@ render: |
   type: drivesomethinggreater
   brand: Volkswagen
   {{ include "vehicle-base" . }}
-  {{ include "vehicle-features" . }}
+  {{ include "vehicle-features" (merge (dict "basefeatures" (list "streaming")) .) }}

vehicle/vw/eudataact/provider.go

@@ -148,7 +148,7 @@ func (v *Provider) Status() (api.ChargeStatus, error) {
 		return status, err
 	}
 
-	if p := lookup(data, FieldPlugState); p != nil && strings.EqualFold(p.Value, "connected") {
+	if p := lookup(data, FieldPlugState, FieldChargingPlug1ConnectionState); p != nil && strings.EqualFold(p.Value, "connected") {
 		status = api.StatusB
 	}
 

vehicle/vw/eudataact/types.go

@@ -102,20 +102,32 @@ type datasetFile struct {
 
 // data field names as delivered in the dataset (see lib/euDataActDictionary.json)
 const (
+	// status
+	FieldChargingState                = "charging_state"
+	FieldChargingPlug1ConnectionState = "charging_plug1_connectionstate"
+	FieldCurrentChargeState           = "charging_state_report.current_charge_state"
+	FieldPlugState                    = "plug_state"
+
+	// soc
 	FieldBatteryStateReportSoc = "battery_state_report.soc"
 	FieldSoc                   = "state_of_charge"
 	FieldHvSoc                 = "hv_soc"
 	FieldHvBatteryLevel        = "battery_level_HV.value"
-	FieldRangeCombined         = "cruising_range_combined"
-	FieldRangePrimary          = "cruising_range_primary_engine"
-	FieldRangeSecondary        = "cruising_range_secondary_engine"
-	FieldOdometer              = "mileage"
-	FieldOdometerValue         = "mileage.value"
-	FieldChargingState         = "charging_state"
-	FieldCurrentChargeState    = "charging_state_report.current_charge_state"
-	FieldPlugState             = "plug_state"
-	FieldTargetSoc             = "settings.target_soc"
-	FieldRemainingTime         = "remaining_charging_time"
+
+	// target soc
+	FieldTargetSoc = "settings.target_soc"
+
+	// range
+	FieldRangeCombined  = "cruising_range_combined"
+	FieldRangePrimary   = "cruising_range_primary_engine"
+	FieldRangeSecondary = "cruising_range_secondary_engine"
+
+	// odo
+	FieldOdometer      = "mileage"
+	FieldOdometerValue = "mileage.value"
+
+	// time
+	FieldRemainingTime = "remaining_charging_time"
 )
 
 // contentDatasets returns the datasets that actually carry content, with their