Merge pull request #224 from esprfid/dev

Dev

.gitignore

@@ -1,3 +1,6 @@
+# vscode
+.vscode
+
 # platformio
 
 .pioenvs
@@ -81,4 +84,4 @@ typings/
 .vscode/.browse.c_cpp.db*
 .vscode/c_cpp_properties.json
 .vscode/launch.json
-.vscode/*
+.vscode/*

.travis.yml

@@ -8,12 +8,12 @@ script:
 - pio run -e generic -e relayboard -e debug
 before_deploy:
 - cd ..
-- tar -zcf ${TRAVIS_BUILD_DIR}-${TRAVIS_TAG}.tar.gz -C ${TRAVIS_BUILD_DIR}/bin .
+- zip -r -j ${TRAVIS_BUILD_DIR}-${TRAVIS_TAG}.zip ${TRAVIS_BUILD_DIR}/bin
 deploy:
   provider: releases
   api_key:
     secure: "x6aQFDa+61A2lyBC5eVOrRaXm/Y5d0y0rp8nU4n56iuI938qmrmwlM9wObazXCIbZy70/7a5UjRi+yYwG3+pXuguX6n15aAQO7ngQKeuaOOl+UFbDAw57ytud+vQReM4J8vwDh4hwJo8EATc8VH2Ua27DsrLp5AxszBu+HEiBLSEVoyHxxWsp9POnVWMV9VZzdGQmHYR9ZvafXYrONPLK3VrXyPRT0DhTtelpB+bICLqDVOOawilHNEXIRfUt0Chp3/I1ArFJyq0EkDrn4USawEKceu8eTkp3zShjcsT03XMkW41tNrdmJC6BdfeNhw4gkj67ZZN247voWdOMgadrixtMaM7u98HVVFXa/YioKHXYCpSxqAZumnzLe6kEfYl5aKraNAh/SEkFDXNULvCyDpfzLnJ3JyYRg6CSeY4EvRvCwz17nn8LoeqdAUjrHYja2tMxwcnRlxPirw5E5wIosJlxfgV5FiMz3MlTgKEOxsxQDFS1usZmFr2QWb45ayqCWDuGyeD5VLY1Yhe7QT6fxHGDW4cKnD1dDrngbuhCvz0juL+GpAfgDhn6DYJNC+ZNBnmMVY9dUSgDBeHMmOtdQOfz22TxlLfGFE2pzAQcqyR3kMHjdH5nRji56Lz9kuNasPpR8VZa5O/bah5N3Hho0X9EWIu2ZziFyVBqwUpSao="
-  file: "${TRAVIS_BUILD_DIR}-${TRAVIS_TAG}.tar.gz"
+  file: "${TRAVIS_BUILD_DIR}-${TRAVIS_TAG}.zip"
   skip_cleanup: true
   on:
     repo: esprfid/esp-rfid

CHANGELOG.md

@@ -1,10 +1,20 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## [0.9.0] 2018-11-13
+## [Unreleased] 
+#### Fixed
+- [webui] Version typo
+- [webui] Refresh web headers
+
+#### Changed
+- [firmware] lock MFRC522 library to version 1.4.1
+
+## [1.0.0-rc1] 2019-01-09
 
 ### BREAKING CHANGES (These changes will break your data on device, please make sure made a backup, also you can not use your old settings on this release but only can restore user data)
 
+#### Added
+- [firmware] #218 Added latching relay support @donatmarko
 - [firmware] #189 Flash layout changed to 2MB Firmware / 2MB SPIFFS Data @Pako2
 - [firmware] Support for RDM6300 RFID readers (125kHz, UART) #163 @arduino12 / concurrently by @Pako2
 - [firmware] debug firmware for debugging purposes
@@ -13,35 +23,26 @@ All notable changes to this project will be documented in this file.
 - [webui] IP address choice option in AP mode @Pako2
 - [webui] favicon.ico @Pako2
 - [tools] websocket emulator can now store new configuration temporarly
+- [firmware] log for firmware update #152
+- [webui] Expired access attempts logged as "Expired"
 
 #### Fixed
+- [firmware] fix the loadconfiguration loop @Pako2
 - [firmware] not able to connect MQTT server #157 @fivosg 
 - [firmware] a MQTT message typo #157 @wamboin23 
 - [webui] some breaks on web pages 
 - [webui] usage of !important CSS rule
 - [firmware] #191 relay type inversion @Pako2
 - [firmware] #190 Increase PN532::WaitReady debug level @Pako2
-
-#### Changed
-- [webui] scrollbar on desktop screens (now hidden)
-- [webui] sidebar colors (i hope you like it, standart bootstrap color)
-
-## [0.8.3] 2018-11-11
-#### Fixed
-- [firmware] not able to connect MQTT server #157 @fivosg 
-
-## [0.8.2] 2018-09-05
-#### Added
-- [firmware] log for firmware update #152
-- [webui] Expired access attempts logged as "Expired"
-
-#### Fixed
 - [firmware] validuntil is being ignored #151
 - [firmware] the boot loop when ssid is empty on configuration file (actually more a workaround than a fix) #154 
 
 #### Changed
+- [firmware] Improve onWsEvent() function @Pako2
+- [build] Change release type to a zip file (was tar.gz before)
+- [webui] scrollbar on desktop screens (now hidden)
+- [webui] sidebar colors (i hope you like it, standart bootstrap color)
 - [webui] sanity check for firmware update file #152
-- [firmware] MQTT reconnect code (dirty hack) #149
 
 ## [0.8.1] 2018-09-01
 #### Added

README.md

@@ -190,7 +190,8 @@ At least 1000 unique User (RFID Tag) can be handled, the test were performed on
 * [![Chat at https://gitter.im/esp-rfid/Lobby](https://badges.gitter.im/esp-rfid.svg)](https://gitter.im/esp-rfid/Lobby) Join community chat on Gitter
 
 ### Projects that is based on esp-rfid
-* [ESP-IO](https://github.com/Pako2/EventGhostPlugins/tree/master/ESP-IO)
+* [ESP-IO](https://github.com/Pako2/EventGhostPlugins/tree/master/ESP-IO) Project to manipulate GPIOs with EventGhost
+* [ESP-RCM](https://github.com/Pako2/esp-rcm) Room Climate Monitor with ESP8266, HTU21D, Si7021, AM2320
 
 ### Acknowledgements
 
@@ -210,6 +211,7 @@ If this project helps you in a way, you can buy us a beer. You can make a donati
 * 2017-10-03 [steinar-t](https://github.com/steinar-t)
 * 2017-12-10 [saschaludwig](https://github.com/saschaludwig)
 * 2018-10-02 Dennis Parsch
+* 2019-01-12 Chris-topher Slater
 
 Nothing says better thank you than a donation.
 

bin/flash.bat

@@ -4,6 +4,7 @@ cls
 echo - [1] Flash Generic Firmware
 echo - [2] Flash Firmware for Official Hardware (v2)
 echo - [3] Erase the Firmware on ESP8266 by flashing empty file
+echo - [4] Flash Generic DEBUG Firmware
 
 set /p opt=Please choose an option eg. 1: 
 
@@ -13,18 +14,26 @@ IF ERRORLEVEL 1 CALL :DEFAULT_CASE
 :1
   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 0x00000 -cf generic.bin
+  GOTO EXIT_CASE   
 :2
   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 0x00000 -cf forV2Board.bin
+  GOTO EXIT_CASE
 :3
   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 0x00000 -cf blank4mb.bin
+  GOTO EXIT_CASE
+:4
+  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 0x00000 -cf debug.bin
+  GOTO EXIT_CASE
 :DEFAULT_CASE
   ECHO Unknown option "%opt%"
   GOTO END_CASE
 :END_CASE
   VER > NUL # reset ERRORLEVEL
   GOTO :EOF # return from CALL
-
+:EXIT_CASE
+  exit
 
 

platformio.ini

@@ -7,9 +7,10 @@ lib_deps =
   ArduinoJson
   ESPAsyncTCP
   ESPAsyncUDP
-  https://github.com/me-no-dev/ESPAsyncWebServer#e4950444c41f082c1e040aca97034c3f53c8562c
+  ESP Async WebServer
+  ;https://github.com/me-no-dev/ESPAsyncWebServer#e4950444c41f082c1e040aca97034c3f53c8562c
   AsyncMqttClient
-  MFRC522
+  https://github.com/miguelbalboa/rfid#ea7ee3f3daafd46d0c5b8438ba41147c384a1f0d
   https://github.com/monkeyboard/Wiegand-Protocol-Library-for-Arduino.git
   Time