caperren/osurc_mars_rover_2017_2018
1
0
Fork 0
mirror of https://github.com/OSURoboticsClub/Rover_2017_2018.git synced 2025-11-08 10:11:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

hook-up clock, cpu and ram %

Browse Source
This commit is contained in:
Ken Steinfeldt
2018-03-13 17:49:01 -07:00
parent 8d200cdfc7
commit 42ed37071a
2 changed files with 75 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
software/ros_packages/ground_station/src/Framework/StatusSystems/StatusCore.py
View File

@@ -30,6 +30,7 @@ class SensorCore(QtCore.QThread):
self.bogie_left = self.screen_main_window.left_bogie # type: QtWidgets.QLabel self.bogie_left = self.screen_main_window.left_bogie # type: QtWidgets.QLabel
self.bogie_rear = self.screen_main_window.rear_bogie # type: QtWidgets.QLabel self.bogie_rear = self.screen_main_window.rear_bogie # type: QtWidgets.QLabel
self.clock = self.screen_main_window.clock # type: QtWidgets.QLCDNumber self.clock = self.screen_main_window.clock # type: QtWidgets.QLCDNumber
self.cpu = self.screen_main_window.cpu # type: QtWidgets.QLabel
rospy.init_node('SensorCore') rospy.init_node('SensorCore')
@@ -79,6 +80,7 @@ class SensorCore(QtCore.QThread):
def __frsky_callback(self, data): def __frsky_callback(self, data):
self.FrSky_msg.FrSky_controller_connection_status = data.FrSky_controller_connection_status self.FrSky_msg.FrSky_controller_connection_status = data.FrSky_controller_connection_status
if self.FrSky_msg.FrSky_controller_connection_status is False: if self.FrSky_msg.FrSky_controller_connection_status is False:
self.frsky.setStyleSheet("background-color: red;") self.frsky.setStyleSheet("background-color: red;")
else: else:
@@ -106,9 +108,20 @@ class SensorCore(QtCore.QThread):
def __jetson_callback(self, data): def __jetson_callback(self, data):
self.jetson_msg.jetson_CPU = data.jetson_CPU self.jetson_msg.jetson_CPU = data.jetson_CPU
self.cpu_read.setText(str(self.jetson_msg.jetson_CPU))
# self.cpu_read.setText(str(self.jetson_msg.jetson_CPU))
self.cpu.setText(str(self.jetson_msg.jetson_CPU))
if self.jetson_msg.jetson_CPU > 79:
self.cpu.setStyleSheet("background-color: orange;")
elif self.jetson_msg.jetson_CPU > 89:
self.cpu.setStyleSheet("background-color: red;")
else:
self.cpu.setStyleSheet("")
self.jetson_msg.jetson_RAM = data.jetson_RAM self.jetson_msg.jetson_RAM = data.jetson_RAM
self.ram_read.setText(str(self.jetson_msg.jetson_RAM)) self.ram_read.setText(str(self.jetson_msg.jetson_RAM))
self.jetson_msg.jetson_EMMC = data.jetson_EMMC self.jetson_msg.jetson_EMMC = data.jetson_EMMC
self.jetson_msg.jetson_NVME_SSD = data.jetson_NVME_SSD self.jetson_msg.jetson_NVME_SSD = data.jetson_NVME_SSD
#rospy.loginfo(self.jetson_msg) #rospy.loginfo(self.jetson_msg)
@@ -129,6 +142,11 @@ class SensorCore(QtCore.QThread):
self.misc_msg.tower_connection_status = data.tower_connection_status self.misc_msg.tower_connection_status = data.tower_connection_status
self.misc_msg.chassis_pan_tilt_connection_status = data.chassis_pan_tilt_connection_status self.misc_msg.chassis_pan_tilt_connection_status = data.chassis_pan_tilt_connection_status
def __display_time(self):
time = QtCore.QTime.currentTime()
temp = time.toString('hh:mm:ss')
self.clock.display(temp)
def run(self): def run(self):
rospy.Subscriber('camera_system_status_chatter', CameraStatuses, self.__camera_callback) rospy.Subscriber('camera_system_status_chatter', CameraStatuses, self.__camera_callback)
rospy.Subscriber('bogie_system_status_chatter', BogieStatuses, self.__bogie_callback) rospy.Subscriber('bogie_system_status_chatter', BogieStatuses, self.__bogie_callback)

72
software/ros_packages/ground_station/src/Resources/Ui/left_screen.ui
View File

@@ -97,7 +97,37 @@
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
<item row="2" column="2"> <item row="1" column="4">
<widget class="QLabel" name="label_4">
<property name="styleSheet">
<string notr="true">background-color: darkgreen;</string>
</property>
<property name="text">
<string>placeholder</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="cpu">
<property name="styleSheet">
<string notr="true">background-color: darkgreen;</string>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;CPU %&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item row="1" column="5">
<widget class="QLabel" name="label_5">
<property name="styleSheet">
<string notr="true">background-color: darkgreen;</string>
</property>
<property name="text">
<string>placeholder</string>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QLabel" name="left_bogie"> <widget class="QLabel" name="left_bogie">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -139,7 +169,7 @@ Connected</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="2"> <item row="2" column="2">
<widget class="QLabel" name="frsky"> <widget class="QLabel" name="frsky">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -184,7 +214,7 @@ Connected</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="3"> <item row="3" column="4">
<widget class="QLabel" name="right_bogie"> <widget class="QLabel" name="right_bogie">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -226,7 +256,7 @@ Connected</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="3" column="0">
<widget class="QLabel" name="gps"> <widget class="QLabel" name="gps">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -268,7 +298,7 @@ Fix</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="4"> <item row="2" column="5">
<widget class="QLabel" name="joystick"> <widget class="QLabel" name="joystick">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -310,7 +340,7 @@ Connected</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="4"> <item row="3" column="5">
<widget class="QLabel" name="rear_bogie"> <widget class="QLabel" name="rear_bogie">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -352,7 +382,7 @@ Connected</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="2" column="0">
<widget class="QLabel" name="rover"> <widget class="QLabel" name="rover">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -394,7 +424,7 @@ Connected</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="3"> <item row="2" column="4">
<widget class="QLabel" name="nav_mouse"> <widget class="QLabel" name="nav_mouse">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -436,7 +466,7 @@ Connected</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="4" column="0">
<widget class="QLabel" name="zed"> <widget class="QLabel" name="zed">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -477,7 +507,7 @@ Connected</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="2"> <item row="4" column="2">
<widget class="QLabel" name="main_cam"> <widget class="QLabel" name="main_cam">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -519,7 +549,7 @@ Connected</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="3"> <item row="4" column="4">
<widget class="QLabel" name="chassis_cam"> <widget class="QLabel" name="chassis_cam">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -564,7 +594,10 @@ Connected</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="4"> <item row="0" column="0" colspan="3">
<widget class="QLCDNumber" name="clock"/>
</item>
<item row="4" column="5">
<widget class="QLabel" name="under_cam"> <widget class="QLabel" name="under_cam">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -609,12 +642,19 @@ Connected</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0" colspan="3"> <item row="0" column="5">
<widget class="QLCDNumber" name="clock"/>
</item>
<item row="0" column="4">
<widget class="QLCDNumber" name="timer"/> <widget class="QLCDNumber" name="timer"/>
</item> </item>
<item row="1" column="2">
<widget class="QLabel" name="label">
<property name="styleSheet">
<string notr="true">background-color: darkgreen;</string>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;RAM&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
</layout> </layout>