MQTT bug fix, UI fixes

esprfid · Oct 7, 2018 · 43584f9 · 43584f9
1 parent bb8d197
commit 43584f9
Show file tree

Hide file tree

Showing 13 changed files with 82 additions and 61 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,15 @@ All notable changes to this project will be documented in this file.
 - [firmware] Support for RDM6300 RFID readers (125kHz, UART) #163 @arduino12
 - [firmware] debug firmware for debugging purposes
 
+#### Fixed
+- [firmware] not able to connect MQTT server #157
+- [firmware] a MQTT message typo #157
+- [webui] some breaks on web pages
+- [webui] usage of !important CSS rule
+
+#### Changed
+- [webui] scrollbar on desktop screens (now hidden)
+- [webui] sidebar colors
 
 ## [0.8.2] 2018-09-05
 #### Added

diff --git a/README.md b/README.md
@@ -213,4 +213,4 @@ If this project helps you in a way, you can buy us a beer. You can make a donati
 Nothing says better thank you than a donation.
 
 ## License
-The code parts written by ESP-RFID project authors are licensed under [MIT License](https://github.com/esprfid/esp-rfid/blob/stable/LICENSE), 3rd party libraries that are used by this project are licensed under different license schemes, please check them out as well.
+The code parts written by ESP-RFID project's authors are licensed under [MIT License](https://github.com/esprfid/esp-rfid/blob/stable/LICENSE), 3rd party libraries that are used by this project are licensed under different license schemes, please check them out as well.
diff --git a/platformio.ini b/platformio.ini
@@ -1,6 +1,5 @@
 [platformio]
 env_default = generic
-src_build_flags = !echo "-DBUILD_TAG="$TRAVIS_TAG
 
 [common]
 platform = https://github.com/platformio/platform-espressif8266.git
@@ -25,6 +24,7 @@ upload_resetmethod = nodemcu
 lib_deps = ${common.lib_deps}
 extra_scripts = scripts/GENdeploy.py
 build_flags = -Wl,-Teagle.flash.4m.ld
+src_build_flags = !echo "-DBUILD_TAG="$TRAVIS_TAG
 upload_speed = 921600
 monitor_speed = 115200
 
@@ -37,6 +37,7 @@ board = esp12e
 lib_deps = ${common.lib_deps}
 build_flags = -Wl,-Teagle.flash.4m.ld
  -DOFFICIALBOARD
+src_build_flags = !echo "-DBUILD_TAG="$TRAVIS_TAG
 extra_scripts = scripts/OBdeploy.py
 upload_speed = 921600
 monitor_speed = 115200
@@ -50,6 +51,7 @@ board = esp12e
 lib_deps = ${common.lib_deps}
 build_flags = -Wl,-Teagle.flash.4m.ld
  -DDEBUG
+src_build_flags = !echo "-DBUILD_TAG="$TRAVIS_TAG
 extra_scripts = scripts/DBGdeploy.py
 upload_speed = 921600
 monitor_speed = 115200
diff --git a/src/config.esp b/src/config.esp
@@ -112,25 +112,30 @@ bool ICACHE_FLASH_ATTR loadConfiguration() {
 #ifdef DEBUG
  Serial.println("[ INFO ] Trying to setup NTP Server");
 #endif
+ /*
  IPAddress timeserverip;
  WiFi.hostByName(ntpserver, timeserverip);
  String ip = printIP(timeserverip);
  writeEvent("INFO", "ntp", "Connecting NTP Server", ip);
+ */
  NTP.Ntp(ntpserver, timeZone, ntpinter * 60);
- mhs = strdup(mqtt["host"]);
- mport = mqtt["port"];
- const char *muser;
- const char *mpas;
- String muserString = mqtt["user"];
- muser = strdup(muserString.c_str());
- String mpasString = mqtt["pswd"];
- mpas = strdup(mpasString.c_str());
  mqttenabled = mqtt["enabled"];
  if (mqttenabled == 1) {
 #ifdef DEBUG
  Serial.println("[ INFO ] Trying to setup MQTT");
 #endif
- mqttTopic = strdup(mqtt["topic"]);
+ String mhsString = mqtt["host"];
+ mhs = strdup(mhsString.c_str());
+
+ mport = mqtt["port"];
+
+ String muserString = mqtt["user"];
+ muser = strdup(muserString.c_str());
+ String mpasString = mqtt["pswd"];
+ mpas = strdup(mpasString.c_str());
+ String mqttTopicString = mqtt["topic"];
+ mqttTopic = strdup(mqttTopicString.c_str());
+
  mqttClient.setServer(mhs, mport);
  mqttClient.setCredentials(muser, mpas);
  mqttClient.onDisconnect(onMqttDisconnect);

diff --git a/src/main.cpp b/src/main.cpp
@@ -117,6 +117,8 @@ char *deviceHostname = NULL;
 int mqttenabled = 0;
 char *mqttTopic = NULL;
 char *mhs = NULL;
+char *muser = NULL;
+char *mpas = NULL;
 int mport;
 
 int relayType;

diff --git a/src/mqtt.esp b/src/mqtt.esp
@@ -64,7 +64,7 @@ void mqtt_publish_heartbeat(time_t heartbeat) {
  const char *topic = mqttTopic;
  DynamicJsonBuffer jsonBuffer;
  JsonObject &root = jsonBuffer.createObject();
- root["type"] = "hearthbeat";
+ root["type"] = "heartbeat";
  root["time"] = heartbeat;
  String mqttBuffer4;
  root.printTo(mqttBuffer4);

diff --git a/src/webh/esprfid.htm.gz.h b/src/webh/esprfid.htm.gz.h
diff --git a/src/webh/esprfid.js.gz.h b/src/webh/esprfid.js.gz.h
diff --git a/src/webh/index.html.gz.h b/src/webh/index.html.gz.h
diff --git a/src/webh/required.css.gz.h b/src/webh/required.css.gz.h
diff --git a/src/websrc/3rdparty/css/sidebar.css b/src/websrc/3rdparty/css/sidebar.css
diff --git a/src/websrc/esprfid.htm b/src/websrc/esprfid.htm
@@ -78,6 +78,7 @@ <h3 class="panel-title">Please wait while your ESP restarts...</h3>
  <br>
  <br>
  <legend>General Settings</legend>
+ <br>
  <div class="row form-group">
  <label class="col-xs-3">Admin Password<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign" aria-hidden="true" data-toggle="popover" data-trigger="hover" data-placement="right" data-content="Log On password for the Administrator"></i></label>
  <span class="col-xs-9 col-md-5">
@@ -120,7 +121,8 @@ <h3 class="panel-title">Please wait while your ESP restarts...</h3>
  <br>
  <br>
  <legend>Hardware Settings</legend>
- <h6 class="text-muted">Please refer the <a href="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/omersiar/esp-rfid#pin-layout">documentation</a> for pin configuration.</h6>
+ <h6 class="text-muted">Please refer the <a href="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/esprfid/esp-rfid#pin-layout">documentation</a> for pin configuration.</h6>
+ <br>
  <div class="row form-group">
  <label class="col-xs-3">Reader Type<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign" aria-hidden="true" data-toggle="popover" data-trigger="hover" data-placement="right" data-content="Choose RFID reader type."></i></label>
  <div class="col-xs-9 col-md-5">
@@ -307,6 +309,7 @@ <h5>Please wait while fetching data...<span id="loadpages"></span></h5>
  <br>
  <br>
  <legend>MQTT Settings</legend>
+ <br>
  <div class="row form-group">
  <label class="col-xs-3">MQTT<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign" aria-hidden="true" data-toggle="popover" data-trigger="hover" data-placement="right" data-content="Please choose if you want to enable MQTT"></i></label>
  <div class="col-xs-9">
@@ -476,7 +479,8 @@ <h6 class="text-muted">Type your Wi-Fi Network's SSID or Scan for nerby Wireless
  <br>
  <br>
  <legend>Time Settings</legend>
- <h6 class="text-muted">Small differences between device time and local time can be ignored. Please see <a href="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/omersiar/esp-rfid#time">documentation</a> for additional information.</h6>
+ <h6 class="text-muted">Small differences between device time and local time can be ignored. Please see <a href="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/esprfid/esp-rfid#time">documentation</a> for additional information.</h6>
+ <br>
  <div class="row form-group">
  <label class="col-xs-3">Device Time</label>
  <span id="utc" class="col-xs-9 col-md-5">
@@ -556,7 +560,6 @@ <h6 class="text-muted">Small differences between device time and local time can
  <br>
 </div>
 <div id="statuscontent">
- <br>
  <br>
  <div class="row text-center">
  <div class="col-md-8 col-md-offset-2">

diff --git a/src/websrc/js/esprfid.js b/src/websrc/js/esprfid.js
@@ -1,4 +1,4 @@
-var version = "0.8.2";
+var version = "0.9.0";
 
 var websock = null;
 var wsUri = "ws:https://" + window.location.hostname + "/ws";