diff --git a/rover/system_statuses/msg/JetsonInfo.msg b/rover/system_statuses/msg/JetsonInfo.msg
index 5cc9745..7762b80 100644
--- a/rover/system_statuses/msg/JetsonInfo.msg
+++ b/rover/system_statuses/msg/JetsonInfo.msg
@@ -1,4 +1,4 @@
-int8 jetson_CPU
-int8 jetson_RAM
+float64 jetson_CPU
+float64 jetson_RAM
int8 jetson_EMMC
int8 jetson_NVME_SSD
\ No newline at end of file
diff --git a/rover/system_statuses/scripts/.idea/workspace.xml b/rover/system_statuses/scripts/.idea/workspace.xml
index 4454e84..a5b3cee 100644
--- a/rover/system_statuses/scripts/.idea/workspace.xml
+++ b/rover/system_statuses/scripts/.idea/workspace.xml
@@ -10,31 +10,30 @@
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
-
+
+
@@ -69,10 +68,10 @@
DEFINITION_ORDER
-
-
-
-
+
+
+
+
@@ -90,7 +89,6 @@
-
@@ -102,6 +100,7 @@
+
@@ -138,7 +137,7 @@
-
+
@@ -147,10 +146,9 @@
-
+
-
@@ -160,6 +158,7 @@
+
@@ -171,31 +170,30 @@
-
+
-
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -203,19 +201,37 @@
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
diff --git a/rover/system_statuses/scripts/rover_statuses.py b/rover/system_statuses/scripts/rover_statuses.py
index 772c831..270a7c0 100755
--- a/rover/system_statuses/scripts/rover_statuses.py
+++ b/rover/system_statuses/scripts/rover_statuses.py
@@ -19,11 +19,11 @@ class RoverStatuses:
# Subscription examples on pulling data from system_statuses_node.py
rospy.Subscriber('camera_system_status_chatter', CameraStatuses, self.__camera_callback)
- rospy.Subscriber('bogie_system_status_chatter', BogieStatuses, self.__camera_callback)
- rospy.Subscriber('FrSky_system_status_chatter', FrSkyStatus, self.__camera_callback)
- rospy.Subscriber('GPS_system_status_chatter', GPSInfo, self.__camera_callback)
- rospy.Subscriber('jetson_system_status_chatter', JetsonInfo, self.__camera_callback)
- rospy.Subscriber('misc_system_status_chatter', MiscStatuses, self.__camera_callback)
+ rospy.Subscriber('bogie_system_status_chatter', BogieStatuses, self.__bogie_callback)
+ rospy.Subscriber('FrSky_system_status_chatter', FrSkyStatus, self.__frsky_callback)
+ rospy.Subscriber('GPS_system_status_chatter', GPSInfo, self.__gps_callback)
+ rospy.Subscriber('jetson_system_status_chatter', JetsonInfo, self.__jetson_callback)
+ rospy.Subscriber('misc_system_status_chatter', MiscStatuses, self.__misc_callback)
self.camera_msg = CameraStatuses()
self.bogie_msg = BogieStatuses()
@@ -51,6 +51,7 @@ class RoverStatuses:
self.jetson_msg.jetson_RAM = data.jetson_RAM
self.jetson_msg.jetson_EMMC = data.jetson_EMMC
self.jetson_msg.jetson_NVME_SSD = data.jetson_NVME_SSD
+ rospy.loginfo(self.jetson_msg)
def __gps_callback(self, data):
self.GPS_msg.UTC_GPS_time = data.UTC_GPS_time
@@ -65,11 +66,11 @@ class RoverStatuses:
def run(self):
rospy.Subscriber('camera_system_status_chatter', CameraStatuses, self.__camera_callback)
- rospy.Subscriber('bogie_system_status_chatter', BogieStatuses, self.__camera_callback)
- rospy.Subscriber('FrSky_system_status_chatter', FrSkyStatus, self.__camera_callback)
- rospy.Subscriber('GPS_system_status_chatter', GPSInfo, self.__camera_callback)
- rospy.Subscriber('jetson_system_status_chatter', JetsonInfo, self.__camera_callback)
- rospy.Subscriber('misc_system_status_chatter', MiscStatuses, self.__camera_callback)
+ rospy.Subscriber('bogie_system_status_chatter', BogieStatuses, self.__bogie_callback)
+ rospy.Subscriber('FrSky_system_status_chatter', FrSkyStatus, self.__frsky_callback)
+ rospy.Subscriber('GPS_system_status_chatter', GPSInfo, self.__gps_callback)
+ rospy.Subscriber('jetson_system_status_chatter', JetsonInfo, self.__jetson_callback)
+ rospy.Subscriber('misc_system_status_chatter', MiscStatuses, self.__misc_callback)
rospy.spin()
diff --git a/rover/system_statuses/scripts/system_statuses_node.py b/rover/system_statuses/scripts/system_statuses_node.py
index f86e13b..bb7c5b9 100755
--- a/rover/system_statuses/scripts/system_statuses_node.py
+++ b/rover/system_statuses/scripts/system_statuses_node.py
@@ -1,10 +1,10 @@
#!/usr/bin/env python
import rospy
import os.path
+import psutil
from system_statuses.msg import CameraStatuses, BogieStatuses, FrSkyStatus, GPSInfo, MiscStatuses, JetsonInfo
-
class SystemStatuses:
def __init__(self):
@@ -96,8 +96,9 @@ class SystemStatuses:
# Get Jetson Statuses (WIP)
def __set_jetson_usage_information(self):
- self.jetson_msg.jetson_CPU = 0
- self.jetson_msg.jetson_RAM = 0
+ self.jetson_msg.jetson_CPU = psutil.cpu_percent()
+ mem = psutil.virtual_memory()
+ self.jetson_msg.jetson_RAM = mem.percent
self.jetson_msg.jetson_EMMC = 0
self.jetson_msg.jetson_NVME_SSD = 0