From 8a6bbcb985608839fef3e905195bcb3707573c66 Mon Sep 17 00:00:00 2001
From: Mike Kinney <mike.kinney@gmail.com>
Date: Fri, 14 Jan 2022 10:40:18 -0800
Subject: [PATCH 1/2] add quotes around PYTHON; add check for esptool

---
 bin/device-install.sh | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/bin/device-install.sh b/bin/device-install.sh
index b0ba6ef37..f0157da2d 100755
--- a/bin/device-install.sh
+++ b/bin/device-install.sh
@@ -11,7 +11,7 @@ Usage: $(basename $0) [-h] [-p ESPTOOL_PORT] [-P PYTHON] [-f FILENAME|FILENAME]
 Flash image file to device, but first erasing and writing system information"
 
     -h               Display this help and exit
-    -p ESPTOOL_PORT  Set the environment variable for ESPTOOL_PORT.  If not set, ESPTOOL iterates all ports (Dangerrous).
+    -p ESPTOOL_PORT  Set the environment variable for ESPTOOL_PORT.  If not set, ESPTOOL iterates all ports (Dangerous).
     -P PYTHON        Specify alternate python interpreter to use to invoke esptool. (Default: "$PYTHON")
     -f FILENAME      The .bin file to flash.  Custom to your device type and region.
 EOF
@@ -44,12 +44,15 @@ shift "$((OPTIND-1))"
     shift
 }
 
+# check that esptool is installed
+"$PYTHON" -m esptool -h >/dev/null 2>&1 || echo "Error: esptool was not found."; exit 1
+
 if [ -f "${FILENAME}" ]; then
 	echo "Trying to flash ${FILENAME}, but first erasing and writing system information"
-	$PYTHON -m esptool  erase_flash
-	$PYTHON -m esptool  write_flash 0x1000 system-info.bin
-	$PYTHON -m esptool  write_flash 0x00390000 spiffs-*.bin
-	$PYTHON -m esptool  write_flash 0x10000 ${FILENAME}
+	"$PYTHON" -m esptool  erase_flash
+	"$PYTHON" -m esptool  write_flash 0x1000 system-info.bin
+	"$PYTHON" -m esptool  write_flash 0x00390000 spiffs-*.bin
+	"$PYTHON" -m esptool  write_flash 0x10000 ${FILENAME}
 else
 	echo "Invalid file: ${FILENAME}"
 	show_help

From 2fd0d2baff7187cf0c2703066f8052e57d65bcb4 Mon Sep 17 00:00:00 2001
From: Jm Casler <jm@casler.org>
Date: Sat, 15 Jan 2022 08:24:39 -0800
Subject: [PATCH 2/2] Fixed borked airtime report in /json/reports

For: https://github.com/meshtastic/Meshtastic-device/issues/1086
---
 src/airtime.cpp | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/airtime.cpp b/src/airtime.cpp
index 3f744d4ac..eac58cfc9 100644
--- a/src/airtime.cpp
+++ b/src/airtime.cpp
@@ -46,8 +46,8 @@ void AirTime::airtimeRotatePeriod()
             this->airtimes.periodRX[i + 1] = this->airtimes.periodRX[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_rx[i + 1] = myNodeInfo.air_period_rx[i];
+            myNodeInfo.air_period_tx[i + 1] = this->airtimes.periodTX[i];
+            myNodeInfo.air_period_rx[i + 1] = this->airtimes.periodRX[i];
         }
         
         this->airtimes.periodTX[0] = 0;
@@ -111,10 +111,21 @@ int32_t AirTime::runOnce()
     if (firstTime) {
         airtimeRotatePeriod();
 
+        // Init channelUtilization window to all 0
         for (uint32_t i = 0; i < CHANNEL_UTILIZATION_PERIODS; i++) {
             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;
         lastUtilPeriod = utilPeriod;