Skip to content
Snippets Groups Projects
Commit 1117e58d authored by Moritz Perschke's avatar Moritz Perschke
Browse files

Merge branch 'sensor_readout' into 'develop' 

# Conflicts:
#   .clang-format
#   .gitignore
#   .vscode/extensions.json
#   .vscode/tasks.json
#   client/client/lib/README
#   client/client/platformio.ini
#   client/client/src/main.cpp
parents f9eb37b5 75fabc7e
No related branches found
No related tags found
6 merge requests!39Merge Develop into Main,!19development into master,!17Inital Host, initial Client,!10merge serial comm and sd write into espnow,!3Merge Branch `develop` into `sensor_readout`,!2Draft: Read Sensors on ESP32 Client device
Hide whitespace changes
Inline Side-by-side
Showing
with 373 additions and 47 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