working communication

HostCommunication.cpp

@@ -0,0 +1,80 @@
+//
+// Created by robin on 5/5/16.
+//
+
+#include "HostCommunication.h"
+
+#include <Arduino.h>
+
+HostCommunication::HostCommunication()
+{
+}
+
+void HostCommunication::init()
+{
+    Serial.begin(SERIAL_BAUDRATE);
+    debug("Starting...");
+}
+
+void HostCommunication::debug(String str)
+{
+#ifdef DEBUG
+    send(PACKET_DEBUG, str);
+#endif
+}
+
+void HostCommunication::selfTest()
+{
+    send(PACKET_SELF_TEST);
+}
+
+void HostCommunication::login(String uid, String password)
+{
+    send(PACKET_LOGIN, uid + "\n" + password);
+}
+
+void HostCommunication::send(SERIAL_PACKET_TYPE type)
+{
+    send(type, "");
+}
+
+void HostCommunication::send(SERIAL_PACKET_TYPE type, String str)
+{
+    Serial.write((SERIAL_PACKET_TYPE)type);
+    Serial.write((SERIAL_PACKET_LENGTH_TYPE)str.length());
+    Serial.write(str.c_str());
+}
+
+HostCommunicationResult HostCommunication::read(int timeout)
+{
+    HostCommunicationResult res;
+    res.length = 0;
+    res.data = 0;
+    res.isSuccess = false;
+    if (!waitData(timeout, sizeof(SERIAL_PACKET_LENGTH_TYPE))) {
+        return res;
+    }
+
+    SERIAL_PACKET_LENGTH_TYPE length = 0;
+    Serial.readBytes((char*)&length, sizeof(SERIAL_PACKET_LENGTH_TYPE));
+
+    if (!waitData(timeout, length)) {
+        return res;
+    }
+
+    res.data = new char[length];
+    Serial.readBytes(res.data, length);
+    res.isSuccess = true;
+    res.length = length;
+
+    return res;
+}
+
+bool HostCommunication::waitData(int timeout, int length)
+{
+    unsigned long secs = millis();
+    while (Serial.available() < length && millis() - secs < timeout) {
+        delay(1);
+    }
+    return Serial.available() >= length;
+}

HostCommunication.h

@@ -0,0 +1,41 @@
+//
+// Created by robin on 5/5/16.
+//
+
+#ifndef DIGICODE_HOSTCOMMUNICATION_H
+#define DIGICODE_HOSTCOMMUNICATION_H
+
+#include <WString.h>
+
+#include "config.h"
+
+struct HostCommunicationResult
+{
+    char* data;
+    int length;
+    bool isSuccess;
+};
+
+class HostCommunication
+{
+public:
+    HostCommunication();
+
+    void init();
+
+    void debug(String str);
+    void selfTest();
+    void login(String uid, String password);
+
+    HostCommunicationResult read(int timeout);
+
+protected:
+
+    void send(SERIAL_PACKET_TYPE type);
+    void send(SERIAL_PACKET_TYPE type, String str);
+
+    bool waitData(int timeout, int length);
+};
+
+
+#endif //DIGICODE_HOSTCOMMUNICATION_H

config.h

@@ -0,0 +1,50 @@
+//
+// Created by robin on 5/5/16.
+//
+
+#ifndef DIGICODE_CONFIG_H
+#define DIGICODE_CONFIG_H
+
+
+#define KP_ROWS 4
+#define KP_COLS 4
+
+#define LCD_ROWS 2
+#define LCD_COLS 16
+
+#define SELF_TEST_LABEL "Self testing..."
+#define SELF_TEST_ERROR_LABEL "Error: "
+#define UID_LABEL "UID:"
+#define PWD_LABEL "PWD:"
+#define LOGIN_IN_PROGRESS "Login..."
+#define LOGIN_FAILED "Login failed"
+#define LOGIN_SUCCESS "Access granted"
+
+#define UID_MAX_LEN 12
+#define PWD_MAX_LEN 12
+
+#define MAX_IDLE_TIME 20
+
+#define LOGIN_FAILED_TIME 2
+
+#define SELF_TEST_INTERVAL 60
+#define SELF_TEST_ERROR_INTERVAL 2
+#define MAX_SELF_TEST_TIME 5
+
+#define SERIAL_BAUDRATE 9600
+#define SERIAL_PACKET_TYPE unsigned char
+#define SERIAL_PACKET_LENGTH_TYPE unsigned char
+#define SERIAL_PACKET_TYPE_INT unsigned char
+
+#define ERROR_NONE 0
+#define ERROR_HOST_PROTOCOL 1
+#define ERROR_HOST_TIMEOUT 2
+
+#define PACKET_DEBUG 1
+#define PACKET_SELF_TEST 2
+#define PACKET_LOGIN 3
+
+#define DEBUG
+
+
+#endif //DIGICODE_CONFIG_H

main.ino

@@ -2,9 +2,10 @@
 #include <Keypad/Keypad.h>
 #include <LiquidCrystal.h>
 
+#include "config.h"
+
+#include "HostCommunication.h"
 
-#define KP_ROWS 4
-#define KP_COLS 4
 char keys[KP_ROWS][KP_COLS] = {
         {'1','2','3','A'},
         {'4','5','6','B'},
@@ -16,21 +17,9 @@ byte colPins[KP_COLS] = {8, 9, 10, 11};
 Keypad keypad = Keypad(makeKeymap(keys), rowPins, colPins, KP_ROWS, KP_COLS);
 
 
-#define LCD_ROWS 2
-#define LCD_COLS 16
 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 LOGIN_IN_PROGRESS "Login..."
-#define LOGIN_FAILED "Login failed"
-#define LOGIN_SUCCESS "Access granted"
-
-#define UID_MAX_LEN 12
-#define PWD_MAX_LEN 12
 String uid;
 String password;
 enum Status {
@@ -43,21 +32,16 @@ enum Status {
 };
 Status status = Uid;
 
-#define MAX_IDLE_TIME 20
 unsigned long lastActivity = 0;
 
-#define LOGIN_FAILED_TIME 2
-
-#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;
+int lastSelfTestResult = ERROR_NONE;
+
+HostCommunication hostCommunication;
 
 void setup() {
-    Serial.begin(9600);
-    Serial.println("Starting...");
+
+    hostCommunication.init();
 
     lcd.begin(LCD_COLS, LCD_ROWS);
     lcd.blink();
@@ -140,7 +124,7 @@ bool handleKeyPad()
 
 void updateLcd()
 {
-    Serial.println("Update LCD");
+    hostCommunication.debug("Update LCD");
     lcd.clear();
     if (status ==  Uid || status == Password)
     {
@@ -159,7 +143,7 @@ void updateLcd()
     }
     else if (status == SelfTest) {
         lcd.print(SELF_TEST_LABEL);
-        if (lastSelfTestResult != SELF_TEST_NO_ERROR) {
+        if (lastSelfTestResult != ERROR_NONE) {
             lcd.setCursor(0, 1);
             lcd.print(SELF_TEST_ERROR_LABEL);
             lcd.print(lastSelfTestResult);
@@ -191,8 +175,7 @@ void login(String uid, String password)
 
     delay(LOGIN_FAILED_TIME * 1000);
 
-    Serial.println(uid);
-    Serial.println(password);
+    hostCommunication.login(uid, password);
 
     status = LoginSuccess;
     updateLcd();
@@ -204,24 +187,35 @@ void login(String uid, String password)
 
 void selfTest()
 {
-    lastSelfTest = SELF_TEST_NO_ERROR;
+    lastSelfTest = ERROR_NONE;
     status = SelfTest;
     updateLcd();
 
     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);
-            }
+        hostCommunication.debug("Self Testing");
+        hostCommunication.selfTest();
+
+        HostCommunicationResult res = hostCommunication.read(MAX_SELF_TEST_TIME * 1000);
+
+        if (!res.isSuccess) {
+            lastSelfTestResult = ERROR_HOST_TIMEOUT;
+        }
+        else if (res.length != sizeof(SERIAL_PACKET_TYPE_INT)) {
+            lastSelfTestResult = ERROR_HOST_PROTOCOL;
+        }
+        else {
+            lastSelfTestResult = *(SERIAL_PACKET_TYPE_INT*)res.data;
+        }
+
+        delete res.data;
+
+        if (lastSelfTestResult == ERROR_NONE) {
+            test = false;
+        }
+        else {
+            updateLcd();
+            delay(SELF_TEST_ERROR_INTERVAL * 1000);
         }
     }
     lastSelfTest = millis() / 1000;