Merge branch 'master' into SH1107

This commit is contained in:
Ben Meadors 2023-01-20 14:44:19 -06:00 committed by GitHub
commit f9f083da51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -135,7 +135,7 @@ bool AirTime::isTxAllowedAirUtil()
if (utilizationTXPercent() < myRegion->dutyCycle * polite_duty_cycle_percent / 100) { if (utilizationTXPercent() < myRegion->dutyCycle * polite_duty_cycle_percent / 100) {
return true; return true;
} else { } else {
LOG_WARN("Tx air utilization is >%d percent. Skipping this opportunity to send.\n", myRegion->dutyCycle * polite_duty_cycle_percent / 100); LOG_WARN("Tx air utilization is >%f percent. Skipping this opportunity to send.\n", myRegion->dutyCycle * polite_duty_cycle_percent / 100);
return false; return false;
} }
} }

View File

@ -275,7 +275,7 @@ void printPacket(const char *prefix, const MeshPacket *p)
LOG_DEBUG(" rxSNR=%g", p->rx_snr); LOG_DEBUG(" rxSNR=%g", p->rx_snr);
} }
if (p->rx_rssi != 0) { if (p->rx_rssi != 0) {
LOG_DEBUG(" rxRSSI=%g", p->rx_rssi); LOG_DEBUG(" rxRSSI=%i", p->rx_rssi);
} }
if (p->priority != 0) if (p->priority != 0)
LOG_DEBUG(" priority=%d", p->priority); LOG_DEBUG(" priority=%d", p->priority);