pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-04-29 11:01:15 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge pull request #1094 from mc-hamster/master

Browse Source 
Fix borked airtime report in /json/reports
This commit is contained in:
Jm Casler 2022-01-15 08:25:46 -08:00 committed by GitHub
commit 8a63c6f3a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/airtime.cpp
View File

@ -46,8 +46,8 @@ void AirTime::airtimeRotatePeriod()
this->airtimes.periodRX[i + 1] = this->airtimes.periodRX[i]; this->airtimes.periodRX[i + 1] = this->airtimes.periodRX[i];
this->airtimes.periodRX_ALL[i + 1] = this->airtimes.periodRX_ALL[i]; this->airtimes.periodRX_ALL[i + 1] = this->airtimes.periodRX_ALL[i];
myNodeInfo.air_period_tx[i + 1] = myNodeInfo.air_period_tx[i]; myNodeInfo.air_period_tx[i + 1] = this->airtimes.periodTX[i];
myNodeInfo.air_period_rx[i + 1] = myNodeInfo.air_period_rx[i]; myNodeInfo.air_period_rx[i + 1] = this->airtimes.periodRX[i];
} }
this->airtimes.periodTX[0] = 0; this->airtimes.periodTX[0] = 0;
@ -111,10 +111,21 @@ int32_t AirTime::runOnce()
if (firstTime) { if (firstTime) {
airtimeRotatePeriod(); airtimeRotatePeriod();
// Init channelUtilization window to all 0
for (uint32_t i = 0; i < CHANNEL_UTILIZATION_PERIODS; i++) { for (uint32_t i = 0; i < CHANNEL_UTILIZATION_PERIODS; i++) {
this->channelUtilization[i] = 0; this->channelUtilization[i] = 0;
} }
// Init airtime windows to all 0
for (int i = 0; i < PERIODS_TO_LOG; i++) {
this->airtimes.periodTX[i] = 0;
this->airtimes.periodRX[i] = 0;
this->airtimes.periodRX_ALL[i] = 0;
//myNodeInfo.air_period_tx[i] = 0;
//myNodeInfo.air_period_rx[i] = 0;
}
firstTime = false; firstTime = false;
lastUtilPeriod = utilPeriod; lastUtilPeriod = utilPeriod;