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

add emmc and gpu temp to outputs

Browse Source
This commit is contained in:
Ken Steinfeldt
2018-03-15 10:38:48 -07:00
parent 1c7646d07d
commit d2e1b7e224
2 changed files with 61 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,10 @@ class SensorCore(QtCore.QThread):
# ########## create signals for slots ########## # ########## create signals for slots ##########
jetson_cpu_update_ready__signal = QtCore.pyqtSignal(str) jetson_cpu_update_ready__signal = QtCore.pyqtSignal(str)
jetson_cpu_stylesheet_change_ready__signal = QtCore.pyqtSignal(str) jetson_cpu_stylesheet_change_ready__signal = QtCore.pyqtSignal(str)
jetson_emmc_update_ready__signal = QtCore.pyqtSignal(str)
jetson_emmc_stylesheet_change_ready__signal = QtCore.pyqtSignal(str)
jetson_gpu_temp_update_ready__signal = QtCore.pyqtSignal(str)
jetson_gpu_temp_stylesheet_change_ready__signal = QtCore.pyqtSignal(str)
jetson_ram_update_ready__signal = QtCore.pyqtSignal(str) jetson_ram_update_ready__signal = QtCore.pyqtSignal(str)
jetson_ram_stylesheet_change_ready__signal = QtCore.pyqtSignal(str) jetson_ram_stylesheet_change_ready__signal = QtCore.pyqtSignal(str)
@@ -66,6 +69,8 @@ class SensorCore(QtCore.QThread):
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 self.cpu = self.screen_main_window.cpu # type: QtWidgets.QLabel
self.ram = self.screen_main_window.ram # type: QtWidgets.QLabel self.ram = self.screen_main_window.ram # type: QtWidgets.QLabel
self.gpu_temp = self.screen_main_window.gpu_temp # type: QtWidgets.QLabel
self.emmc = self.screen_main_window.emmc # type: QtWidgets.QLabel
# ########## subscriptions pulling data from system_statuses_node.py ########## # ########## subscriptions pulling data from system_statuses_node.py ##########
self.camera_status = rospy.Subscriber(CAMERA_TOPIC_NAME, CameraStatuses, self.__camera_callback) self.camera_status = rospy.Subscriber(CAMERA_TOPIC_NAME, CameraStatuses, self.__camera_callback)
@@ -175,18 +180,23 @@ class SensorCore(QtCore.QThread):
else: else:
self.jetson_ram_stylesheet_change_ready__signal.emit("background-color: darkgreen;") self.jetson_ram_stylesheet_change_ready__signal.emit("background-color: darkgreen;")
# self.jetson_msg.jetson_RAM = data.jetson_RAM self.jetson_gpu_temp_update_ready__signal.emit(str(self.jetson_msg.jetson_GPU_temp))
# self.ram.setText(str(self.jetson_msg.jetson_RAM))
# if self.jetson_msg.jetson_RAM > 79: if self.jetson_msg.jetson_GPU_temp > 64:
# self.ram.setStyleSheet("background-color: orange;") self.jetson_gpu_temp_stylesheet_change_ready__signal.emit("background-color: orange;")
# elif self.jetson_msg.jetson_RAM > 89: elif self.jetson_msg.jetson_GPU_temp > 79:
# self.ram.setStyleSheet("background-color: red;") self.jetson_gpu_temp_stylesheet_change_ready__signal.emit("background-color: red;")
# else: else:
# self.ram.setStyleSheet("background-color: darkgreen;") self.jetson_gpu_temp_stylesheet_change_ready__signal.emit("background-color: darkgreen;")
#
# self.jetson_msg.jetson_EMMC = data.jetson_EMMC self.jetson_emmc_update_ready__signal.emit(str(self.jetson_msg.jetson_EMMC))
# self.jetson_msg.jetson_NVME_SSD = data.jetson_NVME_SSD
#rospy.loginfo(self.jetson_msg) if self.jetson_msg.jetson_EMMC > 79:
self.jetson_emmc_stylesheet_change_ready__signal.emit("background-color: orange;")
elif self.jetson_msg.jetson_EMMC > 89:
self.jetson_emmc_stylesheet_change_ready__signal.emit("background-color: red;")
else:
self.jetson_emmc_stylesheet_change_ready__signal.emit("background-color: darkgreen")
def __gps_callback(self, data): def __gps_callback(self, data):
self.GPS_msg.UTC_GPS_time = data.UTC_GPS_time self.GPS_msg.UTC_GPS_time = data.UTC_GPS_time
@@ -220,6 +230,10 @@ class SensorCore(QtCore.QThread):
self.jetson_cpu_stylesheet_change_ready__signal.connect(self.cpu.setStyleSheet) self.jetson_cpu_stylesheet_change_ready__signal.connect(self.cpu.setStyleSheet)
self.jetson_ram_update_ready__signal.connect(self.ram.setText) self.jetson_ram_update_ready__signal.connect(self.ram.setText)
self.jetson_ram_stylesheet_change_ready__signal(self.ram.setStyleSheet) self.jetson_ram_stylesheet_change_ready__signal(self.ram.setStyleSheet)
self.jetson_emmc_update_ready__signal.connect(self.emmc.setText)
self.jetson_emmc_stylesheet_change_ready__signal.connect(self.emmc.setStyleSheet)
self.jetson_gpu_temp_update_ready__signal.connect(self.gpu_temp.setText)
self.jetson_gpu_temp_stylesheet_change_ready__signal(self.gpu_temp.setStyleSheet)
self.bogie_connection_1_stylesheet_change_ready__signal.connect(self.bogie_right.setStyleSheet) self.bogie_connection_1_stylesheet_change_ready__signal.connect(self.bogie_right.setStyleSheet)
self.bogie_connection_2_stylesheet_change_ready__signal.connect(self.bogie_left.setStyleSheet) self.bogie_connection_2_stylesheet_change_ready__signal.connect(self.bogie_left.setStyleSheet)
self.bogie_connection_3_stylesheet_change_ready__signal.connect(self.bogie_rear.setStyleSheet) self.bogie_connection_3_stylesheet_change_ready__signal.connect(self.bogie_rear.setStyleSheet)

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

@@ -39,7 +39,16 @@
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
<property name="margin"> <property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
@@ -68,7 +77,16 @@
</size> </size>
</property> </property>
<layout class="QGridLayout" name="gridLayout_4"> <layout class="QGridLayout" name="gridLayout_4">
<property name="margin"> <property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<property name="spacing"> <property name="spacing">
@@ -80,22 +98,22 @@
<number>0</number> <number>0</number>
</property> </property>
<item row="1" column="4"> <item row="1" column="4">
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="emmc">
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">background-color: darkgreen;</string> <string notr="true">background-color: darkgreen;</string>
</property> </property>
<property name="text"> <property name="text">
<string>placeholder</string> <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;EMMC&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="5"> <item row="1" column="5">
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="gpu_temp">
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">background-color: darkgreen;</string> <string notr="true">background-color: darkgreen;</string>
</property> </property>
<property name="text"> <property name="text">
<string>placeholder</string> <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;GPU &lt;/span&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Temp&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -798,7 +816,16 @@ Fix</string>
</size> </size>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="margin"> <property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<property name="spacing"> <property name="spacing">