Skip to content
Snippets Groups Projects
Verified Commit 0d93a38c authored by Zoe Michaela Dietmar Pfister's avatar Zoe Michaela Dietmar Pfister :gay_pride_flag:
Browse files

Merge branch 'message-compression' into develop 

# Conflicts:
#	client/libs/espnow/src/ESPNow.cpp
#	client/libs/espnow/src/Message.cpp
#	host/host_central_mast/src/main.cpp
parents 6e05c8cc 65e20270
No related branches found
No related tags found
2 merge requests!39Merge Develop into Main,!27Move from json-string based transfer between client and host to C struct / class based transfer
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 872 additions and 795 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment