Merge pull request #96 from omersiar/dev

Dev
esprfid · Mar 30, 2018 · 604d667 · 604d667
2 parents 4707674 + dd129db
commit 604d667
Show file tree

Hide file tree

Showing 11 changed files with 287 additions and 53 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,17 @@
 All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
+#### Fixed
+- [webui] We were checking wrongly if the browser has previously had authentication over /login.
+- [webui] MQTT listed disabled even if it is enabled #92 @pidiet
+
+#### Added
+- [firmware] + [webui] Option to use static IP address #89 @nbaglietto
+- [firmware] + [webui] Option to hide SSID on AP Mode #89 @nbaglietto
+- [webui] Auto focus on login password #94 @pidiet
+- [firmware] event log for MQTT
+
+## [0.7.0] - 2018-03-23
 #### Added
 - [firmware] !!! BREAKING CHANGE !!! 2 MB Flash 2 MB SPIFFS size for future proof firmware updates plase make sure you made a backup before updating to this version. You need to format SPIFFS.
 - [firmware] Experimental PN532 RFID Reader Support

diff --git a/bin/blank4mb.bin b/bin/blank4mb.bin
diff --git a/bin/erase.bat b/bin/erase.bat
@@ -0,0 +1,4 @@
+echo off
+cls
+set /p com=Enter which COM Port your ESP is connected eg. COM1 COM2 COM7: 
+esptool.exe -vv -cd nodemcu -cb 921600 -cp %com% -ca 0x000000 -cf blank4mb.bin
diff --git a/bin/firmware.bin b/bin/firmware.bin
diff --git a/src/main.cpp b/src/main.cpp
@@ -1,6 +1,6 @@
 /*
-   Copyright (c) 2017 Ömer Şiar Baysal
-   Copyright (c) 2018 ESP-RFID Community
+    Authors :   Ömer Şiar Baysal
+                ESP-RFID Community
 
    Released to Public Domain
 
@@ -397,11 +397,17 @@ void ICACHE_FLASH_ATTR disableWifi() {
 #endif
 }
 
-bool ICACHE_FLASH_ATTR startAP(const char * ssid, const char * password = NULL) {
+bool ICACHE_FLASH_ATTR startAP(const char * ssid, const char * password = NULL, int hid = NULL) {
     inAPMode = true;
     WiFi.mode(WIFI_AP);
     Serial.print(F("[ INFO ] Configuring access point... "));
-    bool success = WiFi.softAP(ssid, password);
+    bool success;
+    if (hid == 1) {
+        success = WiFi.softAP(ssid, password, 3, true);
+    }
+    else {
+        success = WiFi.softAP(ssid, password);
+    }
     Serial.println(success ? "Ready" : "Failed!");
     if (!success) {ESP.restart();}
     // Access Point IP
@@ -426,7 +432,6 @@ void ICACHE_FLASH_ATTR fallbacktoAPMode() {
 // Try to connect Wi-Fi
 bool ICACHE_FLASH_ATTR connectSTA(const char* ssid, const char* password, byte bssid[6]) {
     WiFi.disconnect(true);
-    WiFi.mode(WIFI_STA);
     // First connect to a wi-fi network
     WiFi.begin(ssid, password, 0, bssid);
     // Inform user we are trying to connect
@@ -851,11 +856,49 @@ void ICACHE_FLASH_ATTR onWsEvent(AsyncWebSocket * server, AsyncWebSocketClient *
 }
 
 void onMqttDisconnect(AsyncMqttClientDisconnectReason reason) {
+    String reasonstr = "";
+    switch (reason) {
+        case (AsyncMqttClientDisconnectReason::TCP_DISCONNECTED):
+            reasonstr = "TCP_DISCONNECTED";
+            break;
+        case (AsyncMqttClientDisconnectReason::MQTT_UNACCEPTABLE_PROTOCOL_VERSION):
+            reasonstr = "MQTT_UNACCEPTABLE_PROTOCOL_VERSION";
+            break;
+        case (AsyncMqttClientDisconnectReason::MQTT_IDENTIFIER_REJECTED):
+            reasonstr = "MQTT_IDENTIFIER_REJECTED";
+            break;
+        case (AsyncMqttClientDisconnectReason::MQTT_SERVER_UNAVAILABLE):
+            reasonstr = "MQTT_SERVER_UNAVAILABLE";
+            break;
+        case (AsyncMqttClientDisconnectReason::MQTT_MALFORMED_CREDENTIALS):
+            reasonstr = "MQTT_MALFORMED_CREDENTIALS";
+            break;
+        case (AsyncMqttClientDisconnectReason::MQTT_NOT_AUTHORIZED):
+            reasonstr = "MQTT_NOT_AUTHORIZED";
+            break;
+        case (AsyncMqttClientDisconnectReason::ESP8266_NOT_ENOUGH_SPACE):
+            reasonstr = "ESP8266_NOT_ENOUGH_SPACE";
+            break;
+        default:
+            reasonstr = "Unknown";
+            break;
+    }
+    writeEvent("WARN", "mqtt", "Disconnected from MQTT server", reasonstr);
     if (WiFi.isConnected()) {
         mqttReconnectTimer.once(2, connectToMqtt);
     }
 }
 
+void onMqttPublish(uint16_t packetId) {
+    writeEvent("INFO", "mqtt", "MQTT publish acknowledged", String(packetId));
+}
+
+void onMqttConnect(bool sessionPresent) {
+    if (sessionPresent == true) {
+        writeEvent("INFO", "mqtt", "Connected to MQTT Server", "Session Present");
+    }
+}
+
 
 
 bool ICACHE_FLASH_ATTR loadConfiguration() {
@@ -947,25 +990,59 @@ bool ICACHE_FLASH_ATTR loadConfiguration() {
     ws.setAuthentication("admin", http_pass);
 
     if (wmode == 1) {
+        int hid = network["hide"].as<int>();
         Serial.println(F("[ INFO ] ESP-RFID is running in AP Mode "));
-        return startAP(ssid, password);
+        return startAP(ssid, password, hid);
     }
-    else if (!connectSTA(ssid, password, bssid)) {
-        return false;
+    else {
+        if (network["dhcp"] == "0") {
+            WiFi.mode(WIFI_STA);
+
+            const char * clientipch = network["ip"];
+            const char * subnetch = network["subnet"];
+            const char * gatewaych = network["gateway"];
+            const char * dnsch = network["dns"];
+
+            IPAddress clientip;
+            IPAddress subnet;
+            IPAddress gateway;
+            IPAddress dns;
+
+            clientip.fromString(clientipch);
+            subnet.fromString(subnetch);
+            gateway.fromString(gatewaych);
+            dns.fromString(dnsch);
+
+            WiFi.config(clientip, gateway, subnet, dns);
+        }
+        if (!connectSTA(ssid, password, bssid)) {
+            return false;
+        }
     }
+
+
+
+
+
+    IPAddress timeserverip;
+    WiFi.hostByName(ntpserver, timeserverip);
+    String ip = printIP(timeserverip);
+    writeEvent("INFO", "ntp", "Connecting NTP Server", ip);
     NTP.Ntp(ntpserver, timeZone, ntpinter * 60);
 
     const char * mhs = mqtt["host"];
     int mport = mqtt["port"];
     const char * muser = mqtt["user"];
     const char * mpas = mqtt["pswd"];
 
-    mqttenabled = mqtt["enabled"];
+    mqttenabled = mqtt["enabled"].as<int>();
     if (mqttenabled == 1) {
         mqttTopic = strdup(mqtt["topic"]);
         mqttClient.setServer(mhs, mport);
         mqttClient.setCredentials(muser, mpas);
         mqttClient.onDisconnect(onMqttDisconnect);
+        mqttClient.onPublish(onMqttPublish);
+        mqttClient.onConnect(onMqttConnect);
         connectToMqtt();
     }