add more energy consumption and efficiency related properties

Author: doofyus

capabilities/charging.yml

@@ -1412,3 +1412,16 @@ properties:
       - data_component: '3feccccccccccccd'
         value: 0.9
         description: State of health of the high-voltage battery is 90%.
+
+  - id: 0x51
+    name: distance_since_charging
+    name_cased: distanceSinceCharging
+    name_pretty: Distance since charging
+    type: unit.length
+    size: 10
+    description: The distance driven since the last charging session
+    examples:
+      - data_component: '12044028cccccccccccd'
+        value:
+          kilometers: 12.4
+        description: 12.4km driven since the last charging session

capabilities/diagnostics.yml

@@ -1009,16 +1009,3 @@ properties:
       - data_component: '3fe999999999999a'
         value: 0.8
         description: Secondary energy level is at 80%
-
-  - id: 0x3d
-    name: distance_since_charging
-    name_cased: distanceSinceCharging
-    name_pretty: Distance since charging
-    type: unit.length
-    size: 10
-    description: The distance driven since the last charging session
-    examples:
-      - data_component: '12044028cccccccccccd'
-        value:
-          kilometers: 12.4
-        description: 12.4km driven since the last charging session

capabilities/maintenance.yml

@@ -505,3 +505,44 @@ properties:
           due: 'almost'
           reason: 'distance_driven'
         description: Service is almost due because of distance driven.
+
+  - id: 0x26
+    name: last_service_date
+    name_cased: lastServiceDate
+    name_pretty: Last service date
+    added: 0x0d
+    type: timestamp
+    size: 8
+    description: Date of the last service performed on the vehicle.
+    examples:
+      - data_component: '0000017fe45286dd'
+        value: '2022-04-01T08:51:28.093Z'
+        description: Last service was on 1. April 2022 at 11:51:28 EEST.
+
+  - id: 0x27
+    name: last_service_distance
+    name_cased: lastServiceDistance
+    name_pretty: Last service distance
+    added: 0x0d
+    type: unit.length
+    size: 10
+    description: Distance reading at the time of the last service.
+    examples:
+      - data_component: '120440f7590000000000'
+        value:
+          kilometers: 95632.0
+        description: Distance reading at last service was 95'632km.
+
+  - id: 0x28
+    name: next_inspection_distance
+    name_cased: nextInspectionDistance
+    name_pretty: Next inspection distance
+    added: 0x0d
+    type: unit.length
+    size: 10
+    description: Distance reading at which the next inspection is due.
+    examples:
+      - data_component: '120440e86a0000000000'
+        value:
+          kilometers: 50000.0
+        description: Next inspection is due at 50'000km.

capabilities/trips.yml

@@ -449,3 +449,17 @@ properties:
         value:
           minutes: 123.0
         description: Duration of trip was 123.0 minutes.
+
+  - id: 0x1a
+    name: average_electric_consumption
+    name_cased: averageElectricConsumption
+    name_pretty: Average electric consumption
+    added: 0x0d
+    type: unit.energy_efficiency
+    size: 10
+    description: Average electric consumption during the trip
+    examples:
+      - data_component: '0d00401d5c28f5c28f5c'
+        value:
+          kilometers_per_kwh: 7.34
+        description: Average electric consumption during the trip was 7.34 km/kWh.

capabilities/usage.yml

@@ -796,3 +796,17 @@ properties:
         value:
           kilometers_per_hour: 44.2
         description: Average speed was 44.2km/h since the last charging session.
+
+  - id: 0x36
+    name: fuel_consumption_rate_since_start
+    name_cased: fuelConsumptionRateSinceStart
+    name_pretty: Fuel consumption rate since start
+    added: 0x0c
+    type: unit.fuel_efficiency
+    size: 10
+    description: Liquid fuel consumption rate since start
+    examples:
+      - data_component: '0f00401599999999999a'
+        value:
+          liters_per_100_kilometers: 5.4
+        description: Consumed 5.4 L/100km since start

changelogs/L13.6_changelog.md

@@ -1,6 +1,6 @@
 # AutoAPI L13 Extensions #6 Changelog
 
-**Level 13** _6th extension_ (aka **L13.6**) contains only additive updates to the protocol.
+**Level 13** _6th extension_ (aka **L13.6**) contains mostly additive updates to the protocol.
 These include new properties for existing capabilities, additions to already existing enums, and new custom types.
 
 Changes from L13.5 are divided into these sub-sections:
@@ -18,25 +18,42 @@ Some enums have gained new values.
 - `charging.station_status` (added `initialising`, `fault`, `inactive`)
 - `dashboard_lights.dashboard_lights` (added `high_beam_left_failure`, `high_beam_right_failure`, `daytime_running_light_left_failure`, `daytime_running_light_right_failure`, `side_mark_lights_failure`, `licence_plate_light_failure`)
 
+There are also a few new units added to existing unit types:
+
+- `unit.energy_efficiency`
+	- `kilometers_per_kwh`
+	- `miles_per_gallon_equivalent`
+	- `miles_per_imperial_gallon_equivalent`
+
+- `unit.fuel_efficiency`
+	- `kilometers_per_liter`
+
 
 ## Properties
 
 New properties added to pre-existing capabilities:
 
-- _diagnostics_
+- _charging_
 	- `distance_since_charging`
 
 - _maintenance_
   - `service_warning`
+	- `last_service_date`
+	- `last_service_distance`
+	- `next_inspection_distance`
+
+- _trips_
+	- `average_electric_consumption`
 
 - _usage_
+	- `average_speed_since_charging`
 	- `energy_consumption_last_trip`
 	- `energy_consumption_since_reset`
 	- `energy_consumption_since_charging`
 	- `energy_consumption_percentages_last_trip`
 	- `energy_consumption_percentages_since_reset`
 	- `energy_consumption_percentages_since_charging`
-	- `average_speed_since_charging`
+	- `fuel_consumption_rate_since_start`
 
 ## Custom Types
 

misc/unit_types.yml

@@ -8,9 +8,7 @@
 # [0x04, 0x00, 0x02, measurement_type_id, unit_type_id]
 #
 
-
 measurement_types:
-
   - name: acceleration
     id: 0x01
     unit_types:
@@ -126,6 +124,15 @@ measurement_types:
       - name: miles_per_kwh
         id: 0x01
         conversion_inverse: 62.137119223733397
+      - name: kilometers_per_kwh
+        id: 0x02
+        conversion_inverse: 100.0
+      - name: miles_per_gallon_equivalent
+        id: 0x03
+        conversion_inverse: 2094.331603
+      - name: miles_per_imperial_gallon_equivalent
+        id: 0x04
+        conversion_inverse: 2515.187
 
   - name: frequency
     id: 0x0e
@@ -167,6 +174,9 @@ measurement_types:
       - name: miles_per_gallon
         id: 0x02
         conversion_inverse: 235.2145833
+      - name: kilometers_per_liter
+        id: 0x03
+        conversion_inverse: 100.0
 
   - name: illuminance
     id: 0x11