Update protos, store multiple relayers

src/modules/Modules.cpp

@@ -152,8 +152,18 @@ void setupModules()
             delete upDownInterruptImpl1;
             upDownInterruptImpl1 = nullptr;
         }
-        // cardKbI2cImpl = new CardKbI2cImpl();
-        // cardKbI2cImpl->init();
+
+#if HAS_SCREEN
+        // In order to have the user button dismiss the canned message frame, this class lightly interacts with the Screen class
+        scanAndSelectInput = new ScanAndSelectInput();
+        if (!scanAndSelectInput->init()) {
+            delete scanAndSelectInput;
+            scanAndSelectInput = nullptr;
+        }
+#endif
+
+        cardKbI2cImpl = new CardKbI2cImpl();
+        cardKbI2cImpl->init();
 #ifdef INPUTBROKER_MATRIX_TYPE
         kbMatrixImpl = new KbMatrixImpl();
         kbMatrixImpl->init();
@@ -235,4 +245,4 @@ void setupModules()
     // NOTE! This module must be added LAST because it likes to check for replies from other modules and avoid sending extra
     // acks
     routingModule = new RoutingModule();
-}
+}

src/modules/NodeInfoModule.cpp

@@ -97,7 +97,7 @@ NodeInfoModule::NodeInfoModule()
     : ProtobufModule("nodeinfo", meshtastic_PortNum_NODEINFO_APP, &meshtastic_User_msg), concurrency::OSThread("NodeInfoModule")
 {
     isPromiscuous = true; // We always want to update our nodedb, even if we are sniffing on others
-    setIntervalFromNow(20 *
+    setIntervalFromNow(30 *
                        1000); // Send our initial owner announcement 30 seconds after we start (to give network time to setup)
 }
 
@@ -112,4 +112,4 @@ int32_t NodeInfoModule::runOnce()
         sendOurNodeInfo(NODENUM_BROADCAST, requestReplies); // Send our info (don't request replies)
     }
     return Default::getConfiguredOrDefaultMs(config.device.node_info_broadcast_secs, default_node_info_broadcast_secs);
-}
+}

src/modules/Telemetry/DeviceTelemetry.h

@@ -17,7 +17,8 @@ class DeviceTelemetryModule : private concurrency::OSThread, public ProtobufModu
     {
         uptimeWrapCount = 0;
         uptimeLastMs = millis();
-        setIntervalFromNow(450000 * 1000); // Wait until NodeInfo is sent
+        nodeStatusObserver.observe(&nodeStatus->onNewStatus);
+        setIntervalFromNow(45 * 1000); // Wait until NodeInfo is sent
     }
     virtual bool wantUIFrame() { return false; }
 
@@ -59,4 +60,4 @@ class DeviceTelemetryModule : private concurrency::OSThread, public ProtobufModu
 
     uint32_t uptimeWrapCount;
     uint32_t uptimeLastMs;
-};
+};