Beginning of Obd2 handling with a handle object

inspired from openxc library.

Change-Id: I664eb8dde9bccb29e7be3642df9e5c0f0cf25d28
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>

3 files changed, 139 insertions, 106 deletions

diff --git a/can-signals.h b/can-signals.h
index 394c8673..f34c743e 100644
--- a/can-signals.h
+++ b/can-signals.h
@@ -6,7 +6,7 @@
  * 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
+ *	 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,
@@ -18,41 +18,41 @@
 #pragma once
 
 #include "can-utils.h"
+#include <string>
 
 /** Public: Return the currently active CAN configuration. */
 CanMessageSet* getActiveMessageSet();
 
 /** Public: Retrive a list of all possible CAN configurations.
- *  *
- *   * Returns a pointer to an array of all configurations.
- *    */
+ *	*
+ *	 * Returns a pointer to an array of all configurations.
+ *	  */
 CanMessageSet* getMessageSets();
 
 /** Public: Return the length of the array returned by getMessageSets() */
 int getMessageSetCount();
 
 /* Public: Return the number of CAN buses configured in the active
- *  * configuration. This is limited to 2, as the hardware controller only has 2
- *   * CAN channels.
- *    */
+ *	* configuration. This is limited to 2, as the hardware controller only has 2
+ *	 * CAN channels.
+ *	  */
 int getCanBusCount();
 
 /* Public: Return an array of all CAN messages to be processed in the active
- *  * configuration.
- *   */
+ *	* configuration.
+ *	 */
 CanMessageDefinition* getMessages();
 
-/* Public: Return an array of all CAN signals to be processed in the active
- * configuration.
+/* Public: Return signals from an signals array filtered on name.
  */
-CanSignal* getSignals();
+CanSignal* getSignals(std::string name);
 
 /* Public: Return an array of all OpenXC CAN commands enabled in the active
- *  * configuration that can write back to CAN with a custom handler.
- *   *
- *    * Commands not defined here are handled using a 1-1 mapping from the signals
- *     * list.
- *      */
+ *	* configuration that can write back to CAN with a custom handler.
+ *	 *
+ *	  * Commands not defined here are handled using a 1-1 mapping from the signals
+ *	   * list.
+ *		*/
 CanCommand* getCommands();
 
 /* Public: Return the length of the array returned by getCommandCount(). */
@@ -65,20 +65,20 @@ int getSignalCount();
 int getMessageCount();
 
 /* Public: Return an array of the metadata for the 2 CAN buses you want to
- *  * monitor. The size of this array is fixed at 2.
- *   */
+ *	* monitor. The size of this array is fixed at 2.
+ *	 */
 CanBus* getCanBuses();
 
 /* Public: Decode CAN signals from raw CAN messages, translate from engineering
- *  * units to something more human readable, and send the resulting value over USB
- *   * as an OpenXC-style JSON message.
- *    *
- *     * This is the main workhorse function of the VI. Every time a new
- *      * CAN message is received that matches one of the signals in the list returend
- *       * by getSignals(), this function is called with the message ID and 64-bit data
- *        * field.
- *         *
- *          * bus - The CAN bus this message was received on.
- *           * message - The received CAN message.
- *            */
-void decodeCanMessage(openxc::pipeline::Pipeline* pipeline, CanBus* bus, CanMessage* message);
\ No newline at end of file
+ *	* units to something more human readable, and send the resulting value over USB
+ *	 * as an OpenXC-style JSON message.
+ *	  *
+ *	   * This is the main workhorse function of the VI. Every time a new
+ *		* CAN message is received that matches one of the signals in the list returend
+ *		 * by getSignals(), this function is called with the message ID and 64-bit data
+ *		  * field.
+ *		   *
+ *			* bus - The CAN bus this message was received on.
+ *			 * message - The received CAN message.
+ *			  */
+void decodeCanMessage(openxc::pipeline::Pipeline* pipeline, CanBus* bus, CanMessage* message);
diff --git a/obd2.cpp b/obd2.cpp
index 799f23dd..7db5d97d 100644
--- a/obd2.cpp
+++ b/obd2.cpp
@@ -6,7 +6,7 @@
  * 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
+ *	 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,
@@ -15,24 +15,45 @@
  * 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.
- */
+
+void shims_logger(afb_binding_interface *itf)
+{
+	//DEBUG(itf, "dd");
+}
+
+void shims_timer()
+{
+}
 
 /*
  * Will scan for supported Obd2 pids
  */
-Obd2Handler::Obd2Handler() {
+Obd2Handler::Obd2Handler(afb_binding_interface *itf, CanBus_c cb)
+{
+	CanBus_c can_bus = cb;
+	DiagnosticShims shims = diagnostic_init_shims(shims_logger, can_bus.send_can_message, NULL);
+
+	int n_pids, i;
 
+	n_pids = size(Obd2Pid);
+	for(i=0; i<=n_pids; i++)
+	{
+	}
 }
 
-Obd2Handler::isObd2Request(DiagnosticRequest* request) {
-    return request->mode == 0x1 && request->has_pid && request->pid < 0xff;
+Obd2Handler::add_request(int pid)
+{
+	DiagnosticRequest request = {
+	arbitration_id: OBD2_FUNCTIONAL_BROADCAST_ID,
+	mode: 0x1, has_pid: true, pid: pid};
 }
 
-Obd2Handler::decodeObd2Response(obd2response responce)
\ No newline at end of file
+Obd2Handler::is_obd2_request(DiagnosticRequest* request)
+{
+	return request->mode == 0x1 && request->has_pid && request->pid < 0xff;
+}
+
+Obd2Handler::decode_obd2_response(DiagnosticResponse* responce)
+{
+	return diagnostic_decode_obd2_pid(response);
+}
diff --git a/obd2.h b/obd2.h
index da9331b3..862c04a2 100644
--- a/obd2.h
+++ b/obd2.h
@@ -6,7 +6,7 @@
  * 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
+ *	 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,
@@ -16,12 +16,12 @@
  */
 
 /*
- *  A representation of an OBD-II PID.
+ *	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.
+ *		when automatic, recurring OBD-II requests are enabled.
  */
 
 enum UNIT {
@@ -50,39 +50,56 @@ const char *UNIT_NAMES[10] = {
 	"NM"
 };
 
+
+/*
+ *	A representation of an OBD-II PID.
+ *
+ * pid - The 1 byte PID.
+ * name - A human readable name to use for this PID when published.
+ * min - minimum value for this pid
+ * max - maximum value for this pid
+ * unit - unit used
+ * frequency - The frequency to request this PID if supported by the vehicle
+ *		when automatic, recurring OBD-II requests are enabled.
+ *	supported - is it supported by the vehicle. Initialized after scan
+ * event - application framework event handler.
+ * 
+ */
 typedef struct _Obd2Pid {
-    uint8_t pid;
-    const char* name;
-    const int min;
-    const int max;
-    enum UNIT unit;
-    int frequency;
+	uint8_t pid;
+	const char* name;
+	const int min;
+	const int max;
+	enum UNIT unit;
+	int frequency;
+	bool supported;
+	struct afb_event event;
 } Obd2Pid;
 
 /*
-    { pid: 0x4, name: "engine.load", frequency: 5 },
-    { pid: 0x5, name: "engine.coolant.temperature", frequency: 1 },
-    { pid: 0xa, name: "fuel.pressure", frequency: 1 },
-    { pid: 0xb, name: "intake.manifold.pressure", frequency: 1 },
-    { pid: 0xc, name: "engine.speed", frequency: 5 },
-    { pid: 0xd, name: "vehicle.speed", frequency: 5 },
-    { pid: 0xf, name: "intake.air.temperature", frequency: 1 },
-    { pid: 0x10, name: "mass.airflow", frequency: 5 },
-    { pid: 0x11, name: "throttle.position", frequency: 5 },
-    { pid: 0x1f, name: "running.time", frequency: 1 },
-    { pid: 0x27, name: "fuel.level", frequency: 1 },
-    { pid: 0x33, name: "barometric.pressure", frequency: 1 },
-    { pid: 0x4c, name: "commanded.throttle.position", frequency: 1 },
-    { pid: 0x52, name: "ethanol.fuel.percentage", frequency: 1 },
-    { pid: 0x5a, name: "accelerator.pedal.position", frequency: 5 },
-    { pid: 0x5c, name: "engine.oil.temperature", frequency: 1 },
-    { pid: 0x63, name: "engine.torque", frequency: 1 },
+	{ pid: 0x4, name: "engine.load", frequency: 5 },
+	{ pid: 0x5, name: "engine.coolant.temperature", frequency: 1 },
+	{ pid: 0xa, name: "fuel.pressure", frequency: 1 },
+	{ pid: 0xb, name: "intake.manifold.pressure", frequency: 1 },
+	{ pid: 0xc, name: "engine.speed", frequency: 5 },
+	{ pid: 0xd, name: "vehicle.speed", frequency: 5 },
+	{ pid: 0xf, name: "intake.air.temperature", frequency: 1 },
+	{ pid: 0x10, name: "mass.airflow", frequency: 5 },
+	{ pid: 0x11, name: "throttle.position", frequency: 5 },
+	{ pid: 0x1f, name: "running.time", frequency: 1 },
+	{ pid: 0x27, name: "fuel.level", frequency: 1 },
+	{ pid: 0x33, name: "barometric.pressure", frequency: 1 },
+	{ pid: 0x4c, name: "commanded.throttle.position", frequency: 1 },
+	{ pid: 0x52, name: "ethanol.fuel.percentage", frequency: 1 },
+	{ pid: 0x5a, name: "accelerator.pedal.position", frequency: 5 },
+	{ pid: 0x5c, name: "engine.oil.temperature", frequency: 1 },
+	{ 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.
+ * Returns true if the request is a mode 1	request and it has a 1 byte PID.
  */
 bool isObd2Request(DiagnosticRequest* request);
 
@@ -100,39 +117,34 @@ float handleObd2Pid(const DiagnosticResponse* response, float parsedPayload);
  * 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[];
+	private:
+		/*
+		* Pre-defined OBD-II PIDs to query for if supported by the vehicle.
+		*/
+		const Obd2Pid OBD2_PIDS[] = {
+			{ pid: 0x04, name: "obd2.engine.load", min:0, max: 100, unit: POURCENT, frequency: 5, supported: false },
+			{ pid: 0x05, name: "obd2.engine.coolant.temperature", min: -40, max: 215, unit: DEGREES_CELSIUS, frequency: 1, supported: false },
+			{ pid: 0x0a, name: "obd2.fuel.pressure", min: 0, max: 765, unit: KPA, frequency: 1, supported: false },
+			{ pid: 0x0b, name: "obd2.intake.manifold.pressure", min: 0, max: 255, unit: KPA, frequency: 1, supported: false },
+			{ pid: 0x0c, name: "obd2.engine.speed", min: 0, max: 16383, unit: RPM, frequency: 5, supported: false },
+			{ pid: 0x0d, name: "obd2.vehicle.speed", min: 0, max: 255, unit: KM_H, frequency: 5, supported: false },
+			{ pid: 0x0f, name: "obd2.intake.air.temperature", min: -40, max:215, unit: DEGREES_CELSIUS, frequency: 1, supported: false },
+			{ pid: 0x10, name: "obd2.mass.airflow", min: 0, max: 655, unit: GRAMS_SEC, frequency: 5, supported: false },
+			{ pid: 0x11, name: "obd2.throttle.position", min: 0, max: 100, unit: POURCENT, frequency: 5, supported: false },
+			{ pid: 0x1f, name: "obd2.running.time", min: 0, max: 65535, unit: SECONDS, frequency: 1, supported: false },
+			{ pid: 0x2d, name: "obd2.EGR.error", min: -100, max: 99, unit: POURCENT, frequency: 0, supported: false },
+			{ pid: 0x2f, name: "obd2.fuel.level", min: 0, max: 100, unit: POURCENT, frequency: 1, supported: false },
+			{ pid: 0x33, name: "obd2.barometric.pressure", min: 0, max: 255, unit: KPA, frequency: 1, supported: false },
+			{ pid: 0x4c, name: "obd2.commanded.throttle.position", min: 0, max: 100, unit: POURCENT, frequency: 1, supported: false },
+			{ pid: 0x52, name: "obd2.ethanol.fuel.percentage", min: 0, max: 100, unit: POURCENT, frequency: 1, supported: false },
+			{ pid: 0x5a, name: "obd2.accelerator.pedal.position", min: 0, max: 100, unit: POURCENT, frequency: 5, supported: false },
+			{ pid: 0x5b, name: "obd2.hybrid.battery-pack.remaining.life", min: 0, max: 100, unit: POURCENT, frequency: 5, supported: false },
+			{ pid: 0x5c, name: "obd2.engine.oil.temperature",min: -40, max: 210, unit: DEGREES_CELSIUS, frequency: 1, supported: false },
+			{ pid: 0x63, name: "obd2.engine.torque", min: 0, max: 65535, unit: NM, frequency: 1, supported: false },
+		};
 
-        public:
-            Obd2Handler_c();
-            
-            bool isObd2Request(request);
-}
\ No newline at end of file
+		public:
+			Obd2Handler_c();
+			
+			bool isObd2Request(request);
+}