ATTENTION NEW requirements.txt

- Added CPU load to server topic

Author: EinEinfach

CaSSAndRA/app.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-#Version:0.213.1 Added CPU temperature to server topic, Attention new requirements.txt
+#Version:0.214.0 Added CPU load to server topic, Attention new requirements.txt
 # package imports
 import os
 import sys

CaSSAndRA/src/backend/data/appdata.py

@@ -2,7 +2,7 @@
 logger = logging.getLogger(__name__)
 
 
-version = '0.213.1'
+version = '0.214.0'
 
 # global ui messages
 cmdTransmissionFailed: bool = False

CaSSAndRA/src/backend/server.py

@@ -29,6 +29,7 @@ class Server:
     datastorage_thread = None
     schedule_thread = None
     server_info_thread = None
+    cpu_load: float = None
     cpu_temp: float = None
 
     def _runServerInfoLoop(self) -> None:
@@ -37,10 +38,10 @@ def _runServerInfoLoop(self) -> None:
                 logger.info('Server info thread is stopped')
                 return
             try:
+                self.cpu_load = psutil.cpu_percent(interval=2)
                 self.cpu_temp = psutil.sensors_temperatures()['cpu_thermal'][0].current
             except:
                 self.cpu_temp = None
-            time.sleep(1)
 
     def _runScheduleLoop(self) -> None:
         while True:
@@ -109,7 +110,7 @@ def _runApi(self) -> None:
                 logger.debug('Update api data')
                 cassandra_api.updatePayload()
                 cassandra_api.publish('status', cassandra_api.apistate)
-                cassandra_api.publish('server', json.dumps(dict(software=self.sw, version=self.version, cpuTemp=self.cpu_temp)))
+                cassandra_api.publish('server', json.dumps(dict(software=self.sw, version=self.version, cpuLoad=self.cpu_load, cpuTemp=self.cpu_temp)))
                 cassandra_api.publish('robot', cassandra_api.robotstate_json)
                 cassandra_api.publish('maps', cassandra_api.mapsstate_json)
                 cassandra_api.publish('tasks', cassandra_api.tasksstate_json)