Merge branch 'master' of https://github.com/stanleyhuangyc/ArduinoOBD

2 files changed, 51 insertions, 51 deletions

diff --git a/libraries/OBD/OBD.cpp b/libraries/OBD/OBD.cpp
index 8bcdb9c..3dba269 100644
--- a/libraries/OBD/OBD.cpp
+++ b/libraries/OBD/OBD.cpp
@@ -153,20 +153,20 @@ int COBD::normalizeData(byte pid, char* data)
 

 char* COBD::getResponse(byte& pid, char* buffer)

 {

-    while (receive(buffer, OBD_TIMEOUT_SHORT) > 0) {

-        char *p = buffer;

-        while ((p = strstr(p, "41 "))) {

-            p += 3;

-            byte curpid = hex2uint8(p);

-            if (pid == 0) pid = curpid;

-            if (curpid == pid) {

-                errors = 0;

-                p += 2;

-                if (*p == ' ')

-                    return p + 1;

-            }

-        }

-    }

+	while (receive(buffer, OBD_TIMEOUT_SHORT) > 0) {

+		char *p = buffer;

+		while ((p = strstr(p, "41 "))) {

+		    p += 3;

+		    byte curpid = hex2uint8(p);

+		    if (pid == 0) pid = curpid;

+		    if (curpid == pid) {

+		        errors = 0;

+		        p += 2;

+		        if (*p == ' ')

+		            return p + 1;

+		    }

+		}

+	}

 	return 0;

 }

 

@@ -185,13 +185,13 @@ bool COBD::getResult(byte& pid, int& result)
 

 void COBD::setProtocol(byte h)

 {

-    if (h == -1) {

-        write("ATSP00\r");

-    } else {

-        char cmd[8];

-        sprintf(cmd, "ATSP%d\r", h);

-        write(cmd);

-    }

+	if (h == -1) {

+		write("ATSP00\r");

+	} else {

+		char cmd[8];

+		sprintf(cmd, "ATSP%d\r", h);

+		write(cmd);

+	}

 }

 

 void COBD::sleep()

@@ -201,7 +201,7 @@ void COBD::sleep()
 

 void COBD::wakeup()

 {

-    write('\r');

+	write('\r');

 }

 

 bool COBD::isValidPID(byte pid)

@@ -262,7 +262,7 @@ void COBD::recover()
 

 bool COBD::init(byte protocol)

 {

-    const char *initcmd[] = {"ATZ\r","ATE0\r","ATL1\r"};

+	const char *initcmd[] = {"ATZ\r","ATE0\r","ATL1\r"};

 	char buffer[OBD_RECV_BUF_SIZE];

 

 	m_state = OBD_CONNECTING;

@@ -279,30 +279,30 @@ bool COBD::init(byte protocol)
 		delay(50);

 	}

 	if (protocol) {

-        write("ATSP");

-        write('0' + protocol);

-        write('\r');

-        receive(buffer);

-        delay(50);

+	        write("ATSP");

+	        write('0' + protocol);

+	        write('\r');

+	        receive(buffer);

+	        delay(50);

 	}

 	while (available()) read();

 

-    // load pid map

-    memset(pidmap, 0, sizeof(pidmap));

-    for (byte i = 0; i < 4; i++) {

-        byte pid = i * 0x20;

-        sendQuery(pid);

-        char* data = getResponse(pid, buffer);

-        if (!data) break;

-        data--;

-        for (byte n = 0; n < 4; n++) {

-            if (data[n * 3] != ' ')

-                break;

-            pidmap[i * 4 + n] = hex2uint8(data + n * 3 + 1);

-        }

-        delay(100);

-    }

-    while (available()) read();

+	// load pid map

+	memset(pidmap, 0, sizeof(pidmap));

+	for (byte i = 0; i < 4; i++) {

+		byte pid = i * 0x20;

+		sendQuery(pid);

+		char* data = getResponse(pid, buffer);

+		if (!data) break;

+		data--;

+		for (byte n = 0; n < 4; n++) {

+			if (data[n * 3] != ' ')

+				break;

+			pidmap[i * 4 + n] = hex2uint8(data + n * 3 + 1);

+		}

+		delay(100);

+	}

+	while (available()) read();

 

 	m_state = OBD_CONNECTED;

 	errors = 0;

@@ -451,12 +451,12 @@ void COBDI2C::loadData()
 

 uint16_t COBDI2C::getData(byte pid, int& result)

 {

-    byte n;

-    for (n = 0; n < MAX_PIDS && obdPid[n] != pid; n++);

-    if (n == MAX_PIDS)

-        return -1;

-

-    PID_INFO* pi = obdInfo + n;

+	byte n;

+	for (n = 0; n < MAX_PIDS && obdPid[n] != pid; n++);

+	if (n == MAX_PIDS)

+		return -1;

+	

+	PID_INFO* pi = obdInfo + n;

 	switch (pid) {

 	case PID_RPM:

 		result = pi->value >> 2;

diff --git a/libraries/OBD/OBD.h b/libraries/OBD/OBD.h
index 1877306..22d9f12 100644
--- a/libraries/OBD/OBD.h
+++ b/libraries/OBD/OBD.h
@@ -81,7 +81,7 @@ protected:
 	virtual void write(const char* s);

 	virtual void write(char c);

 	virtual void dataIdleLoop() {}

-    void recover();

+	void recover();

 	void debugOutput(const char* s);

 	int normalizeData(byte pid, char* data);

 	byte m_state;