From 2fcbdcede2f0c36bf059a7f748d27eedef411866 Mon Sep 17 00:00:00 2001
From: Stanley Huang <stanleyhuangyc@gmail.com>
Date: Fri, 4 Apr 2014 10:10:27 +0800
Subject: Fix MEGA Logger issues

---
 megalogger/megalogger.ino | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

(limited to 'megalogger/megalogger.ino')

diff --git a/megalogger/megalogger.ino b/megalogger/megalogger.ino
index da65d6d..d65eec1 100644
--- a/megalogger/megalogger.ino
+++ b/megalogger/megalogger.ino
@@ -132,7 +132,7 @@ public:
         lcd.printInt(index);
 #endif
 
-#ifndef MEMORY_SAVING
+#if 0
         showECUCap();
         delay(1000);
 #endif
@@ -448,14 +448,12 @@ private:
         for (byte i = 0; i < sizeof(pidlist) / sizeof(pidlist[0]); i++) {
             lcd.setCursor(160, i * 2 + 4);
             lcd.print(namelist[i]);
-        }
-        for (byte i = 0; i < sizeof(pidlist) / sizeof(pidlist[0]); i++) {
+            lcd.write(' ');
             bool valid = isValidPID(pidlist[i]);
             lcd.setTextColor(valid ? RGB16_GREEN : RGB16_RED);
-            lcd.setCursor(304, i * 2 + 4);
             lcd.draw(valid ? tick : cross, 16, 16);
+            lcd.setTextColor(RGB16_WHITE);
         }
-        lcd.setTextColor(RGB16_WHITE);
     }
     void reconnect()
     {
@@ -467,8 +465,16 @@ private:
         lcd.print("Reconnecting...");
         state &= ~(STATE_OBD_READY | STATE_ACC_READY | STATE_DATE_SAVED);
         //digitalWrite(SD_CS_PIN, LOW);
-        for (int i = 0; !init(); i++) {
-            if (i == 10) lcd.clear();
+        for (uint16_t i = 0; ; i++) {
+            if (i == 5) {
+                lcd.backlight(false);
+                lcd.clear();
+            }
+            if (init()) {
+                int value;
+                if (read(PID_RPM, value) && value > 0)
+                    break;
+            }
         }
         fileIndex++;
         setup();
-- 
cgit v1.2.3