pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-06-25 06:12:29 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge branch 'master' into Dont-be-assertive

Browse Source
This commit is contained in:
Jonathan Bennett 2024-11-01 13:21:27 -05:00 committed by GitHub
commit ee391ebea8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/mesh/RadioLibInterface.cpp
View File

@ -282,11 +282,14 @@ void RadioLibInterface::onNotify(uint32_t notification)
// Send any outgoing packets we have ready // Send any outgoing packets we have ready
meshtastic_MeshPacket *txp = txQueue.dequeue(); meshtastic_MeshPacket *txp = txQueue.dequeue();
assert(txp); assert(txp);
bool isLoraTx = txp->to != NODENUM_BROADCAST_NO_LORA;
startSend(txp); startSend(txp);
// Packet has been sent, count it toward our TX airtime utilization. if (isLoraTx) {
uint32_t xmitMsec = getPacketTime(txp); // Packet has been sent, count it toward our TX airtime utilization.
airTime->logAirtime(TX_LOG, xmitMsec); uint32_t xmitMsec = getPacketTime(txp);
airTime->logAirtime(TX_LOG, xmitMsec);
}
} }
} }
} else { } else {

4
src/modules/NeighborInfoModule.cpp
View File

@ -121,9 +121,7 @@ Will be used for broadcast.
*/ */
int32_t NeighborInfoModule::runOnce() int32_t NeighborInfoModule::runOnce()
{ {
if (airTime->isTxAllowedChannelUtil(true) && airTime->isTxAllowedAirUtil()) { sendNeighborInfo(NODENUM_BROADCAST_NO_LORA, false);
sendNeighborInfo(NODENUM_BROADCAST_NO_LORA, false);
}
return Default::getConfiguredOrDefaultMs(moduleConfig.neighbor_info.update_interval, default_neighbor_info_broadcast_secs); return Default::getConfiguredOrDefaultMs(moduleConfig.neighbor_info.update_interval, default_neighbor_info_broadcast_secs);
} }