Merge pull request esprfid#231 from Pako2/dev

Cosmetic changes
marelab · Jan 21, 2019 · fded1e4 · fded1e4
2 parents 041d5cb + 6caf2ec
commit fded1e4
Show file tree

Hide file tree

Showing 11 changed files with 119 additions and 113 deletions.
diff --git a/src/config.esp b/src/config.esp
@@ -79,7 +79,9 @@ bool ICACHE_FLASH_ATTR loadConfiguration()
  rfidss = hardware["sspin"];
  setupPN532Reader(rfidss);
  }
+ #ifndef DEBUG
  if (readerType>2) Serial.begin(9600);
+ #endif
 #endif
  autoRestartIntervalSeconds = general["restart"];
  wifiTimeout = network["offtime"];

diff --git a/src/main.cpp b/src/main.cpp
@@ -22,6 +22,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
  */
+#define VERSION "1.0.0-rc3"
 
 #include "Arduino.h"
 #include <ESP8266WiFi.h>
@@ -163,7 +164,8 @@ void ICACHE_FLASH_ATTR setup()
  Serial.begin(9600);
  Serial.println();
 
- Serial.println(F("[ INFO ] ESP RFID v0.9"));
+ Serial.print(F("[ INFO ] ESP RFID v"));
+ Serial.println(VERSION);
 
  uint32_t realSize = ESP.getFlashChipRealSize();
  uint32_t ideSize = ESP.getFlashChipSize();

diff --git a/src/rfid.esp b/src/rfid.esp
@@ -91,7 +91,7 @@ void ICACHE_FLASH_ATTR rfidloop()
  cooldown = millis() + 2000;
 #ifdef DEBUG
  Serial.print(F("[ INFO ] PICC's UID: "));
- Serial.println(uid);
+ Serial.print(uid);
 #endif
  }
  else

diff --git a/src/rfid125kHz.cpp b/src/rfid125kHz.cpp
@@ -88,7 +88,7 @@ String RFID_Reader::GetHexID()
  uint8_t b[5];
  memcpy(b, &new_ID, 5);
  char buf[11];
- sprintf(buf,"%02x%02x%02x%02x%02x%c",b[4],b[3],b[2],b[1],b[0],'\0');
+ sprintf(buf,"%02x%02x%02x%02x%02x",b[4],b[3],b[2],b[1],b[0]);
  lasttagtype = tagtype;
  data_available = false;
  return String(buf);

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/webh/required.js.gz.h b/src/webh/required.js.gz.h
diff --git a/src/websrc/js/esprfid.js b/src/websrc/js/esprfid.js
@@ -1,4 +1,4 @@
-var version = "1.0.0-rc2";
+var version = "";
 
 var websock = null;
 var wsUri = "ws:https://" + window.location.hostname + "/ws";
@@ -544,6 +544,7 @@ function colorStatusbar(ref) {
 
 
 function listStats() {
+ version = ajaxobj.version;
  document.getElementById("chip").innerHTML = ajaxobj.chipid;
  document.getElementById("cpu").innerHTML = ajaxobj.cpu + " Mhz";
  document.getElementById("uptime").innerHTML = ajaxobj.uptime;

diff --git a/src/wsResponses.esp b/src/wsResponses.esp
@@ -68,6 +68,7 @@ void ICACHE_FLASH_ATTR sendStatus() {
  root["availspiffs"] = fsinfo.totalBytes - fsinfo.usedBytes;
  root["spiffssize"] = fsinfo.totalBytes;
  root["uptime"] = NTP.getDeviceUptimeString();
+ root["version"] = VERSION;
 
  if (inAPMode) {
  wifi_get_ip_info(SOFTAP_IF, &info);