meshcore-dev/MeshCore
1
0
Fork 0
mirror of https://github.com/meshcore-dev/MeshCore.git synced 2026-04-20 22:13:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge 0ded46a975 into dee3e26ac0

Browse source
This commit is contained in:
Felix Moessbauer 2026-04-20 11:29:50 +02:00 • committed by GitHub
commit 913bc9df8d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/Dispatcher.cpp
View file

@ -10,7 +10,8 @@ namespace mesh {
#define MAX_RX_DELAY_MILLIS 32000 // 32 seconds
#define MIN_TX_BUDGET_RESERVE_MS 100 // min budget (ms) required before allowing next TX
#define MIN_TX_BUDGET_AIRTIME_DIV 2 // require at least 1/N of estimated airtime as budget before TX
/// add some time to get the max allowed airtime for the est. airtime
#define MAX_TX_AIRTIME_FOR_EST(est_airtime) (((est_airtime) * 3) / 2)
#ifndef NOISE_FLOOR_CALIB_INTERVAL
#define NOISE_FLOOR_CALIB_INTERVAL 2000 // 2 seconds
@ -271,19 +272,21 @@ void Dispatcher::processRecvPacket(Packet* pkt) {
}
}
void Dispatcher::ensureTxDutyCycle(int tx_len) {
uint32_t est_airtime = _radio->getEstAirtimeFor(tx_len);
if (tx_budget_ms < MAX_TX_AIRTIME_FOR_EST(est_airtime)) {
float duty_cycle = 1.0f / (1.0f + getAirtimeBudgetFactor());
unsigned long needed = MAX_TX_AIRTIME_FOR_EST(est_airtime) - tx_budget_ms;
next_tx_time = futureMillis((unsigned long)(needed / duty_cycle));
}
}
void Dispatcher::checkSend() {
if (_mgr->getOutboundCount(_ms->getMillis()) == 0) return;
updateTxBudget();
uint32_t est_airtime = _radio->getEstAirtimeFor(MAX_TRANS_UNIT);
if (tx_budget_ms < est_airtime / MIN_TX_BUDGET_AIRTIME_DIV) {
float duty_cycle = 1.0f / (1.0f + getAirtimeBudgetFactor());
unsigned long needed = est_airtime / MIN_TX_BUDGET_AIRTIME_DIV - tx_budget_ms;
next_tx_time = futureMillis((unsigned long)(needed / duty_cycle));
return;
}
ensureTxDutyCycle(MAX_TRANS_UNIT);
if (!millisHasNowPassed(next_tx_time)) return;
if (_radio->isReceiving()) {
if (cad_busy_start == 0) {
@ -323,7 +326,7 @@ void Dispatcher::checkSend() {
} else {
memcpy(&raw[len], outbound->payload, outbound->payload_len); len += outbound->payload_len;
uint32_t max_airtime = _radio->getEstAirtimeFor(len)*3/2;
uint32_t max_airtime = MAX_TX_AIRTIME_FOR_EST(_radio->getEstAirtimeFor(len));
outbound_start = _ms->getMillis();
bool success = _radio->startSendRaw(raw, len);
if (!success) {

7
src/Dispatcher.h
View file

@ -195,6 +195,13 @@ public:
private:
bool tryParsePacket(Packet* pkt, const uint8_t* raw, int len);
/**
* \brief ensure the next tx time obeys the duty cycle
*
* Internally this updates the next_tx_time so that the Tx
* is executed by earliest the next allowed time slot.
*/
void ensureTxDutyCycle(int tx_len);
void checkRecv();
void checkSend();
};