From c3d4da2a22ebf430460e588adbe94c86324dbffe Mon Sep 17 00:00:00 2001
From: Tanner Collin <git@tannercollin.com>
Date: Sun, 17 Feb 2019 19:22:55 -0700
Subject: [PATCH] Reset blink error count, stop logging info data over serial

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

diff --git a/firmware/firmware.ino b/firmware/firmware.ino
index 6af3cdd..4dbd9cb 100644
--- a/firmware/firmware.ino
+++ b/firmware/firmware.ino
@@ -8,7 +8,7 @@
 #include <Ticker.h>
 #include <time.h>
 
-const char *FIRMWARE_VERSION = "MRWIZARD 0008 MRWIZARD";
+const char *FIRMWARE_VERSION = "MRWIZARD 0010 MRWIZARD";
 
 const char *WIFI_SSID PROGMEM = "Protospace";
 const char *WIFI_PASS PROGMEM = "yycmakers";
@@ -118,6 +118,7 @@ enum eventCodes
 	LOG_CARD_ACCEPTED,
 	LOG_CARD_DENIED,
 	LOG_UPDATE_FAILED,
+	LOG_TEST,
 };
 
 struct __attribute__((packed)) logData {
@@ -296,14 +297,14 @@ void checkCard()
 
 		if (authorizedCards.indexOf(cardStr) >= 0) {
 			if (SERIAL_LOGGING) Serial.println("[INFO] Card is authorized on machine.");
-			logEvent(LOG_CARD_ACCEPTED, cardStr.c_str(), cardStr.length());
 			if (lockState == LOCK_OFF) {
 				lockState = LOCK_PREARM;
 			}
+			logEvent(LOG_CARD_ACCEPTED, cardStr.c_str(), cardStr.length());
 		} else {
 			if (SERIAL_LOGGING) Serial.println("[INFO] Card not authorized on machine.");
-			logEvent(LOG_CARD_DENIED, cardStr.c_str(), cardStr.length());
 			LEDState = LED_ERROR;
+			logEvent(LOG_CARD_DENIED, cardStr.c_str(), cardStr.length());
 		}
 	}
 }
@@ -373,8 +374,8 @@ void processLockState()
 			} else {
 				if (SERIAL_LOGGING) Serial.println("[ERROR] Buttons held, aborting.");
 				logEvent(LOG_LOCK_ERROR);
-				lockState = LOCK_OFF;
 				LEDState = LED_ERROR;
+				lockState = LOCK_OFF;
 			}
 			break;
 		case LOCK_ARMED:
@@ -474,6 +475,7 @@ void processLEDState()
 				greenLEDOff();
 				redLEDOn();
 			} else {
+				LEDErrorBlinkCount = 0;
 				LEDState = LED_OFF;
 			}
 			break;
@@ -651,9 +653,8 @@ void postInfolog()
 
 	if (SERIAL_LOGGING) Serial.println("[INFO] Info state HTTP begin.");
 
-	if (SERIAL_LOGGING) Serial.print("[INFO] HTTP POST: ");
+	if (SERIAL_LOGGING) Serial.println("[INFO] HTTP POST.");
 	String postData = serializeLog();
-	if (SERIAL_LOGGING) Serial.println(postData);
 	int16_t infoHTTPCode = infoHTTP.POST(postData);
 	String infoHTTPCodeStr = String(infoHTTPCode);