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

fix: allow MQTT encryption_enabled with json_enabled #3126

Merged
merged 4 commits into from
Jan 25, 2024

Conversation

andrekir
Copy link
Member

this change decouples JSON publishing from MeshPacket encryption and should allow MQTT using both encryption_enabled and json_enabled simultaneously.

@andrekir andrekir requested review from thebentern and GUVWAF January 24, 2024 03:00
thebentern added a commit to meshtastic/artifacts that referenced this pull request Jan 24, 2024
Copy link
Contributor

🤖 Pull request artifacts

empty string

file commit
firmware-2.2.20.d7220ef.zip d7220ef

@andrekir andrekir marked this pull request as ready for review January 24, 2024 10:39
src/mesh/Router.cpp Outdated Show resolved Hide resolved
src/mesh/Router.cpp Outdated Show resolved Hide resolved
src/mesh/Router.cpp Show resolved Hide resolved
Copy link
Member

@GUVWAF GUVWAF left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good now, thanks!

@thebentern thebentern merged commit d6fa190 into meshtastic:master Jan 25, 2024
62 checks passed
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.

4 participants