self testing

main.ino

@@ -22,6 +22,7 @@ LiquidCrystal lcd(2, 3, 4, 5, 6, 7);
 
 
 #define SELF_TEST_LABEL "Self testing..."
+#define SELF_TEST_ERROR_LABEL "Error: "
 #define UID_LABEL "UID:"
 #define PWD_LABEL "PWD:"
 #define UID_MAX_LEN 12
@@ -37,8 +38,12 @@ Status status = Uid;
 
 #define MAX_IDLE_TIME 20
 unsigned long lastActivity = 0;
-#define SELF_TEST_INTERVAL 10
+#define SELF_TEST_INTERVAL 60
+#define SELF_TEST_ERROR_INTERVAL 2
+#define MAX_SELF_TEST_TIME 5
 unsigned long lastSelfTest = 0;
+#define SELF_TEST_NO_ERROR '0'
+int lastSelfTestResult = SELF_TEST_NO_ERROR;
 
 void setup() {
     Serial.begin(9600);
@@ -48,7 +53,7 @@ void setup() {
     lcd.blink();
     lcd.noAutoscroll();
 
-    reset();
+    selfTest();
 }
 
 String makeChars(char c, int count) {
@@ -82,7 +87,7 @@ void loop() {
         updateLcd();
     }
     if ((uid.length() != 0 || password.length() != 0) && secs - lastActivity >= MAX_IDLE_TIME) {
-        reset();
+        askUidPassword();
     }
     if (uid.length() == 0 && password.length() == 0 && secs - lastSelfTest >= SELF_TEST_INTERVAL) {
         selfTest();
@@ -140,10 +145,15 @@ void updateLcd()
     }
     else if (status == SelfTest) {
         lcd.print(SELF_TEST_LABEL);
+        if (lastSelfTestResult != SELF_TEST_NO_ERROR) {
+            lcd.setCursor(0, 1);
+            lcd.print(SELF_TEST_ERROR_LABEL);
+            lcd.print(lastSelfTestResult);
+        }
     }
 }
 
-void reset()
+void askUidPassword()
 {
     status = Uid;
     uid = "";
@@ -155,16 +165,31 @@ void login(String uid, String password)
 {
     Serial.println(uid);
     Serial.println(password);
-    reset();
+    askUidPassword();
 }
 
 void selfTest()
 {
+    lastSelfTest = SELF_TEST_NO_ERROR;
     status = SelfTest;
     updateLcd();
-    Serial.println("Self Testing");
-//    while (Serial.available() == 0);
-    Serial.read();
+
+    bool test = true;
+    while (test) {
+        unsigned long secs = millis() / 1000;
+        Serial.println("Self Testing");
+        while (Serial.available() == 0 && (millis() / 1000) - secs < MAX_SELF_TEST_TIME);
+        if (Serial.available() > 0) {
+            lastSelfTestResult = Serial.read();
+            if (lastSelfTestResult == SELF_TEST_NO_ERROR) {
+                test = false;
+            }
+            else {
+                updateLcd();
+                delay(SELF_TEST_ERROR_INTERVAL * 1000);
+            }
+        }
+    }
     lastSelfTest = millis() / 1000;
-    reset();
+    askUidPassword();
 }