Merge remote-tracking branch 'root/master' into nrf52

# Conflicts:
#	docs/software/nrf52-TODO.md
#	src/mesh/RadioLibInterface.cpp
#	src/mesh/mesh.pb.h
This commit is contained in:
geeksville
2020-05-22 11:12:22 -07:00
27 changed files with 729 additions and 162 deletions
+1 -1
View File
@@ -93,7 +93,7 @@ extends = esp32_base
board = ttgo-t-beam
lib_deps =
${env.lib_deps}
AXP202X_Library
https://github.com/meshtastic/AXP202X_Library.git
build_flags =
${esp32_base.build_flags} -D TBEAM_V10