From 8ed608a1768d9d37ecd007ea7bf3e70e7e07eb4b Mon Sep 17 00:00:00 2001
From: Erik Jaegervall <erik.jaegervall@se.bosch.com>
Date: Tue, 2 May 2023 15:08:06 +0200
Subject: [PATCH] fix: Correct types in OBD specification

Signed-off-by: Erik Jaegervall <erik.jaegervall@se.bosch.com>
---
 spec/OBD/OBD.vspec | 40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/spec/OBD/OBD.vspec b/spec/OBD/OBD.vspec
index 02ae67558..2c12c8a09 100644
--- a/spec/OBD/OBD.vspec
+++ b/spec/OBD/OBD.vspec
@@ -1,4 +1,5 @@
 #
+# (C) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
 # (C) 2020 Robert Bosch GmbH
 # (C) 2018 Volvo Cars
 # (C) 2016 Jaguar Land Rover
@@ -33,9 +34,22 @@
 #
 
 PidsA:
-  datatype: uint32
-  type: sensor
-  description: PID 00 - Bit array of the supported pids 01 to 20
+  datatype: string[]
+  type: attribute
+  allowed: ["01","02","03","04","05","06","07","08","09","0A","0B","0C","0D","0E","0F","10","11","12","13","14","15","16","17","18","19","1A","1B","1C","1D","1E","1F","20"]
+  description: PID 00 - Array of the supported PIDs 01 to 20 in Hexadecimal.
+
+PidsB:
+  datatype: string[]
+  type: attribute
+  allowed: ["21","22","23","24","25","26","27","28","29","2A","2B","2C","2D","2E","2F","30","31","32","33","34","35","36","37","38","39","3A","3B","3C","3D","3E","3F","40"]
+  description: PID 20 - Array of the supported PIDs 21 to 40 in Hexadecimal.
+
+PidsC:
+  datatype: string[]
+  type: attribute
+  allowed: ["41","42","43","44","45","46","47","48","49","4A","4B","4C","4D","4E","4F","50","51","52","53","54","55","56","57","58","59","5A","5B","5C","5D","5E","5F","60"]
+  description: PID 40 - Array of the supported PIDs 41 to 60 in Hexadecimal.
 
 Status:
   type: branch
@@ -49,11 +63,11 @@ Status.IsMILOn:
 Status.DTCCount:
   datatype: uint8
   type: sensor
-  description: Number of sensor Trouble Codes (DTC)
+  description: Number of Diagnostic Trouble Codes (DTC)
 
 Status.IgnitionType:
   datatype: string
-  type: sensor
+  type: attribute
   allowed: ['SPARK', 'COMPRESSION']
   description: Type of the ignition for ICE - spark = spark plug ignition, compression = self-igniting (Diesel engines)
 
@@ -211,11 +225,6 @@ RunTime:
   unit: s
   description: PID 1F - Engine run time
 
-PidsB:
-  datatype: uint32
-  type: sensor
-  description: PID 20 - Bit array of the supported pids 21 to 40
-
 DistanceWithMIL:
   datatype: float
   type: sensor
@@ -340,11 +349,6 @@ Catalyst.Bank2.Temperature2:
   unit: celsius
   description: PID 3F - Catalyst temperature from bank 2, sensor 2
 
-PidsC:
-  datatype: uint32
-  type: sensor
-  description: PID 40 - Bit array of the supported pids 41 to 60
-
 DriveCycleStatus:
   type: branch
   description: PID 41 - OBD status for the current drive cycle
@@ -450,8 +454,10 @@ MaxMAF:
   description: PID 50 - Maximum flow for mass air flow sensor
 
 FuelType:
-  datatype: string
-  type: sensor
+  datatype: uint8
+  type: attribute
+  min: 0
+  max: 23
   description: PID 51 - Fuel type
 
 EthanolPercent: