close power meter gracefully

Author: geeksville

meshtastic/powermon/power_supply.py

@@ -20,6 +20,9 @@ def __init__(self):
         self.prevPowerTime = datetime.now()
         self.prevWattHour = self._getRawWattHour()
 
+    def close(self) -> None:
+        """Close the power meter."""
+
     def getAverageWatts(self) -> float:
         """Get watts consumed since last call to this method."""
         now = datetime.now()

meshtastic/powermon/ppk2.py

@@ -37,6 +37,11 @@ def __init__(self, portName: Optional[str] = None):
 
         super().__init__()  # we call this late so that the port is already open and _getRawWattHour callback works
 
+    def close(self) -> None:
+        """Close the power meter."""
+        self.r.stop_measuring()
+        super().close()
+
     def setIsSupply(self, s: bool):
         """If in supply mode we will provide power ourself, otherwise we are just an amp meter."""
         if (

meshtastic/slog/slog.py

@@ -73,6 +73,7 @@ def _logging_thread(self) -> None:
     def close(self) -> None:
         """Close the PowerLogger and stop logging."""
         if self.is_logging:
+            self.pMeter.close()
             self.is_logging = False
             self.thread.join()
             self.writer.close()