Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

V1.1 pull branch #1

Closed
wants to merge 21 commits into from
Closed

V1.1 pull branch #1

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
f6335f2
Lock JSON library to its previous release (v5)
omersiar Mar 12, 2019
162a7ff
What are others saying about esp-rfid
omersiar Mar 27, 2019
c066f79
MQTT based multiple Reader Support for n Doors
marelab May 12, 2019
41b8e05
Build mode changed due problem with ESP-12F
marelab May 14, 2019
9bd2fbc
Changed update URL to marelab git
marelab May 14, 2019
d1c664e
changes to the fork for extended MQTT Support
marelab May 19, 2019
bbb5788
Update README.md
marelab May 19, 2019
9bf7566
Update README.md
marelab May 19, 2019
6e9581b
MQTT Commands
marelab May 19, 2019
3c4fbb1
Update README.md
marelab May 19, 2019
32c79f3
Update README.md
marelab May 19, 2019
a9394e2
Update README.md
marelab May 19, 2019
d51ac43
MQTT Logging of events & access
marelab Jun 10, 2019
8561098
Merge branch 'stable' of https://github.com/marelab/esp-rfid into stable
marelab Jun 10, 2019
308b170
fixed update gui mqttlog switch
marelab Jun 10, 2019
e2efb96
Added the Door Name to the MQTT events loging
marelab Jun 13, 2019
fa142b7
Code clean up
marelab Jun 13, 2019
d5c0b9e
Changes to make backport easy
marelab Jun 13, 2019
1f4ad67
Backport
marelab Jun 13, 2019
c802a9e
Create README-ADDON.md
marelab Jun 13, 2019
23f74da
Delete README.md
marelab Jun 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update README.md
  • Loading branch information
@marelab
marelab committed May 19, 2019
commit 9bf75667d15ef74b8c5f465b7cc46aa5b0a01c8d
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Fork of the ESP RFID Project with extended MQTT Functions
# Fork of ESP RFID with extended MQTT Functions
First the extended functions are documented here followed by the original descrition. The original ESP-RFID solution is already a great piece of Software, but I wanted extended functinality to integrate my RIFID-DOOR into a home automatisation over MQTT.

The full marelab solution depends on three projects:
Expand Down