Merge branch 'main' into precise-stopping

zauberzeug · Jul 17, 2024 · b80ba13 · b80ba13
2 parents e76c9e7 + 377b0a4
commit b80ba13
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/field_friend/system.py b/field_friend/system.py
@@ -244,5 +244,8 @@ def get_jetson_cpu_temperature(self):
         return float(temp) / 1000.0  # Convert from milli °C to °C
 
     def log_status(self):
-        msg = f'cpu: {psutil.cpu_percent():.0f}%  mem: {psutil.virtual_memory().percent:.0f}% temp: {self.get_jetson_cpu_temperature():.1f}°C'
+        msg = f'cpu: {psutil.cpu_percent():.0f}%  '
+        msg += f'mem: {psutil.virtual_memory().percent:.0f}% '
+        msg += f'temp: {self.get_jetson_cpu_temperature():.1f}°C '
+        msg += f'battery: {self.field_friend.bms.state.short_string}'
         self.log.info(msg)
diff --git a/field_friend/vision/simulated_cam_provider.py b/field_friend/vision/simulated_cam_provider.py
@@ -51,3 +51,6 @@ def add_cameras(self, num_cameras: int) -> None:
             new_id = f'cam{len(self._cameras)}'
             print(f'adding simulated camera: {new_id}')
             self.add_camera(SimulatedCam(id=new_id, width=640, height=480))
+
+    async def update_device_list(self) -> None:
+        return None