From 102779c73a5db27611d1e74351c8839571b0cff6 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Sat, 11 Feb 2017 19:32:01 +0100 Subject: [PATCH] Adding uds-c library to handle obs2 diagnostic Change-Id: I79c7a622f4993af9f0b8ab770991a9c74c3380ee Signed-off-by: Romain Forlot --- .gitmodules | 3 +++ obd2.cpp | 38 ++++++++++++++++++++++++++++ obd2.h | 82 ++++++++++++++++++++++++++++++++++++++++++------------------- 3 files changed, 98 insertions(+), 25 deletions(-) create mode 100644 obd2.cpp diff --git a/.gitmodules b/.gitmodules index 76992e0a..c3bc7fa3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "libs/nanopb"] path = libs/nanopb url = git@github.com:nanopb/nanopb.git +[submodule "uds-c"] + path = libs/uds-c + url = git@github.com:openxc/uds-c.git diff --git a/obd2.cpp b/obd2.cpp new file mode 100644 index 00000000..799f23dd --- /dev/null +++ b/obd2.cpp @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2015, 2016 "IoT.bzh" + * Author "Romain Forlot" + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * A representation of an OBD-II PID. + * + * pid - The 1 byte PID. + * name - A human readable name to use for this PID when published. + * frequency - The frequency to request this PID if supported by the vehicle + * when automatic, recurring OBD-II requests are enabled. + */ + +/* + * Will scan for supported Obd2 pids + */ +Obd2Handler::Obd2Handler() { + +} + +Obd2Handler::isObd2Request(DiagnosticRequest* request) { + return request->mode == 0x1 && request->has_pid && request->pid < 0xff; +} + +Obd2Handler::decodeObd2Response(obd2response responce) \ No newline at end of file diff --git a/obd2.h b/obd2.h index 3f66862f..da9331b3 100644 --- a/obd2.h +++ b/obd2.h @@ -59,31 +59,6 @@ typedef struct _Obd2Pid { int frequency; } Obd2Pid; -/* - * Pre-defined OBD-II PIDs to query for if supported by the vehicle. - */ -const Obd2Pid OBD2_PIDS[] = { - { pid: 0x4, name: "obd2.engine.load", min:0, max: 100, unit: POURCENT, frequency: 5 }, - { pid: 0x5, name: "obd2.engine.coolant.temperature", min: -40, max: 215, unit: DEGREES_CELSIUS, frequency: 1 }, - { pid: 0xa, name: "obd2.fuel.pressure", min: 0, max: 765, unit: KPA, frequency: 1 }, - { pid: 0xb, name: "obd2.intake.manifold.pressure", min: 0, max: 255, unit: KPA, frequency: 1 }, - { pid: 0xc, name: "obd2.engine.speed", min: 0, max: 16383, unit: RPM, frequency: 5 }, - { pid: 0xd, name: "obd2.vehicle.speed", min: 0, max: 255, unit: KM_H, frequency: 5 }, - { pid: 0xf, name: "obd2.intake.air.temperature", min: -40, max:215, unit: DEGREES_CELSIUS, frequency: 1 }, - { pid: 0x10, name: "obd2.mass.airflow", min: 0, max: 655, unit: GRAMS_SEC, frequency: 5 }, - { pid: 0x11, name: "obd2.throttle.position", min: 0, max: 100, unit: POURCENT, frequency: 5 }, - { pid: 0x1f, name: "obd2.running.time", min: 0, max: 65535, unit: SECONDS, frequency: 1 }, - { pid: 0x2d, name: "obd2.EGR.error", min: -100, max: 99, unit: POURCENT, frequency: 0 }, - { pid: 0x2f, name: "obd2.fuel.level", min: 0, max: 100, unit: POURCENT, frequency: 1 }, - { pid: 0x33, name: "obd2.barometric.pressure", min: 0, max: 255, unit: KPA, frequency: 1 }, - { pid: 0x4c, name: "obd2.commanded.throttle.position", min: 0, max: 100, unit: POURCENT, frequency: 1 }, - { pid: 0x52, name: "obd2.ethanol.fuel.percentage", min: 0, max: 100, unit: POURCENT, frequency: 1 }, - { pid: 0x5a, name: "obd2.accelerator.pedal.position", min: 0, max: 100, unit: POURCENT, frequency: 5 }, - { pid: 0x5b, name: "obd2.hybrid.battery-pack.remaining.life", min: 0, max: 100, unit: POURCENT, frequency: 5 }, - { pid: 0x5c, name: "obd2.engine.oil.temperature",min: -40, max: 210, unit: DEGREES_CELSIUS, frequency: 1 }, - { pid: 0x63, name: "obd2.engine.torque", min: 0, max: 65535, unit: NM, frequency: 1 }, -}; - /* { pid: 0x4, name: "engine.load", frequency: 5 }, { pid: 0x5, name: "engine.coolant.temperature", frequency: 1 }, @@ -104,3 +79,60 @@ const Obd2Pid OBD2_PIDS[] = { { pid: 0x63, name: "engine.torque", frequency: 1 }, }; */ + +/* Public: Check if a request is an OBD-II PID request. + * + * Returns true if the request is a mode 1 request and it has a 1 byte PID. + */ +bool isObd2Request(DiagnosticRequest* request); + +/* Public: Decode the payload of an OBD-II PID. + * + * This function matches the type signature for a DiagnosticResponseDecoder, so + * it can be used as the decoder for a DiagnosticRequest. It returns the decoded + * value of the PID, using the standard formulas (see + * http://en.wikipedia.org/wiki/OBD-II_PIDs#Mode_01). + */ +float handleObd2Pid(const DiagnosticResponse* response, float parsedPayload); + +/* + * Object to handle obd2 session with pre-scan of supported pid + * then request them regularly + */ +class Obd2Handler_c { + private: + /* + * Pre-defined OBD-II PIDs to query for if supported by the vehicle. + */ + const Obd2Pid OBD2_PIDS[] = { + { pid: 0x4, name: "obd2.engine.load", min:0, max: 100, unit: POURCENT, frequency: 5 }, + { pid: 0x5, name: "obd2.engine.coolant.temperature", min: -40, max: 215, unit: DEGREES_CELSIUS, frequency: 1 }, + { pid: 0xa, name: "obd2.fuel.pressure", min: 0, max: 765, unit: KPA, frequency: 1 }, + { pid: 0xb, name: "obd2.intake.manifold.pressure", min: 0, max: 255, unit: KPA, frequency: 1 }, + { pid: 0xc, name: "obd2.engine.speed", min: 0, max: 16383, unit: RPM, frequency: 5 }, + { pid: 0xd, name: "obd2.vehicle.speed", min: 0, max: 255, unit: KM_H, frequency: 5 }, + { pid: 0xf, name: "obd2.intake.air.temperature", min: -40, max:215, unit: DEGREES_CELSIUS, frequency: 1 }, + { pid: 0x10, name: "obd2.mass.airflow", min: 0, max: 655, unit: GRAMS_SEC, frequency: 5 }, + { pid: 0x11, name: "obd2.throttle.position", min: 0, max: 100, unit: POURCENT, frequency: 5 }, + { pid: 0x1f, name: "obd2.running.time", min: 0, max: 65535, unit: SECONDS, frequency: 1 }, + { pid: 0x2d, name: "obd2.EGR.error", min: -100, max: 99, unit: POURCENT, frequency: 0 }, + { pid: 0x2f, name: "obd2.fuel.level", min: 0, max: 100, unit: POURCENT, frequency: 1 }, + { pid: 0x33, name: "obd2.barometric.pressure", min: 0, max: 255, unit: KPA, frequency: 1 }, + { pid: 0x4c, name: "obd2.commanded.throttle.position", min: 0, max: 100, unit: POURCENT, frequency: 1 }, + { pid: 0x52, name: "obd2.ethanol.fuel.percentage", min: 0, max: 100, unit: POURCENT, frequency: 1 }, + { pid: 0x5a, name: "obd2.accelerator.pedal.position", min: 0, max: 100, unit: POURCENT, frequency: 5 }, + { pid: 0x5b, name: "obd2.hybrid.battery-pack.remaining.life", min: 0, max: 100, unit: POURCENT, frequency: 5 }, + { pid: 0x5c, name: "obd2.engine.oil.temperature",min: -40, max: 210, unit: DEGREES_CELSIUS, frequency: 1 }, + { pid: 0x63, name: "obd2.engine.torque", min: 0, max: 65535, unit: NM, frequency: 1 }, + }; + + /* + * Will be populated with constructor + */ + Obd2Pid supported_pids[]; + + public: + Obd2Handler_c(); + + bool isObd2Request(request); +} \ No newline at end of file -- 2.16.6