mirror of
https://github.com/meshtastic/firmware.git
synced 2025-08-04 12:44:40 +00:00
Merge pull request #2274 from GUVWAF/roleFixes
NodeInfo fixes for other roles
This commit is contained in:
commit
3f4780479f
@ -76,7 +76,7 @@ int MeshService::handleFromRadio(const meshtastic_MeshPacket *mp)
|
|||||||
powerFSM.trigger(EVENT_PACKET_FOR_PHONE); // Possibly keep the node from sleeping
|
powerFSM.trigger(EVENT_PACKET_FOR_PHONE); // Possibly keep the node from sleeping
|
||||||
|
|
||||||
nodeDB.updateFrom(*mp); // update our DB state based off sniffing every RX packet from the radio
|
nodeDB.updateFrom(*mp); // update our DB state based off sniffing every RX packet from the radio
|
||||||
if (!nodeDB.getNode(mp->from)->has_user) {
|
if (!nodeDB.getNode(mp->from)->has_user && nodeInfoModule) {
|
||||||
LOG_INFO("Heard a node we don't know, sending NodeInfo and asking for a response.\n");
|
LOG_INFO("Heard a node we don't know, sending NodeInfo and asking for a response.\n");
|
||||||
nodeInfoModule->sendOurNodeInfo(mp->from, true);
|
nodeInfoModule->sendOurNodeInfo(mp->from, true);
|
||||||
}
|
}
|
||||||
|
@ -170,7 +170,8 @@ void NodeDB::installDefaultConfig()
|
|||||||
config.lora.hop_limit = HOP_RELIABLE;
|
config.lora.hop_limit = HOP_RELIABLE;
|
||||||
config.position.gps_enabled = true;
|
config.position.gps_enabled = true;
|
||||||
config.position.position_broadcast_smart_enabled = true;
|
config.position.position_broadcast_smart_enabled = true;
|
||||||
config.device.node_info_broadcast_secs = 3 * 60 * 60;
|
if (config.device.role != meshtastic_Config_DeviceConfig_Role_ROUTER)
|
||||||
|
config.device.node_info_broadcast_secs = 3 * 60 * 60;
|
||||||
config.device.serial_enabled = true;
|
config.device.serial_enabled = true;
|
||||||
resetRadioConfig();
|
resetRadioConfig();
|
||||||
strncpy(config.network.ntp_server, "0.pool.ntp.org", 32);
|
strncpy(config.network.ntp_server, "0.pool.ntp.org", 32);
|
||||||
|
Loading…
Reference in New Issue
Block a user