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.

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

fixed user pincode, added mqqt discovery for more data, other minor changes #644

Open
wants to merge 10 commits into
base: dev
Choose a base branch
from

Conversation

pvtex
Copy link

@pvtex pvtex commented Jun 11, 2024

No description provided.

@omersiar
Copy link
Collaborator

Thanks. Much appreciated.

@matjack1
Copy link
Collaborator

Hey @pvtex thank you :) Can you please try rebasing these commits on top of dev to resolve the conflicts?

If you could also possibly reduce the number of commits it would help us better review the code. Otherwise just resolving the conflicts is fine :)

Thanks!

@matjack1
Copy link
Collaborator

@pvtex if you struggle with Git we can have a call and figure out things together, I'm very interested in having a look at your code. Feel free to send me an email if you want to go this way, you find the address in my Github profile. Cheers

@pvtex
Copy link
Author

pvtex commented Jun 11, 2024

I am right now rebasing my reposotory to the device branch. But could take some time

@pvtex pvtex force-pushed the v2.0.x branch 6 times, most recently from d10e49b to 55d6801 Compare June 11, 2024 18:40
commit 55d6801
Author: wasn-eu <[email protected]>
Date:   Wed Jun 5 16:42:09 2024 +0200

    clean up
@pvtex
Copy link
Author

pvtex commented Jun 11, 2024

squashed all my commits and rebased my repo on dev branch

@matjack1
Copy link
Collaborator

Cool, thanks, can you please delete the .pio and ESP-Debug folders from your PR?

@pvtex
Copy link
Author

pvtex commented Jun 11, 2024

deletet the folders .pio and ESP-Debug,
added them to .gitignore

@matjack1
Copy link
Collaborator

Sorry, I'm not getting what are you trying to achieve with this PR. Can you please provide a description of the change?

Also, it would be better to have one PR for one feature, to make it easier to review and discuss, so if there are multiple things here can we start from just one?

@pvtex
Copy link
Author

pvtex commented Jun 11, 2024

mainly these things are changed/added:

  • more mqtt data is send (pincode for example) and ha discovery for that added
    (easier to integrate in ha with alarmo, yu can use the pincode from esp-rfid for arm/disarm alarmo)
  • systemname is shown on status page and in the menu under the esp-rfid-icon
    (makes it more easier to manage if you have more than one device)
  • uptime on status page human readable see issue Improve rendering of uptime in web UI #607

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants