mirror of
https://github.com/meshcore-dev/MeshCore.git
synced 2026-04-20 22:13:47 +00:00
Merge branch 'dev' into rep-room-acl
# Conflicts: # examples/simple_repeater/main.cpp
This commit is contained in:
commit
08f91f8d95
35 changed files with 1970 additions and 15 deletions
|
|
@ -8,6 +8,10 @@
|
|||
static UITask ui_task(display);
|
||||
#endif
|
||||
|
||||
#ifdef WITH_BRIDGE
|
||||
AbstractBridge* bridge;
|
||||
#endif
|
||||
|
||||
StdRNG fast_rng;
|
||||
SimpleMeshTables tables;
|
||||
|
||||
|
|
@ -23,6 +27,10 @@ void setup() {
|
|||
Serial.begin(115200);
|
||||
delay(1000);
|
||||
|
||||
#ifdef WITH_BRIDGE
|
||||
bridge->begin();
|
||||
#endif
|
||||
|
||||
board.begin();
|
||||
|
||||
#ifdef DISPLAY_CLASS
|
||||
|
|
@ -34,7 +42,9 @@ void setup() {
|
|||
}
|
||||
#endif
|
||||
|
||||
if (!radio_init()) { halt(); }
|
||||
if (!radio_init()) {
|
||||
halt();
|
||||
}
|
||||
|
||||
fast_rng.begin(radio_get_rng_seed());
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue