Merge remote-tracking branch 'root/master' into pr-powermon2

# Conflicts:
#	meshtastic/mesh_interface.py

Author: geeksville

meshtastic/mesh_interface.py

@@ -589,6 +589,9 @@ def sendTelemetry(
                     air_util_tx = metrics.get("airUtilTx")
                     if air_util_tx is not None:
                         r.device_metrics.air_util_tx = air_util_tx
+                    uptime_seconds = metrics.get("uptimeSeconds")
+                    if uptime_seconds is not None:
+                        r.device_metrics.uptime_seconds = uptime_seconds
 
         if wantResponse:
             onResponse = self.onResponseTelemetry
@@ -626,6 +629,8 @@ def onResponseTelemetry(self, p: dict):
                 print(
                     f"Transmit air utilization: {telemetry.device_metrics.air_util_tx:.2f}%"
                 )
+            if telemetry.device_metrics.uptime_seconds is not None:
+                print(f"Uptime: {telemetry.device_metrics.uptime_seconds} s")
 
         elif p["decoded"]["portnum"] == "ROUTING_APP":
             if p["decoded"]["routing"]["errorReason"] == "NO_RESPONSE":