mirror of
https://github.com/meshtastic/firmware.git
synced 2025-10-27 15:02:41 +00:00
Merge branch 'meshtastic:develop' into develop
This commit is contained in:
commit
3f8707cafe
@ -289,12 +289,7 @@ void RadioLibInterface::onNotify(uint32_t notification)
|
|||||||
// actual transmission as short as possible
|
// actual transmission as short as possible
|
||||||
txp = txQueue.dequeue();
|
txp = txQueue.dequeue();
|
||||||
assert(txp);
|
assert(txp);
|
||||||
bool sent = startSend(txp);
|
startSend(txp);
|
||||||
if (sent) {
|
|
||||||
// Packet has been sent, count it toward our TX airtime utilization.
|
|
||||||
uint32_t xmitMsec = getPacketTime(txp);
|
|
||||||
airTime->logAirtime(TX_LOG, xmitMsec);
|
|
||||||
}
|
|
||||||
LOG_DEBUG("%d packets remain in the TX queue", txQueue.getMaxLen() - txQueue.getFree());
|
LOG_DEBUG("%d packets remain in the TX queue", txQueue.getMaxLen() - txQueue.getFree());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -413,6 +408,10 @@ void RadioLibInterface::completeSending()
|
|||||||
sendingPacket = NULL;
|
sendingPacket = NULL;
|
||||||
|
|
||||||
if (p) {
|
if (p) {
|
||||||
|
// Packet has been sent, count it toward our TX airtime utilization.
|
||||||
|
uint32_t xmitMsec = getPacketTime(p);
|
||||||
|
airTime->logAirtime(TX_LOG, xmitMsec);
|
||||||
|
|
||||||
txGood++;
|
txGood++;
|
||||||
if (!isFromUs(p))
|
if (!isFromUs(p))
|
||||||
txRelay++;
|
txRelay++;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user