path: root/epan/dissectors/packet-obd-ii.c

/* packet-obd-ii.c
 * Routines for OBD-II PIDs dissection
 *
 * Based on https://en.wikipedia.org/wiki/OBD-II_PIDs
 *
 * Wireshark - Network traffic analyzer
 * By Gerald Combs <gerald@wireshark.org>
 * Copyright 1998 Gerald Combs
 *
 * SPDX-License-Identifier: GPL-2.0-or-later
 */

#include "config.h"

#include <epan/packet.h>
#include <epan/proto.h>
#include <epan/unit_strings.h>
#include <expert.h>

#include <wsutil/utf8_entities.h>

#include "packet-socketcan.h"
#include "packet-iso15765.h"

void proto_register_obdii(void);
void proto_reg_handoff_obdii(void);

static dissector_handle_t obdii_handle;

static int proto_obdii;

static int ett_obdii;

static int hf_obdii_mode;
static int hf_obdii_raw_value;

static int hf_obdii_mode01_pid;
static int hf_obdii_mode01_supported_pid;
static int hf_obdii_mode01_unsupported_pid;
static int hf_obdii_mode01_fuel_system1_status;
static int hf_obdii_mode01_fuel_system2_status;
static int hf_obdii_mode01_engine_load;
static int hf_obdii_mode01_engine_coolant_temp;
static int hf_obdii_mode01_short_term_fuel_bank1;
static int hf_obdii_mode01_long_term_fuel_bank1;
static int hf_obdii_mode01_short_term_fuel_bank2;
static int hf_obdii_mode01_long_term_fuel_bank2;
static int hf_obdii_mode01_fuel_pressure;
static int hf_obdii_mode01_engine_rpm;
static int hf_obdii_mode01_vehicle_speed;
static int hf_obdii_mode01_timing_advance;
static int hf_obdii_mode01_intake_air_temp;
static int hf_obdii_mode01_maf_air_flow_rate;
static int hf_obdii_mode01_throttle_position;
static int hf_obdii_mode01_secondary_air_status;
static int hf_obdii_mode01_obd_standards;
static int hf_obdii_mode01_engine_uptime;
static int hf_obdii_mode01_fuel_rail_pressure;
static int hf_obdii_mode01_fuel_rail_gauge_pressure;
static int hf_obdii_mode01_fuel_rail_absolute_pressure;
static int hf_obdii_mode01_commanded_egr;
static int hf_obdii_mode01_egr_error;
static int hf_obdii_mode01_commanded_evap_purge;
static int hf_obdii_mode01_fuel_tank_level_input;
static int hf_obdii_mode01_warm_ups;
static int hf_obdii_mode01_evap_system_vapor_pressure;
static int hf_obdii_mode01_absolute_barometric_pressure;
static int hf_obdii_mode01_intake_manifold_absolute_pressure;
static int hf_obdii_mode01_oxygen_sensor_id;
static int hf_obdii_mode01_oxygen_sensor_fuel_air_ratio;
static int hf_obdii_mode01_oxygen_sensor_voltage;
static int hf_obdii_mode01_oxygen_sensor_current;
static int hf_obdii_mode01_distance_traveled_with_mil;
static int hf_obdii_mode01_distance_traveled_since_code_clear;
static int hf_obdii_mode01_time_run_with_mil;
static int hf_obdii_mode01_time_since_trouble_code_clear;
static int hf_obdii_mode01_catalyst_temp_11;
static int hf_obdii_mode01_catalyst_temp_21;
static int hf_obdii_mode01_catalyst_temp_12;
static int hf_obdii_mode01_catalyst_temp_22;
static int hf_obdii_mode01_ambient_air_temp;
static int hf_obdii_mode01_absolute_throttle_position_B;
static int hf_obdii_mode01_absolute_throttle_position_C;
static int hf_obdii_mode01_accelerator_pedal_position_D;
static int hf_obdii_mode01_accelerator_pedal_position_E;
static int hf_obdii_mode01_accelerator_pedal_position_F;
static int hf_obdii_mode01_commanded_throttle_actuator;
static int hf_obdii_mode01_fuel_type;
static int hf_obdii_mode01_control_module_voltage;
static int hf_obdii_mode01_absolute_load_value;
static int hf_obdii_mode01_fuel_air_commanded_equiv_ratio;
static int hf_obdii_mode01_relative_throttle_position;
static int hf_obdii_mode01_ethanol_fuel;
static int hf_obdii_mode01_absolute_evap_system_vapor_pressure;
static int hf_obdii_mode01_relative_accelerator_pedal_position;
static int hf_obdii_mode01_hybrid_battery_remaining_life;
static int hf_obdii_mode01_engine_oil_temp;
static int hf_obdii_mode01_fuel_injection_timing;
static int hf_obdii_mode01_engine_fuel_rate;
static int hf_obdii_mode01_torque_driver_demand_engine;
static int hf_obdii_mode01_torque_actual_engine;
static int hf_obdii_mode01_torque_reference_engine;

static int hf_obdii_mode09_pid;
static int hf_obdii_mode09_supported_pid;
static int hf_obdii_mode09_unsupported_pid;

static int hf_obdii_vin;
static int hf_obdii_ecu_name;

static expert_field ei_obdii_padding;

/* OBD-II CAN IDs have three aspects.
   - IDs are either standard 11bit format (SFF) or extended 29bit format (EFF)
   - An ID can be a query ID or a response ID.
   - Response IDs fall into two ranges for both SFF and EFF formats

   SFF response IDs can vary in the lowest nibble as follows:
     two ranges: 0x7e0-0x7e7 and 0x7e8 - 0x7ef
   EFF response IDs can vary in the lowest byte or the second lowest byte as follows:
     0x18daXXf1 or 0x18daf1XX, where XX is in the range 0x00 - 0xff

   The following defines set up bit patterns and masks to determine both query and responses.
*/
#define ODBII_CAN_QUERY_ID_SFF               0x7DF
#define ODBII_CAN_RESPONSE_ID_LOWER_MIN_SFF  0x7E0
#define ODBII_CAN_RESPONSE_ID_UPPER_MIN_SFF  0x7E8
#define ODBII_CAN_RESPONSE_ID_LOWER_MASK_SFF 0x7
#define ODBII_CAN_RESPONSE_ID_UPPER_MASK_SFF 0x7

#define ODBII_CAN_QUERY_ID_EFF               0x18DB33F1
#define ODBII_CAN_RESPONSE_ID_LOWER_MIN_EFF  0x18DA00F1
#define ODBII_CAN_RESPONSE_ID_UPPER_MIN_EFF  0x18DAF100
#define ODBII_CAN_RESPONSE_ID_LOWER_MASK_EFF 0xFF00
#define ODBII_CAN_RESPONSE_ID_UPPER_MASK_EFF 0x00FF

#define OBDII_MODE_POS  0x00
#define OBDII_PID_POS   0x01
#define OBDII_VAL_OFF   0x02
#define OBDII_MODE07_DATA_OFF 0x01

#define OBDII_MODE01_PIDS_SUPPORT00         0x00
#define OBDII_MODE01_MONITOR_STATUS         0x01
#define OBDII_MODE01_FREEZE_DTC             0x02
#define OBDII_MODE01_FUEL_SYSTEM_STATUS     0x03
#define OBDII_MODE01_ENGINE_LOAD            0x04
#define OBDII_MODE01_ENGINE_COOLANT_TEMP    0x05
#define OBDII_MODE01_SHORT_TERM_FUEL_BANK1  0x06
#define OBDII_MODE01_LONG_TERM_FUEL_BANK1   0x07
#define OBDII_MODE01_SHORT_TERM_FUEL_BANK2  0x08
#define OBDII_MODE01_LONG_TERM_FUEL_BANK2   0x09
#define OBDII_MODE01_FUEL_PRESSURE          0x0A
#define OBDII_MODE01_INTAKE_MANIFOLD_ABSOLUTE_PRESSURE 0x0B
#define OBDII_MODE01_ENGINE_RPM             0x0C
#define OBDII_MODE01_VEHICLE_SPEED          0x0D
#define OBDII_MODE01_TIMING_ADVANCE         0x0E
#define OBDII_MODE01_INTAKE_AIR_TEMP        0x0F
#define OBDII_MODE01_MAF_AIR_FLOW_RATE      0x10
#define OBDII_MODE01_THROTTLE_POSITION      0x11
#define OBDII_MODE01_SECONDARY_AIR_STATUS   0x12
#define OBDII_MODE01_OXYGEN_SENSOR_PRESET2  0x13
#define OBDII_MODE01_OXYGEN_SENSOR1         0x14
#define OBDII_MODE01_OXYGEN_SENSOR2         0x15
#define OBDII_MODE01_OXYGEN_SENSOR3         0x16
#define OBDII_MODE01_OXYGEN_SENSOR4         0x17
#define OBDII_MODE01_OXYGEN_SENSOR5         0x18
#define OBDII_MODE01_OXYGEN_SENSOR6         0x19
#define OBDII_MODE01_OXYGEN_SENSOR7         0x1A
#define OBDII_MODE01_OXYGEN_SENSOR8         0x1B
#define OBDII_MODE01_OBD_STANDARDS          0x1C
#define OBDII_MODE01_OXYGEN_SENSOR_PRESET4  0x1D
#define OBDII_MODE01_AUX_INPUT_STATUS       0x1E
#define OBDII_MODE01_ENGINE_UPTIME          0x1F

#define OBDII_MODE01_PIDS_SUPPORT20             0x20
#define OBDII_MODE01_DISTANCE_TRAVELED_WITH_MIL 0x21
#define OBDII_MODE01_FUEL_RAIL_PRESSURE         0x22
#define OBDII_MODE01_FUEL_RAIL_GAUGE_PRESSURE   0x23
#define OBDII_MODE01_OXYGEN_SENSOR1_            0x24
#define OBDII_MODE01_OXYGEN_SENSOR2_            0x25
#define OBDII_MODE01_OXYGEN_SENSOR3_            0x26
#define OBDII_MODE01_OXYGEN_SENSOR4_            0x27
#define OBDII_MODE01_OXYGEN_SENSOR5_            0x28
#define OBDII_MODE01_OXYGEN_SENSOR6_            0x29
#define OBDII_MODE01_OXYGEN_SENSOR7_            0x2A
#define OBDII_MODE01_OXYGEN_SENSOR8_            0x2B
#define OBDII_MODE01_COMMANDED_EGR              0x2C
#define OBDII_MODE01_EGR_ERROR                  0x2D
#define OBDII_MODE01_COMMANDED_EVAP_PURGE       0x2E
#define OBDII_MODE01_FUEL_TANK_LEVEL            0x2F
#define OBDII_MODE01_WARM_UPS_SINCE_CLEAR       0x30
#define OBDII_MODE01_DISTANCE_TRAVELED_SINCE_CODES_CLEAR 0x31
#define OBDII_MODE01_EVAP_SYSTEM_VAPOR_PRESSURE   0x32
#define OBDII_MODE01_ABSOLUTE_BAROMETRIC_PRESSURE 0x33
#define OBDII_MODE01_OXYGEN_SENSOR1_A       0x34
#define OBDII_MODE01_OXYGEN_SENSOR2_A       0x35
#define OBDII_MODE01_OXYGEN_SENSOR3_A       0x36
#define OBDII_MODE01_OXYGEN_SENSOR4_A       0x37
#define OBDII_MODE01_OXYGEN_SENSOR5_A       0x38
#define OBDII_MODE01_OXYGEN_SENSOR6_A       0x39
#define OBDII_MODE01_OXYGEN_SENSOR7_A       0x3A
#define OBDII_MODE01_OXYGEN_SENSOR8_A       0x3B
#define OBDII_MODE01_CATALYST_TEMP11        0x3C
#define OBDII_MODE01_CATALYST_TEMP21        0x3D
#define OBDII_MODE01_CATALYST_TEMP12        0x3E
#define OBDII_MODE01_CATALYST_TEMP22        0x3F

#define OBDII_MODE01_PIDS_SUPPORT40                 0x40
#define OBDII_MODE01_CONTROL_MODULE_VOLTAGE         0x42
#define OBDII_MODE01_ABSOLUTE_LOAD_VALUE            0x43
#define OBDII_MODE01_FUEL_AIR_COMMANDED_EQUIV_RATIO 0x44
#define OBDII_MODE01_RELATIVE_THROTTLE_POSITION     0x45
#define OBDII_MODE01_AMBIENT_AIR_TEMP               0x46
#define OBDII_MODE01_ABSOLUTE_THROTTLE_POSITION_B   0x47
#define OBDII_MODE01_ABSOLUTE_THROTTLE_POSITION_C   0x48
#define OBDII_MODE01_ACCELERATOR_PEDAL_POSITION_D   0x49
#define OBDII_MODE01_ACCELERATOR_PEDAL_POSITION_E   0x4A
#define OBDII_MODE01_ACCELERATOR_PEDAL_POSITION_F   0x4B
#define OBDII_MODE01_COMMANDED_THROTTLE_ACTUATOR    0x4C
#define OBDII_MODE01_TIME_RUN_WITH_MIL              0x4D
#define OBDII_MODE01_TIME_SINCE_TROUBLE_CODES_CLEAR 0x4E
#define OBDII_MODE01_FUEL_TYPE                      0x51
#define OBDII_MODE01_ETHANOL_FUEL                   0x52
#define OBDII_MODE01_ABSOLUTE_EVAP_SYSTEM_VAPOR_PRESSURE 0x53
#define OBDII_MODE01_SHORT_TERM_OXYGEN_BANK13       0x55
#define OBDII_MODE01_LONG_TERM_OXYGEN_BANK13        0x56
#define OBDII_MODE01_SHORT_TERM_OXYGEN_BANK24       0x57
#define OBDII_MODE01_LONG_TERM_OXYGEN_BANK24        0x58
#define OBDII_MODE01_FUEL_RAIL_ABSOLUTE_PRESSURE    0x59
#define OBDII_MODE01_RELATIVE_ACCELERATOR_PEDAL_POSITION 0x5A
#define OBDII_MODE01_HYBRID_BATTERY_REMAINING_LIFE  0x5B
#define OBDII_MODE01_ENGINE_OIL_TEMP                0x5C
#define OBDII_MODE01_FUEL_INJECTION_TIMING          0x5D
#define OBDII_MODE01_ENGINE_FUEL_RATE               0x5E

#define OBDII_MODE01_PIDS_SUPPORT60              0x60
#define OBDII_MODE01_TORQUE_DRIVER_DEMAND_ENGINE 0x61
#define OBDII_MODE01_TORQUE_ACTUAL_ENGINE        0x62
#define OBDII_MODE01_TORQUE_REFERENCE_ENGINE     0x63

#define OBDII_MODE01_PIDS_SUPPORT80         0x80
#define OBDII_MODE01_PIDS_SUPPORTA0         0xA0
#define OBDII_MODE01_PIDS_SUPPORTC0         0xC0

#define OBDII_MODE09_PIDS_SUPPORT00 			0x00
#define OBDII_MODE09_VIN02								0x02
#define OBDII_MODE09_CALIBRATION_ID04			0x04
#define OBDII_MODE09_CAL_VER_NUMBERS06		0x06
#define OBDII_MODE09_PERFORMANCE_SPARK08	0x08
#define OBDII_MODE09_ECU_NAME0A						0x0A
#define OBDII_MODE09_PERFORMANCE_COMPRESSION0B 0x0B

/* unit_name_string for OBDII_MODE01_TIMING_ADVANCE */
static const unit_name_string units_degree_btdc = { UTF8_DEGREE_SIGN "BTDC", NULL };

/* value_string[] for OBDII_MODE01_FUEL_SYSTEM_STATUS */
static const value_string obdii_fuel_system_status_vals[] =
{
	{  1, "Open loop due to insufficient engine temperature" },
	{  2, "Closed loop, using oxygen sensor feedback to determine fuel mix" },
	{  4, "Open loop due to engine load OR fuel cut due to deceleration" },
	{  8, "Open loop due to system failure" },
	{ 16, "Closed loop, using at least one oxygen sensor but there is a fault in the feedback system" },
	{ 0, NULL }
};

/* value_string[] for OBDII_MODE01_SECONDARY_AIR_STATUS */
static const value_string obdii_secondary_air_status_vals[] =
{
	{ 1, "Upstream" },
	{ 2, "Downstream of catalytic converter" },
	{ 4, "From the outside atmosphere or off" },
	{ 8, "Pump commanded on for diagnostics" },
	{ 0, NULL }
};

/* value_string[] for OBDII_MODE01_OBD_STANDARDS */
static const value_string obdii_standards_vals[] =
{
	{  1, "OBD-II as defined by the CARB" },
	{  2, "OBD as defined by the EPA" },
	{  3, "OBD and OBD-II" },
	{  4, "OBD-I" },
	{  5, "Not OBD compliant" },
	{  6, "EOBD" },
	{  7, "EOBD and OBD-II" },
	{  8, "EOBD and OBD" },
	{  9, "EOBD, OBD and OBD II" },
	{ 10, "JOBD" },
	{ 11, "JOBD and OBD II" },
	{ 12, "JOBD and EOBD" },
	{ 13, "JOBD, EOBD, and OBD II" },
	{ 14, "Reserved" },
	{ 15, "Reserved" },
	{ 16, "Reserved" },
	{ 17, "EMD" },
	{ 18, "EMD+" },
	{ 19, "HD OBD-C" },
	{ 20, "HD OBD" },
	{ 21, "WWH OBD" },
	{ 22, "Reserved" },
	{ 23, "HD EOBD-I" },
	{ 24, "HD EOBD-I N" },
	{ 25, "HD EOBD-II" },
	{ 26, "HD EOBD-II N" },
	{ 27, "Reserved" },
	{ 28, "OBDBr-1" },
	{ 29, "OBDBr-2" },
	{ 30, "KOBD" },
	{ 31, "IOBD I" },
	{ 32, "IOBD II" },
	{ 33, "HD EOBD-IV" },
	/* 34-250 Reserved */
	/* 251-255 Not available for assignment (SAE J1939 special meaning) */
	{ 0, NULL}
};

/* value_string[] for OBDII_MODE01_FUEL_TYPE */
static const value_string obdii_fuel_type_coding_vals[] =
{
	{  0, "Not available" },
	{  1, "Gasoline" },
	{  2, "Methanol" },
	{  3, "Ethanol" },
	{  4, "Diesel" },
	{  5, "LPG" },
	{  6, "CNG" },
	{  7, "Propane" },
	{  8, "Electric" },
	{  9, "Bifuel running Gasoline" },
	{ 10, "Bifuel running Methanol" },
	{ 11, "Bifuel running Ethanol" },
	{ 12, "Bifuel running LPG" },
	{ 13, "Bifuel running CNG" },
	{ 14, "Bifuel running Propane" },
	{ 15, "Bifuel running Electricity" },
	{ 16, "Bifuel running electric and combustion engine" },
	{ 17, "Hybrid gasoline" },
	{ 18, "Hybrid Ethanol" },
	{ 19, "Hybrid Diesel" },
	{ 20, "Hybrid Electric" },
	{ 21, "Hybrid running electric and combustion engine" },
	{ 22, "Hybrid Regenerative" },
	{ 23, "Bifuel running diesel" },
	{ 0, NULL }
};

static const value_string obdii_mode01_pid_vals[] =
{
	{ OBDII_MODE01_PIDS_SUPPORT00, "PIDs supported [01 - 20]" },
	{ OBDII_MODE01_MONITOR_STATUS, "Monitor status" },
	{ OBDII_MODE01_FREEZE_DTC, "Freeze DTC" },
	{ OBDII_MODE01_FUEL_SYSTEM_STATUS, "Fuel system status" },
	{ OBDII_MODE01_ENGINE_LOAD, "Calculated engine load" },
	{ OBDII_MODE01_ENGINE_COOLANT_TEMP, "Engine coolant temperature" },
	{ OBDII_MODE01_SHORT_TERM_FUEL_BANK1, "Short term fuel trim (Bank 1)" },
	{ OBDII_MODE01_LONG_TERM_FUEL_BANK1, "Long term fuel trim (Bank 1)" },
	{ OBDII_MODE01_SHORT_TERM_FUEL_BANK2, "Short term fuel trim (Bank 2)" },
	{ OBDII_MODE01_LONG_TERM_FUEL_BANK2, "Long term fuel trim (Bank 2)" },
	{ OBDII_MODE01_FUEL_PRESSURE, "Fuel pressure" },
	{ OBDII_MODE01_INTAKE_MANIFOLD_ABSOLUTE_PRESSURE, "Intake manifold absolute pressure" },
	{ OBDII_MODE01_ENGINE_RPM, "Engine RPM" },
	{ OBDII_MODE01_VEHICLE_SPEED, "Vehicle speed" },
	{ OBDII_MODE01_TIMING_ADVANCE, "Timing advance" },
	{ OBDII_MODE01_INTAKE_AIR_TEMP, "Intake air temperature" },
	{ OBDII_MODE01_MAF_AIR_FLOW_RATE, "MAF air flow rate" },
	{ OBDII_MODE01_THROTTLE_POSITION, "Throttle position" },
	{ OBDII_MODE01_SECONDARY_AIR_STATUS, "Commanded secondary air status" },
	{ OBDII_MODE01_OXYGEN_SENSOR_PRESET2, "Oxygen sensors present (2 banks)" },
	{ OBDII_MODE01_OXYGEN_SENSOR1, "Oxygen Sensor 1" },
	{ OBDII_MODE01_OXYGEN_SENSOR2, "Oxygen Sensor 2" },
	{ OBDII_MODE01_OXYGEN_SENSOR3, "Oxygen Sensor 3" },
	{ OBDII_MODE01_OXYGEN_SENSOR4, "Oxygen Sensor 4" },
	{ OBDII_MODE01_OXYGEN_SENSOR5, "Oxygen Sensor 5" },
	{ OBDII_MODE01_OXYGEN_SENSOR6, "Oxygen Sensor 6" },
	{ OBDII_MODE01_OXYGEN_SENSOR7, "Oxygen Sensor 7" },
	{ OBDII_MODE01_OXYGEN_SENSOR8, "Oxygen Sensor 8" },
	{ OBDII_MODE01_OBD_STANDARDS, "OBD standards" },
	{ OBDII_MODE01_OXYGEN_SENSOR_PRESET4, "Oxygen sensors present (4 banks)" },
	{ OBDII_MODE01_AUX_INPUT_STATUS, "Auxiliary input status" },
	{ OBDII_MODE01_ENGINE_UPTIME, "Run time since engine start" },

	{ OBDII_MODE01_PIDS_SUPPORT20, "PIDs supported [21 - 40]" },
	{ OBDII_MODE01_DISTANCE_TRAVELED_WITH_MIL, "Distance traveled with MIL on" },
	{ OBDII_MODE01_FUEL_RAIL_PRESSURE, "Fuel Rail Pressure" },
	{ OBDII_MODE01_FUEL_RAIL_GAUGE_PRESSURE, "Fuel Rail Gauge Pressure" },
	{ OBDII_MODE01_OXYGEN_SENSOR1_, "Oxygen Sensor 1" },
	{ OBDII_MODE01_OXYGEN_SENSOR2_, "Oxygen Sensor 2" },
	{ OBDII_MODE01_OXYGEN_SENSOR3_, "Oxygen Sensor 3" },
	{ OBDII_MODE01_OXYGEN_SENSOR4_, "Oxygen Sensor 4" },
	{ OBDII_MODE01_OXYGEN_SENSOR5_, "Oxygen Sensor 5" },
	{ OBDII_MODE01_OXYGEN_SENSOR6_, "Oxygen Sensor 6" },
	{ OBDII_MODE01_OXYGEN_SENSOR7_, "Oxygen Sensor 7" },
	{ OBDII_MODE01_OXYGEN_SENSOR8_, "Oxygen Sensor 8" },
	{ OBDII_MODE01_COMMANDED_EGR, "Commanded EGR" },
	{ OBDII_MODE01_EGR_ERROR, "EGR Error" },
	{ OBDII_MODE01_COMMANDED_EVAP_PURGE, "Commanded evaporative purge" },
	{ OBDII_MODE01_FUEL_TANK_LEVEL, "Fuel Tank Level Input" },
	{ OBDII_MODE01_WARM_UPS_SINCE_CLEAR, "Warm-ups since codes cleared" },
	{ OBDII_MODE01_DISTANCE_TRAVELED_SINCE_CODES_CLEAR, "Distance traveled since codes cleared" },
	{ OBDII_MODE01_EVAP_SYSTEM_VAPOR_PRESSURE, "Evap. System Vapor Pressure" },
	{ OBDII_MODE01_ABSOLUTE_BAROMETRIC_PRESSURE, "Absolute Barometric Pressure" },
	{ OBDII_MODE01_OXYGEN_SENSOR1_A, "Oxygen Sensor 1" },
	{ OBDII_MODE01_OXYGEN_SENSOR2_A, "Oxygen Sensor 2" },
	{ OBDII_MODE01_OXYGEN_SENSOR3_A, "Oxygen Sensor 3" },
	{ OBDII_MODE01_OXYGEN_SENSOR4_A, "Oxygen Sensor 4" },
	{ OBDII_MODE01_OXYGEN_SENSOR5_A, "Oxygen Sensor 5" },
	{ OBDII_MODE01_OXYGEN_SENSOR6_A, "Oxygen Sensor 6" },
	{ OBDII_MODE01_OXYGEN_SENSOR7_A, "Oxygen Sensor 7" },
	{ OBDII_MODE01_OXYGEN_SENSOR8_A, "Oxygen Sensor 8" },
	{ OBDII_MODE01_CATALYST_TEMP11, "Catalyst Temperature (Bank 1, Sensor 1)" },
	{ OBDII_MODE01_CATALYST_TEMP21, "Catalyst Temperature (Bank 2, Sensor 1)" },
	{ OBDII_MODE01_CATALYST_TEMP12, "Catalyst Temperature (Bank 1, Sensor 2)" },
	{ OBDII_MODE01_CATALYST_TEMP22, "Catalyst Temperature (Bank 2, Sensor 2)" },

	{ OBDII_MODE01_PIDS_SUPPORT40, "PIDs supported [41 - 60]" },
	{ 0x41, "Monitor status this cycle" },
	{ OBDII_MODE01_CONTROL_MODULE_VOLTAGE, "Control module voltage" },
	{ OBDII_MODE01_ABSOLUTE_LOAD_VALUE, "Absolute load value" },
	{ OBDII_MODE01_FUEL_AIR_COMMANDED_EQUIV_RATIO, "Fuel-Air commanded equivalence ratio" },
	{ OBDII_MODE01_RELATIVE_THROTTLE_POSITION, "Relative throttle position" },
	{ OBDII_MODE01_AMBIENT_AIR_TEMP, "Ambient air temperature" },
	{ OBDII_MODE01_ABSOLUTE_THROTTLE_POSITION_B, "Absolute throttle position B" },
	{ OBDII_MODE01_ABSOLUTE_THROTTLE_POSITION_C, "Absolute throttle position C" },
	{ OBDII_MODE01_ACCELERATOR_PEDAL_POSITION_D, "Accelerator pedal position D" },
	{ OBDII_MODE01_ACCELERATOR_PEDAL_POSITION_E, "Accelerator pedal position E" },
	{ OBDII_MODE01_ACCELERATOR_PEDAL_POSITION_F, "Accelerator pedal position F" },
	{ OBDII_MODE01_COMMANDED_THROTTLE_ACTUATOR, "Commanded throttle actuator" },
	{ OBDII_MODE01_TIME_RUN_WITH_MIL, "Time run with MIL on" },
	{ OBDII_MODE01_TIME_SINCE_TROUBLE_CODES_CLEAR, "Time since trouble codes cleared" },
	{ 0x4F, "Maximum value for Fuel-Air equivalence ratio, oxygen sensor voltage, oxygen sensor current, intake manifold absolute pressure" },
	{ 0x50, "Maximum value for air flow rate from mass air flow sensor" },
	{ OBDII_MODE01_FUEL_TYPE, "Fuel Type" },
	{ OBDII_MODE01_ETHANOL_FUEL, "Ethanol fuel %" },
	{ OBDII_MODE01_ABSOLUTE_EVAP_SYSTEM_VAPOR_PRESSURE, "Absolute Evap system Vapor Pressure" },
	{ 0x54, "Evap system vapor pressure" },
	{ OBDII_MODE01_SHORT_TERM_OXYGEN_BANK13, "Short term secondary oxygen sensor trim (Bank 1, 3)" },
	{ OBDII_MODE01_LONG_TERM_OXYGEN_BANK13, "Long term secondary oxygen sensor trim (Bank 1, 3)" },
	{ OBDII_MODE01_SHORT_TERM_OXYGEN_BANK24, "Short term secondary oxygen sensor trim (Bank 2, 4)" },
	{ OBDII_MODE01_LONG_TERM_OXYGEN_BANK24, "Long term secondary oxygen sensor trim (Bank 2, 4)" },
	{ OBDII_MODE01_FUEL_RAIL_ABSOLUTE_PRESSURE, "Fuel rail absolute pressure" },
	{ OBDII_MODE01_RELATIVE_ACCELERATOR_PEDAL_POSITION, "Relative accelerator pedal position" },
	{ OBDII_MODE01_HYBRID_BATTERY_REMAINING_LIFE, "Hybrid battery pack remaining life" },
	{ OBDII_MODE01_ENGINE_OIL_TEMP, "Engine oil temperature" },
	{ OBDII_MODE01_FUEL_INJECTION_TIMING, "Fuel injection timing" },
	{ OBDII_MODE01_ENGINE_FUEL_RATE, "Engine fuel rate" },
	{ 0x5F, "Emission requirements to which vehicle is designed" },

	{ OBDII_MODE01_PIDS_SUPPORT60, "PIDs supported [61 - 80]" },
	{ OBDII_MODE01_TORQUE_DRIVER_DEMAND_ENGINE, "Driver's demand engine - percent torque" },
	{ OBDII_MODE01_TORQUE_ACTUAL_ENGINE, "Actual engine - percent torque" },
	{ OBDII_MODE01_TORQUE_REFERENCE_ENGINE, "Engine reference torque" },
	{ 0x64, "Engine percent torque data" },
	{ 0x65, "Auxiliary input / output supported" },
	{ 0x66, "Mass air flow sensor" },
	{ 0x67, "Engine coolant temperature" },
	{ 0x68, "Intake air temperature sensor" },
	{ 0x69, "Commanded EGR and EGR Error" },
	{ 0x6A, "Commanded Diesel intake air flow control and relative intake air flow position" },
	{ 0x6B, "Exhaust gas recirculation temperature" },
	{ 0x6C, "Commanded throttle actuator control and relative throttle position" },
	{ 0x6D, "Fuel pressure control system" },
	{ 0x6E, "Injection pressure control system" },
	{ 0x6F, "Turbocharger compressor inlet pressure" },
	{ 0x70, "Boost pressure control" },
	{ 0x71, "Variable Geometry turbo (VGT) control" },
	{ 0x72, "Wastegate control" },
	{ 0x73, "Exhaust pressure" },
	{ 0x74, "Turbocharger RPM" },
	{ 0x75, "Turbocharger temperature" },
	{ 0x76, "Turbocharger temperature" },
	{ 0x77, "Charge air cooler temperature" },
	{ 0x78, "Exhaust Gas temperature (Bank 1)" },
	{ 0x79, "Exhaust Gas temperature (Bank 2)" },
	{ 0x7A, "Diesel particulate filter" },
	{ 0x7B, "Diesel particulate filter" },
	{ 0x7C, "Diesel Particulate filter temperature" },
	{ 0x7D, "NOx Not-To-Exceed control area status" },
	{ 0x7E, "PM Not-To-Exceed control area status" },
	{ 0x7F, "Engine run time" },

	{ OBDII_MODE01_PIDS_SUPPORT80, "PIDs supported [81 - A0]" },
	{ 0x81, "Engine run time for Auxiliary Emissions Control Device" },
	{ 0x82, "Engine run time for Auxiliary Emissions Control Device" },
	{ 0x83, "NOx sensor" },
	{ 0x84, "Manifold surface temperature" },
	{ 0x85, "NOx reagent system" },
	{ 0x86, "Particulate matter sensor" },
	{ 0x87, "Intake manifold absolute pressure" },

	{ OBDII_MODE01_PIDS_SUPPORTA0, "PIDs supported [A1 - C0]" },

	{ OBDII_MODE01_PIDS_SUPPORTC0, "PIDs supported [C1 - E0]" },

	{ 0x00, NULL }
};

static value_string_ext obdii_mode01_pid_vals_ext = VALUE_STRING_EXT_INIT(obdii_mode01_pid_vals);

static const value_string obdii_mode09_pid_vals[] =
{
	{ OBDII_MODE09_PIDS_SUPPORT00, "PIDs supported [00 - 20]" },
	{ OBDII_MODE09_VIN02, "Vehicle VIN" },
	{ OBDII_MODE09_CALIBRATION_ID04, "Calibration ID" },
	{ OBDII_MODE09_CAL_VER_NUMBERS06, "Calibration Verification Numbers" },
	{ OBDII_MODE09_PERFORMANCE_SPARK08, "In-use performance tracking for spark ignition vehicles" },
	{ OBDII_MODE09_ECU_NAME0A, "ECU Name" },
	{ OBDII_MODE09_PERFORMANCE_COMPRESSION0B, "In-use performance tracking for compression ignition vehicles" },
	{ 0x00, NULL }
};

static value_string_ext obdii_mode09_pid_vals_ext = VALUE_STRING_EXT_INIT(obdii_mode09_pid_vals);

static const value_string obdii_mode_vals[] =
{
	{ 0x01, "Show current data" },
	{ 0x02, "Show freeze frame data" },
	{ 0x03, "Show stored Diagnostic Trouble Codes" },
	{ 0x04, "Clear Diagnostic Trouble Codes and stored values" },
	{ 0x05, "Test results, oxygen sensor monitoring (non CAN only)" },
	{ 0x06, "Test results, other component/system monitoring (Test results, oxygen sensor monitoring for CAN only)" },
	{ 0x07, "Show pending Diagnostic Trouble Codes (detected during current or last driving cycle)" },
	{ 0x08, "Control operation of on-board component/system" },
	{ 0x09, "Request vehicle information" },
	{ 0x0A, "Permanent Diagnostic Trouble Codes (DTCs) (Cleared DTCs)" },
	{ 0x00, NULL }
};

struct obdii_packet_info
{
	packet_info *pinfo;
	uint32_t can_id;

	uint8_t data_bytes;
	uint8_t mode;

	uint8_t value_bytes;
	int value_offset;
	uint8_t valueA, valueB, valueC, valueD, valueE;
};

static bool
dissect_obdii_common_temperature(tvbuff_t *tvb, struct obdii_packet_info *oinfo, proto_tree *tree, int hf_field)
{
	if (oinfo->value_bytes == 1)
	{
		int16_t val = ((int) oinfo->valueA) - 40;

		col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, ": %d " UTF8_DEGREE_SIGN "C", val);
		proto_tree_add_int(tree, hf_field, tvb, oinfo->value_offset, oinfo->value_bytes, val);
		return true;
	}

	return false;
}

static bool
dissect_obdii_common_percent(tvbuff_t *tvb, struct obdii_packet_info *oinfo, proto_tree *tree, int hf_field)
{
	if (oinfo->value_bytes == 1)
	{
		double val = (100 * oinfo->valueA) / 255.0;

		col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, ": %.2f %%", val);
		proto_tree_add_double(tree, hf_field, tvb, oinfo->value_offset, oinfo->value_bytes, val);
		return true;
	}

	return false;
}

static bool
dissect_obdii_common_percent_neg(tvbuff_t *tvb, struct obdii_packet_info *oinfo, proto_tree *tree, int hf_field)
{
	if (oinfo->value_bytes == 1)
	{
		double val = ((100 * oinfo->valueA) / 128.0) - 100.0;

		col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, ": %.2f %%", val);
		proto_tree_add_double(tree, hf_field, tvb, oinfo->value_offset, oinfo->value_bytes, val);
		return true;
	}

	return false;
}

static bool
dissect_obdii_common_fuel_rail_pressure(tvbuff_t *tvb, struct obdii_packet_info *oinfo, proto_tree *tree, int hf_field)
{
	if (oinfo->value_bytes == 2)
	{
		unsigned val = 10 * (256 * oinfo->valueA + oinfo->valueB);

		col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, ": %u kPa", val);
		proto_tree_add_uint(tree, hf_field, tvb, oinfo->value_offset, oinfo->value_bytes, val);
		return true;
	}

	return false;
}

static bool
dissect_obdii_common_absolute_pressure(tvbuff_t *tvb, struct obdii_packet_info *oinfo, proto_tree *tree, int hf_field)
{
	if (oinfo->value_bytes == 1)
	{
		uint8_t val = oinfo->valueA;

		col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, ": %u kPa", val);
		proto_tree_add_uint(tree, hf_field, tvb, oinfo->value_offset, oinfo->value_bytes, val);
		return true;
	}

	return false;
}

static bool
dissect_obdii_common_distance_travelled(tvbuff_t *tvb, struct obdii_packet_info *oinfo, proto_tree *tree, int hf_field)
{
	if (oinfo->value_bytes == 2)
	{
		uint16_t val = 256 * oinfo->valueA + oinfo->valueB;

		col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, ": %u km", val);
		proto_tree_add_uint(tree, hf_field, tvb, oinfo->value_offset, oinfo->value_bytes, val);
		return true;
	}

	return false;
}

static bool
dissect_obdii_common_time(tvbuff_t *tvb, struct obdii_packet_info *oinfo, proto_tree *tree, int hf_field)
{
	if (oinfo->value_bytes == 2)
	{
		uint16_t val = 256 * oinfo->valueA + oinfo->valueB;

		col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, ": %u minutes", val);
		proto_tree_add_uint(tree, hf_field, tvb, oinfo->value_offset, oinfo->value_bytes, val);
		return true;
	}

	return false;
}

static bool
dissect_obdii_common_torque(tvbuff_t *tvb, struct obdii_packet_info *oinfo, proto_tree *tree, int hf_field)
{
	if (oinfo->value_bytes == 1)
	{
		int val = ((int) oinfo->valueA) - 125;

		col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, ": %d %%", val);
		proto_tree_add_int(tree, hf_field, tvb, oinfo->value_offset, oinfo->value_bytes, val);
		return true;
	}

	return false;
}

static void
dissect_obdii_mode_01(tvbuff_t *tvb, struct obdii_packet_info *oinfo, proto_tree *tree)
{
	uint8_t pid = tvb_get_uint8(tvb, OBDII_PID_POS);
	int value_offset;
	bool handled = false;

	col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, "- %s", val_to_str_ext(pid, &obdii_mode01_pid_vals_ext, "Unknown (%.2x)"));
	proto_tree_add_uint(tree, hf_obdii_mode01_pid, tvb, OBDII_PID_POS, 1, pid);

	proto_tree_add_item(tree, hf_obdii_raw_value, tvb, OBDII_VAL_OFF, MIN(oinfo->value_bytes, 4), ENC_NA);

	value_offset = OBDII_VAL_OFF;
	oinfo->value_offset = value_offset;

	/* https://en.wikipedia.org/wiki/OBD-II_PIDs#Mode_01 */
	switch (pid)
	{
	case OBDII_MODE01_PIDS_SUPPORT00:
	case OBDII_MODE01_PIDS_SUPPORT20:
	case OBDII_MODE01_PIDS_SUPPORT40:
	case OBDII_MODE01_PIDS_SUPPORT60:
	case OBDII_MODE01_PIDS_SUPPORT80:
	case OBDII_MODE01_PIDS_SUPPORTA0:
	case OBDII_MODE01_PIDS_SUPPORTC0:
		if ((handled = (oinfo->value_bytes == 4)))
		{
			uint32_t val = ((oinfo->valueA << 24) | (oinfo->valueB << 16) | (oinfo->valueC << 8) | (oinfo->valueD << 0));
			int i;
			const char *sepa;
			char bits_str[33];

			sepa = ": ";
			for (i = 31; i >= 0; i--)
			{
				unsigned this_pid = (pid + 32 - i);
				proto_item *ti;

				memset(bits_str, '.', 32);
				bits_str[32] = '\0';

				if ((val & (1U << i)))
				{
					col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, "%s%.2X", sepa, this_pid);
					ti = proto_tree_add_uint(tree, hf_obdii_mode01_supported_pid, tvb, value_offset, oinfo->value_bytes, this_pid);
					sepa = ",";
					bits_str[31 - i] = '1';
				}
				else
				{
					ti = proto_tree_add_uint(tree, hf_obdii_mode01_unsupported_pid, tvb, value_offset, oinfo->value_bytes, this_pid);
					bits_str[31 - i] = '0';
				}

				proto_item_prepend_text(ti, "%s = ", bits_str);
			}
		}
		break;

	case OBDII_MODE01_FUEL_SYSTEM_STATUS:
		if ((handled = (oinfo->value_bytes == 2)))
		{
			uint8_t fuel_system1_val = oinfo->valueA;
			uint8_t fuel_system2_val = oinfo->valueB;

			col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, ": System 1: %s", val_to_str(fuel_system1_val, obdii_fuel_system_status_vals, "Unknown (%.2X)"));
			col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, ", System 2: %s", val_to_str(fuel_system2_val, obdii_fuel_system_status_vals, "Unknown (%.2X)"));

			proto_tree_add_uint(tree, hf_obdii_mode01_fuel_system1_status, tvb, value_offset + 0, 1, fuel_system1_val);
			proto_tree_add_uint(tree, hf_obdii_mode01_fuel_system2_status, tvb, value_offset + 1, 1, fuel_system2_val);
		}
		break;

	case OBDII_MODE01_ENGINE_LOAD:
		handled = dissect_obdii_common_percent(tvb, oinfo, tree, hf_obdii_mode01_engine_load);
		break;

	case OBDII_MODE01_ENGINE_COOLANT_TEMP:
		handled = dissect_obdii_common_temperature(tvb, oinfo, tree, hf_obdii_mode01_engine_coolant_temp);
		break;

	case OBDII_MODE01_SHORT_TERM_FUEL_BANK1:
		handled = dissect_obdii_common_percent_neg(tvb, oinfo, tree, hf_obdii_mode01_short_term_fuel_bank1);
		break;

	case OBDII_MODE01_LONG_TERM_FUEL_BANK1:
		handled = dissect_obdii_common_percent_neg(tvb, oinfo, tree, hf_obdii_mode01_long_term_fuel_bank1);
		break;

	case OBDII_MODE01_SHORT_TERM_FUEL_BANK2:
		handled = dissect_obdii_common_percent_neg(tvb, oinfo, tree, hf_obdii_mode01_short_term_fuel_bank2);
		break;

	case OBDII_MODE01_LONG_TERM_FUEL_BANK2:
		handled = dissect_obdii_common_percent_neg(tvb, oinfo, tree, hf_obdii_mode01_long_term_fuel_bank2);
		break;

	case OBDII_MODE01_FUEL_PRESSURE:
		if ((handled = (oinfo->value_bytes == 1)))
		{
			uint16_t val = 3 * oinfo->valueA;

			col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, ": %u kPa", val);
			proto_tree_add_uint(tree, hf_obdii_mode01_fuel_pressure, tvb, value_offset, oinfo->value_bytes, val);
		}
		break;

	case OBDII_MODE01_ENGINE_RPM:
		if ((handled = (oinfo->value_bytes == 2)))
		{
			double val = (256 * oinfo->valueA + oinfo->valueB) / 4.0;

			col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, ": %.2f rpm", val);
			proto_tree_add_double(tree, hf_obdii_mode01_engine_rpm, tvb, value_offset, oinfo->value_bytes, val);
		}
		break;

	case OBDII_MODE01_VEHICLE_SPEED:
		if ((handled = (oinfo->value_bytes == 1)))
		{
			uint8_t val = oinfo->valueA;

			col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, ": %u km/h", val);
			proto_tree_add_uint(tree, hf_obdii_mode01_vehicle_speed, tvb, value_offset, oinfo->value_bytes, val);
		}
		break;

	case OBDII_MODE01_TIMING_ADVANCE:
		if ((handled = (oinfo->value_bytes == 1)))
		{
			double val = (oinfo->valueA - 128) / 2.0;

			col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, ": %.2f " UTF8_DEGREE_SIGN "BTDC", val);
			proto_tree_add_double(tree, hf_obdii_mode01_timing_advance, tvb, value_offset, oinfo->value_bytes, val);
		}
		break;

	case OBDII_MODE01_INTAKE_AIR_TEMP:
		handled = dissect_obdii_common_temperature(tvb, oinfo, tree, hf_obdii_mode01_intake_air_temp);
		break;

	case OBDII_MODE01_MAF_AIR_FLOW_RATE:
		if ((handled = (oinfo->value_bytes == 2)))
		{
			double val = (256 * oinfo->valueA + oinfo->valueB) / 100.0;

			col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, ": %.2f g/s", val);
			proto_tree_add_double(tree, hf_obdii_mode01_maf_air_flow_rate, tvb, value_offset, oinfo->value_bytes, val);
		}
		break;

	case OBDII_MODE01_THROTTLE_POSITION:
		handled = dissect_obdii_common_percent(tvb, oinfo, tree, hf_obdii_mode01_throttle_position);
		break;

	case OBDII_MODE01_SECONDARY_AIR_STATUS:
		if ((handled = (oinfo->value_bytes == 1)))
		{
			uint8_t air_status = oinfo->valueA;

			col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, ": %s", val_to_str(air_status, obdii_secondary_air_status_vals, "Unknown (%.2X)"));
			proto_tree_add_uint(tree, hf_obdii_mode01_secondary_air_status, tvb, value_offset, oinfo->value_bytes, air_status);
		}
		break;

	case OBDII_MODE01_OXYGEN_SENSOR_PRESET2:
		if ((handled = (oinfo->value_bytes == 1)))
		{
			uint8_t bank1_sensor1 = (oinfo->valueA & (1 << 0));
			uint8_t bank1_sensor2 = (oinfo->valueA & (1 << 1));
			uint8_t bank1_sensor3 = (oinfo->valueA & (1 << 2));
			uint8_t bank1_sensor4 = (oinfo->valueA & (1 << 3));
			uint8_t bank2_sensor1 = (oinfo->valueA & (1 << 4));
			uint8_t bank2_sensor2 = (oinfo->valueA & (1 << 5));
			uint8_t bank2_sensor3 = (oinfo->valueA & (1 << 6));
			uint8_t bank2_sensor4 = (oinfo->valueA & (1 << 7));

			col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, ": Bank1 sensors: %s%s%s%s%s",
				bank1_sensor1 ? "1 " : "", bank1_sensor2 ? "2 " : "", bank1_sensor3 ? "3 " : "", bank1_sensor4 ? "4 " : "",
				((bank1_sensor1 | bank1_sensor2 | bank1_sensor3 | bank1_sensor4)) ? "" : "None");

			col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, ", Bank2 sensors: %s%s%s%s%s",
				bank2_sensor1 ? "1 " : "", bank2_sensor2 ? "2 " : "", bank2_sensor3 ? "3 " : "", bank2_sensor4 ? "4 " : "",
				((bank2_sensor1 | bank2_sensor2 | bank2_sensor3 | bank2_sensor4)) ? "" : "None");

			/* TODO: proto tree */
		}
		break;

	case OBDII_MODE01_OXYGEN_SENSOR_PRESET4:
		if ((handled = (oinfo->value_bytes == 1)))
		{
			uint8_t bank1_sensor1 = (oinfo->valueA & (1 << 0));
			uint8_t bank1_sensor2 = (oinfo->valueA & (1 << 1));
			uint8_t bank2_sensor1 = (oinfo->valueA & (1 << 2));
			uint8_t bank2_sensor2 = (oinfo->valueA & (1 << 3));
			uint8_t bank3_sensor1 = (oinfo->valueA & (1 << 4));
			uint8_t bank3_sensor2 = (oinfo->valueA & (1 << 5));
			uint8_t bank4_sensor1 = (oinfo->valueA & (1 << 6));
			uint8_t bank4_sensor2 = (oinfo->valueA & (1 << 7));

			col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, ": Bank1 sensors: %s%s%s",
				bank1_sensor1 ? "1 " : "", bank1_sensor2 ? "2 " : "",
				((bank1_sensor1 | bank1_sensor2)) ? "" : "None");

			col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, ", Bank2 sensors: %s%s%s",
				bank2_sensor1 ? "1 " : "", bank2_sensor2 ? "2 " : "",
				((bank2_sensor1 | bank2_sensor2)) ? "" : "None");

			col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, ", Bank3 sensors: %s%s%s",
				bank3_sensor1 ? "1 " : "", bank3_sensor2 ? "2 " : "",
				((bank3_sensor1 | bank3_sensor2)) ? "" : "None");

			col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, ", Bank4 sensors: %s%s%s",
				bank4_sensor1 ? "1 " : "", bank4_sensor2 ? "2 " : "",
				((bank4_sensor1 | bank4_sensor2)) ? "" : "None");

			/* TODO: proto tree */
		}
		break;

	case OBDII_MODE01_OXYGEN_SENSOR1:
	case OBDII_MODE01_OXYGEN_SENSOR2:
	case OBDII_MODE01_OXYGEN_SENSOR3:
	case OBDII_MODE01_OXYGEN_SENSOR4:
	case OBDII_MODE01_OXYGEN_SENSOR5:
	case OBDII_MODE01_OXYGEN_SENSOR6:
	case OBDII_MODE01_OXYGEN_SENSOR7:
	case OBDII_MODE01_OXYGEN_SENSOR8:
		if ((handled = (oinfo->value_bytes == 2)))
		{
			double volt_val  = (oinfo->valueA) / 200.0;
			double fuel_trim = ((100.0 * oinfo->valueB) / 128.0) - 100.0;

			col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, ": Voltage: %.3f V", volt_val);
			if (oinfo->valueB != 0xFF)
				col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, ", Short term fuel trim: %.2f %%", fuel_trim);

			proto_tree_add_uint(tree, hf_obdii_mode01_oxygen_sensor_id, tvb, value_offset, oinfo->value_bytes, 1 + (pid - OBDII_MODE01_OXYGEN_SENSOR1));
			proto_tree_add_double(tree, hf_obdii_mode01_oxygen_sensor_voltage, tvb, value_offset, 1, volt_val);
			/* TODO: proto_tree */
		}
		break;

	case OBDII_MODE01_OBD_STANDARDS:
		if ((handled = (oinfo->value_bytes == 1)))
		{
			uint8_t val = oinfo->valueA;

			col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, ": %s", val_to_str(val, obdii_standards_vals, "Unknown (%u)"));
			proto_tree_add_uint(tree, hf_obdii_mode01_obd_standards, tvb, value_offset, oinfo->value_bytes, val);
		}
		break;

	case OBDII_MODE01_ENGINE_UPTIME:
		if ((handled = (oinfo->value_bytes == 2)))
		{
			uint16_t val = 256 * oinfo->valueA + oinfo->valueB;

			col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, ": %u s", val);
			proto_tree_add_uint(tree, hf_obdii_mode01_engine_uptime, tvb, value_offset, oinfo->value_bytes, val);
		}
		break;

	case OBDII_MODE01_FUEL_RAIL_PRESSURE:
		if ((handled = (oinfo->value_bytes == 2)))
		{
			double val = 0.079 * (256 * oinfo->valueA + oinfo->valueB);

			col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, ": %.3f kPa", val);
			proto_tree_add_double(tree, hf_obdii_mode01_fuel_rail_pressure, tvb, value_offset, oinfo->value_bytes, val);
		}
		break;

	case OBDII_MODE01_FUEL_RAIL_GAUGE_PRESSURE:
		handled = dissect_obdii_common_fuel_rail_pressure(tvb, oinfo, tree, hf_obdii_mode01_fuel_rail_gauge_pressure);
		break;

	case OBDII_MODE01_FUEL_RAIL_ABSOLUTE_PRESSURE:
		handled = dissect_obdii_common_fuel_rail_pressure(tvb, oinfo, tree, hf_obdii_mode01_fuel_rail_absolute_pressure);
		break;

	case OBDII_MODE01_OXYGEN_SENSOR1_:
	case OBDII_MODE01_OXYGEN_SENSOR2_:
	case OBDII_MODE01_OXYGEN_SENSOR3_:
	case OBDII_MODE01_OXYGEN_SENSOR4_:
	case OBDII_MODE01_OXYGEN_SENSOR5_:
	case OBDII_MODE01_OXYGEN_SENSOR6_:
	case OBDII_MODE01_OXYGEN_SENSOR7_:
	case OBDII_MODE01_OXYGEN_SENSOR8_:
		if ((handled = (oinfo->value_bytes == 4)))
		{
			double fuel_air_ratio = (256 * oinfo->valueA + oinfo->valueB) * (2.0 / 65536.0);
			double volt_val       = (256 * oinfo->valueC + oinfo->valueD) * (8.0 / 65536.0);

			col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, ": Fuel-Air Equivalence: %.4f ratio", fuel_air_ratio);
			col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, ", Voltage: %.4f V", volt_val);

			proto_tree_add_uint(tree, hf_obdii_mode01_oxygen_sensor_id, tvb, value_offset, oinfo->value_bytes, 1 + (pid - OBDII_MODE01_OXYGEN_SENSOR1_));
			proto_tree_add_double(tree, hf_obdii_mode01_oxygen_sensor_fuel_air_ratio, tvb, value_offset, 2, fuel_air_ratio);
			proto_tree_add_double(tree, hf_obdii_mode01_oxygen_sensor_voltage, tvb, value_offset + 2, 2, volt_val);
		}
		break;

	case OBDII_MODE01_COMMANDED_EGR:
		handled = dissect_obdii_common_percent(tvb, oinfo, tree, hf_obdii_mode01_commanded_egr);
		break;

	case OBDII_MODE01_EGR_ERROR:
		handled = dissect_obdii_common_percent_neg(tvb, oinfo, tree, hf_obdii_mode01_egr_error);
		break;

	case OBDII_MODE01_COMMANDED_EVAP_PURGE:
		handled = dissect_obdii_common_percent(tvb, oinfo, tree, hf_obdii_mode01_commanded_evap_purge);
		break;

	case OBDII_MODE01_FUEL_TANK_LEVEL:
		handled = dissect_obdii_common_percent(tvb, oinfo, tree, hf_obdii_mode01_fuel_tank_level_input);
		break;

	case OBDII_MODE01_WARM_UPS_SINCE_CLEAR:
		if ((handled = (oinfo->value_bytes == 1)))
		{
			uint8_t val = oinfo->valueA;

			col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, ": %u", val);
			proto_tree_add_uint(tree, hf_obdii_mode01_warm_ups, tvb, value_offset, oinfo->value_bytes, val);
		}
		break;

	case OBDII_MODE01_EVAP_SYSTEM_VAPOR_PRESSURE:
		if ((handled = (oinfo->value_bytes == 2)))
		{
			double val = ((int16_t) (oinfo->valueA * 256 + oinfo->valueB)) / 4.0;

			col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, ": %.2f kPa", val);
			proto_tree_add_double(tree, hf_obdii_mode01_evap_system_vapor_pressure, tvb, value_offset, oinfo->value_bytes, val);
		}
		break;

	case OBDII_MODE01_ABSOLUTE_BAROMETRIC_PRESSURE:
		handled = dissect_obdii_common_absolute_pressure(tvb, oinfo, tree, hf_obdii_mode01_absolute_barometric_pressure);
		break;

	case OBDII_MODE01_INTAKE_MANIFOLD_ABSOLUTE_PRESSURE:
		handled = dissect_obdii_common_absolute_pressure(tvb, oinfo, tree, hf_obdii_mode01_intake_manifold_absolute_pressure);
		break;

	case OBDII_MODE01_OXYGEN_SENSOR1_A:
	case OBDII_MODE01_OXYGEN_SENSOR2_A:
	case OBDII_MODE01_OXYGEN_SENSOR3_A:
	case OBDII_MODE01_OXYGEN_SENSOR4_A:
	case OBDII_MODE01_OXYGEN_SENSOR5_A:
	case OBDII_MODE01_OXYGEN_SENSOR6_A:
	case OBDII_MODE01_OXYGEN_SENSOR7_A:
	case OBDII_MODE01_OXYGEN_SENSOR8_A:
		if ((handled = (oinfo->value_bytes == 4)))
		{
			double fuel_air_ratio = (256 * oinfo->valueA + oinfo->valueB) * (2.0 / 65536.0);
			double current_val    = (((int) oinfo->valueC) - 128) + (oinfo->valueD / 256.0);

			col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, ": Fuel-Air Equivalence: %.4f ratio", fuel_air_ratio);
			col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, ", Current: %.4f mA", current_val);

			proto_tree_add_uint(tree, hf_obdii_mode01_oxygen_sensor_id, tvb, value_offset, oinfo->value_bytes, 1 + (pid - OBDII_MODE01_OXYGEN_SENSOR1_A));
			proto_tree_add_double(tree, hf_obdii_mode01_oxygen_sensor_fuel_air_ratio, tvb, value_offset, 2, fuel_air_ratio);
			proto_tree_add_double(tree, hf_obdii_mode01_oxygen_sensor_current, tvb, value_offset + 2, 2, current_val);
		}
		break;

	case OBDII_MODE01_CATALYST_TEMP11:
	case OBDII_MODE01_CATALYST_TEMP21:
	case OBDII_MODE01_CATALYST_TEMP12:
	case OBDII_MODE01_CATALYST_TEMP22:
		if ((handled = (oinfo->value_bytes == 2)))
		{
			int hf_field =
				(pid == OBDII_MODE01_CATALYST_TEMP11) ? hf_obdii_mode01_catalyst_temp_11 :
				(pid == OBDII_MODE01_CATALYST_TEMP21) ? hf_obdii_mode01_catalyst_temp_21 :
				(pid == OBDII_MODE01_CATALYST_TEMP12) ? hf_obdii_mode01_catalyst_temp_12 :
				(pid == OBDII_MODE01_CATALYST_TEMP22) ? hf_obdii_mode01_catalyst_temp_22 :
				-1;

			double val = ((256 * oinfo->valueA + oinfo->valueB) / 10.0) - 40.0;

			col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, ": %.2f " UTF8_DEGREE_SIGN "C", val);
			proto_tree_add_double(tree, hf_field, tvb, oinfo->value_offset, oinfo->value_bytes, val);
		}
		break;

	case OBDII_MODE01_CONTROL_MODULE_VOLTAGE:
		if ((handled = (oinfo->value_bytes == 2)))
		{
			double val = (256 * oinfo->valueA + oinfo->valueB) / 1000.0;

			col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, ": %.3f V", val);
			proto_tree_add_double(tree, hf_obdii_mode01_control_module_voltage, tvb, value_offset, oinfo->value_bytes, val);
		}
		break;

	case OBDII_MODE01_ABSOLUTE_LOAD_VALUE:
		if ((handled = (oinfo->value_bytes == 2)))
		{
			double val = ((256 * oinfo->valueA + oinfo->valueB) * 100) / 255.0;

			col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, ": %.3f %%", val);
			proto_tree_add_double(tree, hf_obdii_mode01_absolute_load_value, tvb, value_offset, oinfo->value_bytes, val);
		}
		break;

	case OBDII_MODE01_FUEL_AIR_COMMANDED_EQUIV_RATIO:
		if ((handled = (oinfo->value_bytes == 2)))
		{
			double val = (256 * oinfo->valueA + oinfo->valueB) * (2.0 / 65536.0);

			col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, ": %.3f", val);
			proto_tree_add_double(tree, hf_obdii_mode01_fuel_air_commanded_equiv_ratio, tvb, value_offset, oinfo->value_bytes, val);
		}
		break;

	case OBDII_MODE01_RELATIVE_THROTTLE_POSITION:
		handled = dissect_obdii_common_percent(tvb, oinfo, tree, hf_obdii_mode01_relative_throttle_position);
		break;

	case OBDII_MODE01_AMBIENT_AIR_TEMP:
		handled = dissect_obdii_common_temperature(tvb, oinfo, tree, hf_obdii_mode01_ambient_air_temp);
		break;

	case OBDII_MODE01_ABSOLUTE_THROTTLE_POSITION_B:
		handled = dissect_obdii_common_percent(tvb, oinfo, tree, hf_obdii_mode01_absolute_throttle_position_B);
		break;

	case OBDII_MODE01_ABSOLUTE_THROTTLE_POSITION_C:
		handled = dissect_obdii_common_percent(tvb, oinfo, tree, hf_obdii_mode01_absolute_throttle_position_C);
		break;

	case OBDII_MODE01_ACCELERATOR_PEDAL_POSITION_D:
		handled = dissect_obdii_common_percent(tvb, oinfo, tree, hf_obdii_mode01_accelerator_pedal_position_D);
		break;

	case OBDII_MODE01_ACCELERATOR_PEDAL_POSITION_E:
		handled = dissect_obdii_common_percent(tvb, oinfo, tree, hf_obdii_mode01_accelerator_pedal_position_E);
		break;

	case OBDII_MODE01_ACCELERATOR_PEDAL_POSITION_F:
		handled = dissect_obdii_common_percent(tvb, oinfo, tree, hf_obdii_mode01_accelerator_pedal_position_F);
		break;

	case OBDII_MODE01_COMMANDED_THROTTLE_ACTUATOR:
		handled = dissect_obdii_common_percent(tvb, oinfo, tree, hf_obdii_mode01_commanded_throttle_actuator);
		break;

	case OBDII_MODE01_DISTANCE_TRAVELED_WITH_MIL:
		handled = dissect_obdii_common_distance_travelled(tvb, oinfo, tree, hf_obdii_mode01_distance_traveled_with_mil);
		break;

	case OBDII_MODE01_DISTANCE_TRAVELED_SINCE_CODES_CLEAR:
		handled = dissect_obdii_common_distance_travelled(tvb, oinfo, tree, hf_obdii_mode01_distance_traveled_since_code_clear);
		break;

	case OBDII_MODE01_TIME_RUN_WITH_MIL:
		handled = dissect_obdii_common_time(tvb, oinfo, tree, hf_obdii_mode01_time_run_with_mil);
		break;

	case OBDII_MODE01_TIME_SINCE_TROUBLE_CODES_CLEAR:
		handled = dissect_obdii_common_time(tvb, oinfo, tree, hf_obdii_mode01_time_since_trouble_code_clear);
		break;

	case OBDII_MODE01_FUEL_TYPE:
		if ((handled = (oinfo->value_bytes == 1)))
		{
			uint8_t val = oinfo->valueA;

			col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, ": %s", val_to_str(val, obdii_fuel_type_coding_vals, "Unknown (%u)"));
			proto_tree_add_uint(tree, hf_obdii_mode01_fuel_type, tvb, value_offset, oinfo->value_bytes, val);
		}
		break;

	case OBDII_MODE01_ETHANOL_FUEL:
		handled = dissect_obdii_common_percent(tvb, oinfo, tree, hf_obdii_mode01_ethanol_fuel);
		break;

	case OBDII_MODE01_ABSOLUTE_EVAP_SYSTEM_VAPOR_PRESSURE:
		if ((handled = (oinfo->value_bytes == 2)))
		{
			double val = (oinfo->valueA * 256 + oinfo->valueB) / 200.0;

			col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, ": %.2f kPa", val);
			proto_tree_add_double(tree, hf_obdii_mode01_absolute_evap_system_vapor_pressure, tvb, value_offset, oinfo->value_bytes, val);
		}
		break;

	case OBDII_MODE01_SHORT_TERM_OXYGEN_BANK13:
	case OBDII_MODE01_LONG_TERM_OXYGEN_BANK13:
	case OBDII_MODE01_SHORT_TERM_OXYGEN_BANK24:
	case OBDII_MODE01_LONG_TERM_OXYGEN_BANK24:
		if ((handled = (oinfo->value_bytes == 2)))
		{
			double bankA_val = ((100.0 * oinfo->valueA) / 128.0) - 100.0;
			double bankB_val = ((100.0 * oinfo->valueB) / 128.0) - 100.0;

			col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, ": { %.2f %%, %.2f %% }", bankA_val, bankB_val);

			/* TODO: proto tree */
		}
		break;

	case OBDII_MODE01_RELATIVE_ACCELERATOR_PEDAL_POSITION:
		handled = dissect_obdii_common_percent(tvb, oinfo, tree, hf_obdii_mode01_relative_accelerator_pedal_position);
		break;

	case OBDII_MODE01_HYBRID_BATTERY_REMAINING_LIFE:
		handled = dissect_obdii_common_percent(tvb, oinfo, tree, hf_obdii_mode01_hybrid_battery_remaining_life);
		break;

	case OBDII_MODE01_ENGINE_OIL_TEMP:
		handled = dissect_obdii_common_temperature(tvb, oinfo, tree, hf_obdii_mode01_engine_oil_temp);
		break;

	case OBDII_MODE01_FUEL_INJECTION_TIMING:
		if ((handled = (oinfo->value_bytes == 2)))
		{
			double val = ((256 * oinfo->valueA + oinfo->valueB - (210 * 128)) / 128.0);

			col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, ": %.3f " UTF8_DEGREE_SIGN, val);
			proto_tree_add_double(tree, hf_obdii_mode01_fuel_injection_timing, tvb, value_offset, oinfo->value_bytes, val);
		}
		break;

	case OBDII_MODE01_ENGINE_FUEL_RATE:
		if ((handled = (oinfo->value_bytes == 2)))
		{
			double val = (256 * oinfo->valueA + oinfo->valueB) / 20.0;

			col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, ": %.3f L/h", val);
			proto_tree_add_double(tree, hf_obdii_mode01_engine_fuel_rate, tvb, value_offset, oinfo->value_bytes, val);
		}
		break;

	case OBDII_MODE01_TORQUE_DRIVER_DEMAND_ENGINE:
		handled = dissect_obdii_common_torque(tvb, oinfo, tree, hf_obdii_mode01_torque_driver_demand_engine);
		break;

	case OBDII_MODE01_TORQUE_ACTUAL_ENGINE:
		handled = dissect_obdii_common_torque(tvb, oinfo, tree, hf_obdii_mode01_torque_actual_engine);
		break;

	case OBDII_MODE01_TORQUE_REFERENCE_ENGINE:
		if ((handled = (oinfo->value_bytes == 2)))
		{
			uint16_t val = 256 * oinfo->valueA + oinfo->valueB;

			col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, ": %u Nm", val);
			proto_tree_add_uint(tree, hf_obdii_mode01_torque_reference_engine, tvb, value_offset, oinfo->value_bytes, val);
		}
		break;
	}

	if (!handled)
	{
		/* display raw */
		col_append_str(oinfo->pinfo->cinfo, COL_INFO, ": <");
		if (oinfo->value_bytes >= 1) col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, " %.2X", oinfo->valueA);
		if (oinfo->value_bytes >= 2) col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, " %.2X", oinfo->valueB);
		if (oinfo->value_bytes >= 3) col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, " %.2X", oinfo->valueC);
		if (oinfo->value_bytes >= 4) col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, " %.2X", oinfo->valueD);
		col_append_str(oinfo->pinfo->cinfo, COL_INFO, " >");
	}
}

static void
dissect_obdii_mode_07(tvbuff_t *tvb, struct obdii_packet_info *oinfo, proto_tree *tree)
{
	proto_tree_add_item(tree, hf_obdii_raw_value, tvb, OBDII_MODE07_DATA_OFF, oinfo->value_bytes, ENC_NA);

	/* display raw */
	col_append_str(oinfo->pinfo->cinfo, COL_INFO, ": <");
	if (oinfo->value_bytes >= 1) col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, " %.2X", oinfo->valueA);
	if (oinfo->value_bytes >= 2) col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, " %.2X", oinfo->valueB);
	if (oinfo->value_bytes >= 3) col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, " %.2X", oinfo->valueC);
	if (oinfo->value_bytes >= 4) col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, " %.2X", oinfo->valueD);
	if (oinfo->value_bytes >= 5) col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, " %.2X", oinfo->valueE);
	col_append_str(oinfo->pinfo->cinfo, COL_INFO, " >");
}

static void
dissect_obdii_mode_09(tvbuff_t *tvb, struct obdii_packet_info *oinfo, proto_tree *tree)
{
	uint8_t pid = tvb_get_uint8(tvb, OBDII_PID_POS);
	int value_offset;

	col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, "- %s", val_to_str_ext(pid, &obdii_mode09_pid_vals_ext, "Unknown (%.2x)"));
	proto_tree_add_uint(tree, hf_obdii_mode09_pid, tvb, OBDII_PID_POS, 1, pid);

	value_offset = OBDII_VAL_OFF;
	oinfo->value_offset = value_offset;

	switch (pid)
	{
	case OBDII_MODE09_PIDS_SUPPORT00:
		proto_tree_add_item(tree, hf_obdii_raw_value, tvb, OBDII_VAL_OFF, oinfo->value_bytes, ENC_NA);
		break;
	case OBDII_MODE09_VIN02:
		proto_tree_add_item(tree, hf_obdii_vin, tvb, OBDII_VAL_OFF+1, oinfo->value_bytes-1, ENC_ASCII);
		break;
	case OBDII_MODE09_CALIBRATION_ID04:
	case OBDII_MODE09_CAL_VER_NUMBERS06:
	case OBDII_MODE09_PERFORMANCE_SPARK08:
		proto_tree_add_item(tree, hf_obdii_raw_value, tvb, OBDII_VAL_OFF, oinfo->value_bytes, ENC_NA);
		break;
	case OBDII_MODE09_ECU_NAME0A:
		proto_tree_add_item(tree, hf_obdii_ecu_name, tvb, OBDII_VAL_OFF+1, oinfo->value_bytes-1, ENC_ASCII);
		break;
	case OBDII_MODE09_PERFORMANCE_COMPRESSION0B:
	default:
		proto_tree_add_item(tree, hf_obdii_raw_value, tvb, OBDII_VAL_OFF, oinfo->value_bytes, ENC_NA);
		break;
	}
}


static int
dissect_obdii_query(tvbuff_t *tvb, struct obdii_packet_info *oinfo, proto_tree *tree)
{
	uint16_t pid;
	int pid_len;
	const char *mode_str;
	const char *pid_str;

	pid_len = oinfo->data_bytes - 1;
	if (pid_len == 0)
	{
		if (oinfo->mode != 0x04 && oinfo->mode != 0x07)
			return 0;
		pid = 0; /* Should never be required but set to satisfy petri-dish */
	}
	else if (pid_len == 1)
		pid  = tvb_get_uint8(tvb, OBDII_PID_POS);
	else if (pid_len == 2)
		pid = tvb_get_ntohs(tvb, OBDII_PID_POS);
	else
		return 0;

	mode_str = val_to_str(oinfo->mode, obdii_mode_vals, "Unknown (%.2x)");

	switch (oinfo->mode)
	{
	case 0x01:
		pid_str = val_to_str_ext(pid, &obdii_mode01_pid_vals_ext, "Unknown (%.2x)");
		proto_tree_add_uint(tree, hf_obdii_mode01_pid, tvb, OBDII_PID_POS, pid_len, pid);
		col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, " Request[%.3x] %s - %s", oinfo->can_id, mode_str, pid_str);
		break;

	case 0x04:
	case 0x07:
		col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, " Request[%.3x] %s", oinfo->can_id, mode_str);
		break;

	case 0x09:
		pid_str = val_to_str_ext(pid, &obdii_mode09_pid_vals_ext, "Unknown (%.2x)");
		proto_tree_add_uint(tree, hf_obdii_mode09_pid, tvb, OBDII_PID_POS, pid_len, pid);
		col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, " Request[%.3x] %s - %s", oinfo->can_id, mode_str, pid_str);
		break;

	default:
		pid_str = wmem_strdup_printf(wmem_packet_scope(), "Unknown (%.2x)", pid);
		col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, " Request[%.3x] %s - %s", oinfo->can_id, mode_str, pid_str);
		break;
	}

	return tvb_captured_length(tvb);
}

static int
dissect_obdii_response(tvbuff_t *tvb, struct obdii_packet_info *oinfo, proto_tree *tree)
{
	col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, "Response[%.3x] %s ", oinfo->can_id, val_to_str(oinfo->mode, obdii_mode_vals, "Unknown (%.2x)"));

	if (oinfo->mode == 0x04 && oinfo->data_bytes == 0x01) {
		return tvb_captured_length(tvb);
	}

	oinfo->value_bytes = oinfo->data_bytes - OBDII_VAL_OFF;

	if (oinfo->value_bytes >= 1) oinfo->valueA = tvb_get_uint8(tvb, OBDII_VAL_OFF);
	if (oinfo->value_bytes >= 2) oinfo->valueB = tvb_get_uint8(tvb, OBDII_VAL_OFF + 1);
	if (oinfo->value_bytes >= 3) oinfo->valueC = tvb_get_uint8(tvb, OBDII_VAL_OFF + 2);
	if (oinfo->value_bytes >= 4) oinfo->valueD = tvb_get_uint8(tvb, OBDII_VAL_OFF + 3);
	if (oinfo->value_bytes >= 5) oinfo->valueE = tvb_get_uint8(tvb, OBDII_VAL_OFF + 4);

	switch (oinfo->mode)
	{
	case 0x01:
		dissect_obdii_mode_01(tvb, oinfo, tree);
		break;
	case 0x07:
		dissect_obdii_mode_07(tvb, oinfo, tree);
		break;
	case 0x09:
		dissect_obdii_mode_09(tvb, oinfo, tree);
	}

	return tvb_captured_length(tvb);
}

static int
dissect_obdii_iso15765(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
{
	iso15765_info_t iso15765_info;
	uint32_t        can_id_only;
	struct obdii_packet_info oinfo;

	proto_tree *obdii_tree;
	proto_item *ti;

	uint8_t data_bytes;
	uint8_t mode;
	bool id_is_query;
	bool id_is_response;

	DISSECTOR_ASSERT(data);

	iso15765_info = *((iso15765_info_t *) data);
	if (iso15765_info.bus_type != ISO15765_TYPE_CAN && iso15765_info.bus_type != ISO15765_TYPE_CAN_FD) {
		return 0;
	}

	can_id_only = iso15765_info.id & CAN_EFF_MASK;

	/* If we're using 29bit extended ID's then use extended ID parameters */
	if (iso15765_info.id & CAN_EFF_FLAG)
	{
		id_is_query = (can_id_only == ODBII_CAN_QUERY_ID_EFF);
		id_is_response = ((((can_id_only & ~ODBII_CAN_RESPONSE_ID_LOWER_MASK_EFF) ^ ODBII_CAN_RESPONSE_ID_LOWER_MIN_EFF) == 0) ||
			(((can_id_only & ~ODBII_CAN_RESPONSE_ID_UPPER_MASK_EFF) ^ ODBII_CAN_RESPONSE_ID_UPPER_MIN_EFF) == 0)) ? 1 : 0;
	}
	else
	{
		id_is_query = (can_id_only == ODBII_CAN_QUERY_ID_SFF);
		id_is_response = ((((can_id_only & ~ODBII_CAN_RESPONSE_ID_LOWER_MASK_SFF) ^ ODBII_CAN_RESPONSE_ID_LOWER_MIN_SFF) == 0) ||
			(((can_id_only & ~ODBII_CAN_RESPONSE_ID_UPPER_MASK_SFF) ^ ODBII_CAN_RESPONSE_ID_UPPER_MIN_SFF) == 0));
	}

	/* validate */
	if (iso15765_info.id & (CAN_ERR_FLAG | CAN_RTR_FLAG))
		return 0;

	if (!(id_is_query || id_is_response))
		return 0;

	data_bytes = tvb_reported_length(tvb);
	mode = tvb_get_uint8(tvb, OBDII_MODE_POS);

	/* Mode 7 is a datalength of 1, all other queries either 2 or 3 bytes */
	if (id_is_query)
	{
		if (iso15765_info.len != 8)
			expert_add_info(pinfo, NULL, &ei_obdii_padding);
		if (data_bytes == 0 || data_bytes > 3)
			return 0;
		if (mode > 0x0a)
			return 0;
	}

	if (id_is_response)
	{
		if (mode != 0x44 && data_bytes < 2)
			return 0;
		if (mode < 0x40)
			return 0;

		mode -= 0x40;
	}

	col_set_str(pinfo->cinfo, COL_PROTOCOL, "OBD-II");
	col_clear(pinfo->cinfo, COL_INFO);

	ti = proto_tree_add_item(tree, proto_obdii, tvb, 0, -1, ENC_NA);
	obdii_tree = proto_item_add_subtree(ti, ett_obdii);

	proto_tree_add_uint(obdii_tree, hf_obdii_mode, tvb, OBDII_MODE_POS, 1, mode);

	memset(&oinfo, 0, sizeof(oinfo));
	oinfo.pinfo = pinfo;
	oinfo.can_id = can_id_only;
	oinfo.data_bytes = data_bytes;
	oinfo.mode = mode;

	if (id_is_query)
		return dissect_obdii_query(tvb, &oinfo, obdii_tree);

	if (id_is_response)
		return dissect_obdii_response(tvb, &oinfo, obdii_tree);

	/* never here */
	DISSECTOR_ASSERT_NOT_REACHED();

	return tvb_captured_length(tvb);
}

static int
dissect_obdii_uds(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
{
    struct obdii_packet_info  oinfo;

    proto_tree               *obdii_tree;
    proto_item               *ti;

    uint8_t                   data_bytes;
    uint8_t                   mode;
    bool                      response;

    data_bytes = tvb_reported_length(tvb);
    mode = tvb_get_uint8(tvb, OBDII_MODE_POS);
    response = (mode & 0x40) == 0x40;
    mode = mode & 0xbf;

    col_set_str(pinfo->cinfo, COL_PROTOCOL, "OBD-II");
    col_clear(pinfo->cinfo, COL_INFO);

    ti = proto_tree_add_item(tree, proto_obdii, tvb, 0, -1, ENC_NA);
    obdii_tree = proto_item_add_subtree(ti, ett_obdii);

    proto_tree_add_uint(obdii_tree, hf_obdii_mode, tvb, OBDII_MODE_POS, 1, mode);

    memset(&oinfo, 0, sizeof(oinfo));
    oinfo.pinfo = pinfo;
    oinfo.can_id = 0;
    oinfo.data_bytes = data_bytes;
    oinfo.mode = mode;

    if (!response) {
        return dissect_obdii_query(tvb, &oinfo, obdii_tree);
    } else {
        return dissect_obdii_response(tvb, &oinfo, obdii_tree);
    }

    /* never here */
    DISSECTOR_ASSERT_NOT_REACHED();

    return tvb_captured_length(tvb);
}

static bool
dissect_obdii_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
{
    return dissect_obdii_iso15765(tvb, pinfo, tree, data) != 0;
}

void
proto_register_obdii(void)
{
	static hf_register_info hf[] = {
		{ &hf_obdii_mode,
			{ "Mode", "obd-ii.mode", FT_UINT8, BASE_HEX, VALS(obdii_mode_vals), 0x0, NULL, HFILL },
		},
		{ &hf_obdii_raw_value,
			{ "Raw value", "obd-ii.raw_value", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL },
		},
		{ &hf_obdii_mode01_pid,
			{ "PID", "obd-ii.mode01_pid", FT_UINT16, BASE_HEX | BASE_EXT_STRING, VALS_EXT_PTR(&obdii_mode01_pid_vals_ext), 0x0, NULL, HFILL },
		},
		{ &hf_obdii_mode01_supported_pid,
			{ "Supported PID", "obd-ii.mode01_supported_pid", FT_UINT8, BASE_HEX | BASE_EXT_STRING, VALS_EXT_PTR(&obdii_mode01_pid_vals_ext), 0x0, NULL, HFILL },
		},
		{ &hf_obdii_mode01_unsupported_pid,
			{ "NOT Supported PID", "obd-ii.mode01_unsupported_pid", FT_UINT8, BASE_HEX | BASE_EXT_STRING, VALS_EXT_PTR(&obdii_mode01_pid_vals_ext), 0x0, NULL, HFILL },
		},
		{ &hf_obdii_mode01_fuel_system1_status,
			{ "Fuel system 1 status", "obd-ii.mode01_fuel_system1_status", FT_UINT8, BASE_HEX, VALS(obdii_fuel_system_status_vals), 0x0, NULL, HFILL },
		},
		{ &hf_obdii_mode01_fuel_system2_status,
			{ "Fuel system 2 status", "obd-ii.mode01_fuel_system2_status", FT_UINT8, BASE_HEX, VALS(obdii_fuel_system_status_vals), 0x0, NULL, HFILL },
		},
		{ &hf_obdii_mode01_engine_load,
			{ "Calculated engine load", "obd-ii.mode01_engine_load", FT_DOUBLE, BASE_NONE | BASE_UNIT_STRING, UNS(&units_percent), 0x0, NULL, HFILL },
		},
		{ &hf_obdii_mode01_engine_coolant_temp,
			{ "Engine coolant temperature", "obd-ii.mode01_engine_coolant_temp", FT_INT16, BASE_DEC | BASE_UNIT_STRING, UNS(&units_degree_celsius), 0x0, NULL, HFILL },
		},
		{ &hf_obdii_mode01_short_term_fuel_bank1,
			{ "Short term fuel trim (Bank 1)", "obd-ii.mode01_short_term_fuel_bank1", FT_DOUBLE, BASE_NONE | BASE_UNIT_STRING, UNS(&units_percent), 0x0, NULL, HFILL },
		},
		{ &hf_obdii_mode01_short_term_fuel_bank2,
			{ "Short term fuel trim (Bank 2)", "obd-ii.mode01_short_term_fuel_bank2", FT_DOUBLE, BASE_NONE | BASE_UNIT_STRING, UNS(&units_percent), 0x0, NULL, HFILL },
		},
		{ &hf_obdii_mode01_long_term_fuel_bank1,
			{ "Long term fuel trim (Bank 1)", "obd-ii.mode01_long_term_fuel_bank1", FT_DOUBLE, BASE_NONE | BASE_UNIT_STRING, UNS(&units_percent), 0x0, NULL, HFILL },
		},
		{ &hf_obdii_mode01_long_term_fuel_bank2,
			{ "Long term fuel trim (Bank 2)", "obd-ii.mode01_long_term_fuel_bank2", FT_DOUBLE, BASE_NONE | BASE_UNIT_STRING, UNS(&units_percent), 0x0, NULL, HFILL },
		},
		{ &hf_obdii_mode01_fuel_pressure,
			{ "Fuel pressure", "obd-ii.mode01_fuel_pressure", FT_UINT16, BASE_DEC | BASE_UNIT_STRING, UNS(&units_kilopascal), 0x0, NULL, HFILL },
		},
		{ &hf_obdii_mode01_engine_rpm,
			{ "Engine RPM", "obd-ii.mode01_engine_rpm", FT_DOUBLE, BASE_NONE | BASE_UNIT_STRING, UNS(&units_revolutions_per_minute), 0x0, NULL, HFILL },
		},
		{ &hf_obdii_mode01_vehicle_speed,
			{ "Vehicle Speed", "obd-ii.mode01_vehicle_speed", FT_UINT8, BASE_DEC | BASE_UNIT_STRING, UNS(&units_kmh), 0x0, NULL, HFILL },
		},
		{ &hf_obdii_mode01_timing_advance,
			{ "Timing advance", "obd-ii.mode01_timing_advance", FT_DOUBLE, BASE_NONE | BASE_UNIT_STRING, UNS(&units_degree_btdc), 0x0, NULL, HFILL },
		},
		{ &hf_obdii_mode01_intake_air_temp,
			{ "Intake air temperature", "obd-ii.mode01_intake_air_temp", FT_INT16, BASE_DEC | BASE_UNIT_STRING, UNS(&units_degree_celsius), 0x0, NULL, HFILL },
		},
		{ &hf_obdii_mode01_maf_air_flow_rate,
			{ "MAF air flow rate", "obd-ii.mode01_maf_air_flow_rate", FT_DOUBLE, BASE_NONE | BASE_UNIT_STRING, UNS(&units_grams_per_second), 0x0, NULL, HFILL },
		},
		{ &hf_obdii_mode01_throttle_position,
			{ "Throttle position", "obd-ii.mode01_throttle_position", FT_DOUBLE, BASE_NONE | BASE_UNIT_STRING, UNS(&units_percent), 0x0, NULL, HFILL },
		},
		{ &hf_obdii_mode01_secondary_air_status,
			{ "Commanded secondary air status", "obd-ii.mode01_secondary_air_status", FT_UINT8, BASE_HEX, VALS(obdii_secondary_air_status_vals), 0x0, NULL, HFILL },
		},
		{ &hf_obdii_mode01_obd_standards,
			{ "OBD Standards", "obd-ii.mode01_obd_standards", FT_UINT8, BASE_DEC, VALS(obdii_standards_vals), 0x0, NULL, HFILL }
		},
		{ &hf_obdii_mode01_engine_uptime,
			{ "Run time since engine start", "obd-ii.mode01_engine_uptime", FT_UINT16, BASE_DEC | BASE_UNIT_STRING, UNS(&units_seconds), 0x0, NULL, HFILL }
		},
		{ &hf_obdii_mode01_fuel_rail_pressure,
			{ "Fuel Rail Pressure", "obd-ii.mode01_fuel_rail_pressure", FT_DOUBLE, BASE_NONE | BASE_UNIT_STRING, UNS(&units_kilopascal), 0x0, NULL, HFILL }
		},
		{ &hf_obdii_mode01_fuel_rail_gauge_pressure,
			{ "Fuel Rail Gauge Pressure", "obd-ii.mode01_fuel_rail_gauge_pressure", FT_UINT24, BASE_DEC | BASE_UNIT_STRING, UNS(&units_kilopascal), 0x0, NULL, HFILL }
		},
		{ &hf_obdii_mode01_fuel_rail_absolute_pressure,
			{ "Fuel rail absolute pressure", "obd-ii.mode01_fuel_rail_absolute_pressure", FT_UINT24, BASE_DEC | BASE_UNIT_STRING, UNS(&units_kilopascal), 0x0, NULL, HFILL }
		},
		{ &hf_obdii_mode01_commanded_egr,
			{ "Commanded EGR", "obd-ii.mode01_commanded_egr", FT_DOUBLE, BASE_NONE | BASE_UNIT_STRING, UNS(&units_percent), 0x0, NULL, HFILL }
		},
		{ &hf_obdii_mode01_egr_error,
			{ "EGR Error", "obd-ii.mode01_egr_error", FT_DOUBLE, BASE_NONE | BASE_UNIT_STRING, UNS(&units_percent), 0x0, NULL, HFILL }
		},
		{ &hf_obdii_mode01_commanded_evap_purge,
			{ "Commanded evaporative purge", "obd-ii.mode01_commanded_evap_purge", FT_DOUBLE, BASE_NONE | BASE_UNIT_STRING, UNS(&units_percent), 0x0, NULL, HFILL }
		},
		{ &hf_obdii_mode01_fuel_tank_level_input,
			{ "Fuel Tank Level Input", "obd-ii.mode01_fuel_tank_level_input", FT_DOUBLE, BASE_NONE | BASE_UNIT_STRING, UNS(&units_percent), 0x0, NULL, HFILL }
		},
		{ &hf_obdii_mode01_warm_ups,
			{ "Warm-ups since codes cleared", "obd-ii.mode01_warm_ups", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }
		},
		{ &hf_obdii_mode01_evap_system_vapor_pressure,
			{ "Evap. System Vapor Pressure", "obd-ii.mode01_evap_system_vapor_pressure", FT_DOUBLE, BASE_NONE | BASE_UNIT_STRING, UNS(&units_kilopascal), 0x0, NULL, HFILL }
		},
		{ &hf_obdii_mode01_absolute_barometric_pressure,
			{ "Absolute Barometric Pressure", "obd-ii.mode01_absolute_barometric_pressure", FT_UINT8, BASE_DEC | BASE_UNIT_STRING, UNS(&units_kilopascal), 0x0, NULL, HFILL }
		},
		{ &hf_obdii_mode01_intake_manifold_absolute_pressure,
			{ "Intake manifold absolute pressure", "obd-ii.mode01_intake_manifold_absolute_pressure", FT_UINT8, BASE_DEC | BASE_UNIT_STRING, UNS(&units_kilopascal), 0x0, NULL, HFILL }
		},
		{ &hf_obdii_mode01_oxygen_sensor_id,
			{ "Oxygen Sensor ID", "obd-ii.mode01_oxygen_sensor_id", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }
		},
		{ &hf_obdii_mode01_oxygen_sensor_fuel_air_ratio,
			{ "Fuel-Air Equivalence Ratio", "obd-ii.mode01_oxygen_sensor_fuel_air_ratio", FT_DOUBLE, BASE_NONE, NULL, 0x0, NULL, HFILL }
		},
		{ &hf_obdii_mode01_oxygen_sensor_voltage,
			{ "Voltage", "obd-ii.mode01_oxygen_sensor_voltage", FT_DOUBLE, BASE_NONE | BASE_UNIT_STRING, UNS(&units_volt), 0x0, NULL, HFILL }
		},
		{ &hf_obdii_mode01_oxygen_sensor_current,
			{ "Current", "obd-ii.mode01_oxygen_sensor_current", FT_DOUBLE, BASE_NONE | BASE_UNIT_STRING, UNS(&units_milliamps), 0x0, NULL, HFILL }
		},
		{ &hf_obdii_mode01_distance_traveled_with_mil,
			{ "Distance traveled with MIL on", "obd-ii.mode01_distance_traveled_with_mil", FT_UINT16, BASE_DEC | BASE_UNIT_STRING, UNS(&units_km), 0x0, NULL, HFILL }
		},
		{ &hf_obdii_mode01_distance_traveled_since_code_clear,
			{ "Distance traveled since codes cleared", "obd-ii.mode01_distance_traveled_since_code_clear", FT_UINT16, BASE_DEC | BASE_UNIT_STRING, UNS(&units_km), 0x0, NULL, HFILL }
		},
		{ &hf_obdii_mode01_time_run_with_mil,
			{ "Time run with MIL on", "obd-ii.mode01_time_run_with_mil", FT_UINT16, BASE_DEC | BASE_UNIT_STRING, UNS(&units_minute_minutes), 0x0, NULL, HFILL }
		},
		{ &hf_obdii_mode01_time_since_trouble_code_clear,
			{ "Time since trouble codes cleared", "obd-ii.mode01_time_since_trouble_code_clear", FT_UINT16, BASE_DEC | BASE_UNIT_STRING, UNS(&units_minute_minutes), 0x0, NULL, HFILL }
		},
		{ &hf_obdii_mode01_fuel_type,
			{ "Fuel type", "obd-ii.mode01_fuel_type", FT_UINT8, BASE_DEC, VALS(obdii_fuel_type_coding_vals), 0x0, NULL, HFILL }
		},
		{ &hf_obdii_mode01_control_module_voltage,
			{ "Control module voltage", "obd-ii.mode01_control_module_voltage", FT_DOUBLE, BASE_NONE | BASE_UNIT_STRING, UNS(&units_volt), 0x0, NULL, HFILL },
		},
		{ &hf_obdii_mode01_absolute_load_value,
			{ "Absolute load value", "obd-ii.mode01_absolute_load_value", FT_DOUBLE, BASE_NONE | BASE_UNIT_STRING, UNS(&units_percent), 0x0, NULL, HFILL },
		},
		{ &hf_obdii_mode01_fuel_air_commanded_equiv_ratio,
			{ "Fuel-Air commanded equivalence ratio", "obd-ii.mode01_fuel_air_commanded_equiv_ratio", FT_DOUBLE, BASE_NONE, NULL, 0x0, NULL, HFILL },
		},
		{ &hf_obdii_mode01_relative_throttle_position,
			{ "Relative throttle position", "obd-ii.mode01_relative_throttle_position", FT_DOUBLE, BASE_NONE | BASE_UNIT_STRING, UNS(&units_percent), 0x0, NULL, HFILL },
		},
		{ &hf_obdii_mode01_catalyst_temp_11,
			{ "Catalyst Temperature (Bank 1, Sensor 1)", "obd-ii.mode01_catalyst_temp_11", FT_DOUBLE, BASE_NONE | BASE_UNIT_STRING, UNS(&units_degree_celsius), 0x0, NULL, HFILL },
		},
		{ &hf_obdii_mode01_catalyst_temp_21,
			{ "Catalyst Temperature (Bank 2, Sensor 1)", "obd-ii.mode01_catalyst_temp_21", FT_DOUBLE, BASE_NONE | BASE_UNIT_STRING, UNS(&units_degree_celsius), 0x0, NULL, HFILL },
		},
		{ &hf_obdii_mode01_catalyst_temp_12,
			{ "Catalyst Temperature (Bank 1, Sensor 2)", "obd-ii.mode01_catalyst_temp_12", FT_DOUBLE, BASE_NONE | BASE_UNIT_STRING, UNS(&units_degree_celsius), 0x0, NULL, HFILL },
		},
		{ &hf_obdii_mode01_catalyst_temp_22,
			{ "Catalyst Temperature (Bank 2, Sensor 2)", "obd-ii.mode01_catalyst_temp_22", FT_DOUBLE, BASE_NONE | BASE_UNIT_STRING, UNS(&units_degree_celsius), 0x0, NULL, HFILL },
		},
		{ &hf_obdii_mode01_ambient_air_temp,
			{ "Ambient air temperature", "obd-ii.mode01_ambient_air_temp", FT_INT16, BASE_DEC | BASE_UNIT_STRING, UNS(&units_degree_celsius), 0x0, NULL, HFILL },
		},
		{ &hf_obdii_mode01_absolute_throttle_position_B,
			{ "Absolute throttle position B", "obd-ii.mode01_absolute_throttle_position_B", FT_DOUBLE, BASE_NONE | BASE_UNIT_STRING, UNS(&units_percent), 0x0, NULL, HFILL },
		},
		{ &hf_obdii_mode01_absolute_throttle_position_C,
			{ "Absolute throttle position C", "obd-ii.mode01_absolute_throttle_position_C", FT_DOUBLE, BASE_NONE | BASE_UNIT_STRING, UNS(&units_percent), 0x0, NULL, HFILL },
		},
		{ &hf_obdii_mode01_accelerator_pedal_position_D,
			{ "Accelerator pedal position D", "obd-ii.mode01_accelerator_pedal_position_D", FT_DOUBLE, BASE_NONE | BASE_UNIT_STRING, UNS(&units_percent), 0x0, NULL, HFILL },
		},
		{ &hf_obdii_mode01_accelerator_pedal_position_E,
			{ "Accelerator pedal position E", "obd-ii.mode01_accelerator_pedal_position_E", FT_DOUBLE, BASE_NONE | BASE_UNIT_STRING, UNS(&units_percent), 0x0, NULL, HFILL },
		},
		{ &hf_obdii_mode01_accelerator_pedal_position_F,
			{ "Accelerator pedal position F", "obd-ii.mode01_accelerator_pedal_position_F", FT_DOUBLE, BASE_NONE | BASE_UNIT_STRING, UNS(&units_percent), 0x0, NULL, HFILL },
		},
		{ &hf_obdii_mode01_commanded_throttle_actuator,
			{ "Commanded throttle actuator", "obd-ii.mode01_commanded_throttle_actuator", FT_DOUBLE, BASE_NONE | BASE_UNIT_STRING, UNS(&units_percent), 0x0, NULL, HFILL },
		},
		{ &hf_obdii_mode01_ethanol_fuel,
			{ "Ethanol fuel %", "obd-ii.mode01_ethanol_fuel", FT_DOUBLE, BASE_NONE | BASE_UNIT_STRING, UNS(&units_percent), 0x0, NULL, HFILL },
		},
		{ &hf_obdii_mode01_absolute_evap_system_vapor_pressure,
			{ "Absolute Evap system Vapor Pressure", "obd-ii.mode01_absolute_evap_system_vapor_pressure", FT_DOUBLE, BASE_NONE | BASE_UNIT_STRING, UNS(&units_kilopascal), 0x0, NULL, HFILL }
		},
		{ &hf_obdii_mode01_relative_accelerator_pedal_position,
			{ "Relative accelerator pedal position", "obd-ii.mode01_relative_accelerator_pedal_position", FT_DOUBLE, BASE_NONE | BASE_UNIT_STRING, UNS(&units_percent), 0x0, NULL, HFILL },
		},
		{ &hf_obdii_mode01_hybrid_battery_remaining_life,
			{ "Hybrid battery pack remaining life", "obd-ii.mode01_hybrid_battery_remaining_life", FT_DOUBLE, BASE_NONE | BASE_UNIT_STRING, UNS(&units_percent), 0x0, NULL, HFILL },
		},
		{ &hf_obdii_mode01_engine_oil_temp,
			{ "Engine oil temperature", "obd-ii.mode01_engine_oil_temp", FT_INT16, BASE_DEC | BASE_UNIT_STRING, UNS(&units_degree_celsius), 0x0, NULL, HFILL },
		},
		{ &hf_obdii_mode01_fuel_injection_timing,
			{ "Fuel injection timing", "obd-ii.mode01_fuel_injection_timing", FT_DOUBLE, BASE_NONE | BASE_UNIT_STRING, UNS(&units_degree_degrees), 0x0, NULL, HFILL },
		},
		{ &hf_obdii_mode01_engine_fuel_rate,
			{ "Engine fuel rate", "obd-ii.mode01_engine_fuel_rate", FT_DOUBLE, BASE_NONE | BASE_UNIT_STRING, UNS(&units_liter_per_hour), 0x0, NULL, HFILL },
		},
		{ &hf_obdii_mode01_torque_driver_demand_engine,
			{ "Driver's demand engine - percent torque", "obd-ii.mode01_torque_driver_demand_engine", FT_INT16, BASE_DEC | BASE_UNIT_STRING, UNS(&units_percent), 0x0, NULL, HFILL },
		},
		{ &hf_obdii_mode01_torque_actual_engine,
			{ "Actual engine - percent torque", "obd-ii.mode01_torque_actual_engine", FT_INT16, BASE_DEC | BASE_UNIT_STRING, UNS(&units_percent), 0x0, NULL, HFILL },
		},
		{ &hf_obdii_mode01_torque_reference_engine,
			{ "Engine reference torque", "obd-ii.mode01_torque_reference_engine", FT_UINT16, BASE_DEC | BASE_UNIT_STRING, UNS(&units_newton_metre), 0x0, NULL, HFILL },
		},
		{ &hf_obdii_mode09_pid,
			{ "PID", "obd-ii.mode09_pid", FT_UINT16, BASE_HEX | BASE_EXT_STRING, VALS_EXT_PTR(&obdii_mode09_pid_vals_ext), 0x0, NULL, HFILL },
		},
		{ &hf_obdii_mode09_supported_pid,
			{ "Supported PID", "obd-ii.mode09_supported_pid", FT_UINT8, BASE_HEX | BASE_EXT_STRING, VALS_EXT_PTR(&obdii_mode09_pid_vals_ext), 0x0, NULL, HFILL },
		},
		{ &hf_obdii_mode09_unsupported_pid,
			{ "NOT Supported PID", "obd-ii.mode09_unsupported_pid", FT_UINT8, BASE_HEX | BASE_EXT_STRING, VALS_EXT_PTR(&obdii_mode09_pid_vals_ext), 0x0, NULL, HFILL },
		},
		{ &hf_obdii_vin,
			{ "VIN", "obd-ii.VIN", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL },
		},
		{ &hf_obdii_ecu_name,
			{ "ECU Name", "obd-ii.ecu_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL },
		},
	};

	static int *ett[] = {
		&ett_obdii
	};

	struct expert_module *expert_obdii;

	static ei_register_info obdii_ei[] =
	{
		{ &ei_obdii_padding,
			{ "obdii.padding", PI_PROTOCOL, PI_WARN, "OBD2 Spec requires 8 byte, zero padded frames. Some tools/ecus may ignore frames that don't follow this rule.", EXPFILL }},
	};

	proto_obdii = proto_register_protocol("OBD-II PID", "OBD-II", "obd-ii");
	proto_register_field_array(proto_obdii, hf, array_length(hf));
	proto_register_subtree_array(ett, array_length(ett));

	expert_obdii = expert_register_protocol(proto_obdii);
	expert_register_field_array(expert_obdii, obdii_ei, array_length(obdii_ei));

	obdii_handle = register_dissector("obd-ii", dissect_obdii_iso15765, proto_obdii);
	register_dissector("obd-ii-uds", dissect_obdii_uds, proto_obdii);
}

void
proto_reg_handoff_obdii(void)
{
	dissector_add_for_decode_as("iso15765.subdissector", obdii_handle);

	/* heuristics default off since these standardized IDs might be reused outside automotive systems */
	heur_dissector_add("can", dissect_obdii_heur, "OBD-II Heuristic", "obd-ii_can_heur", proto_obdii, HEURISTIC_DISABLE);
}

/*
 * Editor modelines  -  https://www.wireshark.org/tools/modelines.html
 *
 * Local variables:
 * c-basic-offset: 8
 * tab-width: 8
 * indent-tabs-mode: t
 * End:
 *
 * vi: set shiftwidth=8 tabstop=8 noexpandtab:
 * :indentSize=8:tabSize=8:noTabs=false:
 */