From c2b64916764395ea3cda7b237893c396ee2c1d4e Mon Sep 17 00:00:00 2001
From: Stanley Huang <stanleyhuangyc@gmail.com>
Date: Fri, 29 Aug 2014 22:06:56 +1000
Subject: added protocol enums for setProtocol()

---
 libraries/OBD/OBD.cpp |  4 ++--
 libraries/OBD/OBD.h   | 29 +++++++++++++++++++++--------
 2 files changed, 23 insertions(+), 10 deletions(-)

(limited to 'libraries')

diff --git a/libraries/OBD/OBD.cpp b/libraries/OBD/OBD.cpp
index 172730e..b881f73 100644
--- a/libraries/OBD/OBD.cpp
+++ b/libraries/OBD/OBD.cpp
@@ -218,9 +218,9 @@ bool COBD::getResult(byte& pid, int& result)
 	return true;
 }
 
-void COBD::setProtocol(byte h)
+void COBD::setProtocol(OBD_PROTOCOLS h)
 {
-	if (h == -1) {
+	if (h == PROTO_AUTO) {
 		write("ATSP00\r");
 	} else {
 		char cmd[8];
diff --git a/libraries/OBD/OBD.h b/libraries/OBD/OBD.h
index d47c3d3..f5d7e3a 100644
--- a/libraries/OBD/OBD.h
+++ b/libraries/OBD/OBD.h
@@ -75,10 +75,23 @@
 #define PID_ENGINE_TORQUE_PERCENTAGE 0x62
 #define PID_ENGINE_REF_TORQUE 0x63
 
+typedef enum {
+    PROTO_AUTO = 0,
+    PROTO_ISO_9141_2 = 3,
+    PROTO_KWP2000_5KBPS = 4,
+    PROTO_KWP2000_FAST = 5,
+    PROTO_CAN_11B_500K = 6,
+    PROTO_CAN_29B_500K = 7,
+    PROTO_CAN_29B_250K = 8,
+    PROTO_CAN_11B_250K = 9,
+} OBD_PROTOCOLS;
+
 // states
-#define OBD_DISCONNECTED 0
-#define OBD_CONNECTING 1
-#define OBD_CONNECTED 2
+typedef enum {
+    OBD_DISCONNECTED = 0,
+    OBD_CONNECTING = 1,
+    OBD_CONNECTED = 2
+} OBD_STATES;
 
 uint16_t hex2uint16(const char *p);
 uint8_t hex2uint8(const char *p);
@@ -97,20 +110,20 @@ public:
 	// un-initialize OBD-II connection
 	virtual void uninit();
 	// get connection state
-	byte getState() { return m_state; }
+	OBD_STATES getState() { return m_state; }
 	// read specified OBD-II PID value
 	virtual bool read(byte pid, int& result);
-	// set device into 
+	// set device into
 	virtual void sleep();
 	// wake up device from previous sleep
 	virtual void wakeup();
 	// set working protocol (default auto)
-	virtual void setProtocol(byte h = -1);
+	virtual void setProtocol(OBD_PROTOCOLS h = PROTO_AUTO);
 	// clear diagnostic trouble code
 	virtual void clearDTC();
 	// send query for specified PID
 	virtual void sendQuery(byte pid);
-	// retrive and parse the response of specifie PID 
+	// retrive and parse the response of specifie PID
 	virtual bool getResult(byte& pid, int& result);
 	// determine if the PID is supported
 	bool isValidPID(byte pid);
@@ -133,7 +146,7 @@ protected:
 	void recover();
 	void debugOutput(const char* s);
 	int normalizeData(byte pid, char* data);
-	byte m_state;
+	OBD_STATES m_state;
 private:
 	virtual uint8_t getPercentageValue(char* data)
 	{
-- 
cgit v1.2.3