Merge remote-tracking branch 'upstream/dev' into HEAD
# Conflicts: # examples/simple_repeater/MyMesh.cpp # src/helpers/BaseChatMesh.cpp # src/helpers/CommonCLI.cpp # src/helpers/CommonCLI.h # variants/heltec_t096/T096Board.cpp # variants/heltec_v4/HeltecV4Board.cpp
This commit is contained in:
commit
166261c73e
21 files changed
+302
-3347
No files matched your search
@@ -650,6 +650,7 @@ MyMesh::MyMesh(mesh::MainBoard &board, mesh::Radio &radio, mesh::MillisecondCloc
|
||||
_prefs.flood_max_unscoped = 64;
|
||||
_prefs.flood_max_advert = 8;
|
||||
_prefs.interference_threshold = 0; // disabled
|
||||
_prefs.cad_enabled = 0; // hardware CAD before TX (off by default; 'set cad on')
|
||||
#ifdef ROOM_PASSWORD
|
||||
StrHelper::strncpy(_prefs.guest_password, ROOM_PASSWORD, sizeof(_prefs.guest_password));
|
||||
#endif
|
||||
|
||||
Reference in new issue
Block a user