From 1c7646d07dff79c2e5863da33f3ee4f1ae4b02b5 Mon Sep 17 00:00:00 2001 From: Ken Steinfeldt Date: Thu, 15 Mar 2018 10:06:43 -0700 Subject: [PATCH 1/6] change current outputs to signals/slots --- .../src/Framework/StatusSystems/StatusCore.py | 96 ++++++++++++++----- 1 file changed, 74 insertions(+), 22 deletions(-) diff --git a/software/ros_packages/ground_station/src/Framework/StatusSystems/StatusCore.py b/software/ros_packages/ground_station/src/Framework/StatusSystems/StatusCore.py index 38e65ac..ff62b0b 100644 --- a/software/ros_packages/ground_station/src/Framework/StatusSystems/StatusCore.py +++ b/software/ros_packages/ground_station/src/Framework/StatusSystems/StatusCore.py @@ -17,9 +17,27 @@ MISC_TOPIC_NAME = "/rover_status/misc_status" class SensorCore(QtCore.QThread): + # ########## create signals for slots ########## jetson_cpu_update_ready__signal = QtCore.pyqtSignal(str) jetson_cpu_stylesheet_change_ready__signal = QtCore.pyqtSignal(str) + jetson_ram_update_ready__signal = QtCore.pyqtSignal(str) + jetson_ram_stylesheet_change_ready__signal = QtCore.pyqtSignal(str) + + bogie_connection_1_stylesheet_change_ready__signal = QtCore.pyqtSignal(str) + bogie_connection_2_stylesheet_change_ready__signal = QtCore.pyqtSignal(str) + bogie_connection_3_stylesheet_change_ready__signal = QtCore.pyqtSignal(str) + + camera_zed_stylesheet_change_ready__signal = QtCore.pyqtSignal(str) + camera_under_stylesheet_change_ready__signal = QtCore.pyqtSignal(str) + camera_chassis_stylesheet_change_ready__signal = QtCore.pyqtSignal(str) + camera_main_stylesheet_change_ready__signal = QtCore.pyqtSignal(str) + + gps_stylesheet_change_ready__signal = QtCore.pyqtSignal(str) + + frsky_stylesheet_change_ready__signal = QtCore.pyqtSignal(str) + + def __init__(self, shared_objects): super(SensorCore, self).__init__() @@ -32,6 +50,7 @@ class SensorCore(QtCore.QThread): self.cpu_read = self.screen_main_window.lineEdit # type: QtWidgets.QLabel self.ram_read = self.screen_main_window.lineEdit_2 # type: QtWidgets.QLabel + # ########## set vars to gui elements self.rover_conn = self.screen_main_window.rover # type: QtWidgets.QLabel self.frsky = self.screen_main_window.frsky # type: QtWidgets.QLabel self.nav_mouse = self.screen_main_window.nav_mouse # type: QtWidgets.QLabel @@ -48,7 +67,7 @@ class SensorCore(QtCore.QThread): self.cpu = self.screen_main_window.cpu # type: QtWidgets.QLabel self.ram = self.screen_main_window.ram # type: QtWidgets.QLabel - # Subscription examples on 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.bogie_status = rospy.Subscriber(BOGIE_TOPIC_NAME, BogieStatuses, self.__bogie_callback) self.frsky_status = rospy.Subscriber(FRSKY_TOPIC_NAME, FrSkyStatus, self.__frsky_callback) @@ -72,32 +91,40 @@ class SensorCore(QtCore.QThread): self.camera_msg.camera_main_navigation = data.camera_main_navigation if self.camera_msg.camera_zed is False: - self.zed.setStyleSheet("background-color: red;") + # self.zed.setStyleSheet("background-color: red;") + self.camera_zed_stylesheet_change_ready__signal.emit("background-color: red;") else: - self.zed.setStyleSheet("background-color: darkgreen;") + # self.zed.setStyleSheet("background-color: darkgreen;") + self.camera_zed_stylesheet_change_ready__signal.emit("background-color: darkgreen;") if self.camera_msg.camera_undercarriage is False: - self.under_cam.setStyleSheet("background-color: red;") + # self.under_cam.setStyleSheet("background-color: red;") + self.camera_under_stylesheet_change_ready__signal.emit("background-color: red;") else: - self.under_cam.setStyleSheet("background-color: darkgreen;") + # self.under_cam.setStyleSheet("background-color: darkgreen;") + self.camera_under_stylesheet_change_ready__signal.emit("background-color: darkgreen;") if self.camera_msg.camera_chassis is False: - self.chassis_cam.setStyleSheet("background-color: red;") + # self.chassis_cam.setStyleSheet("background-color: red;") + self.camera_chassis_stylesheet_change_ready__signal.emit("background-color: red;") else: - self.chassis_cam.setStyleSheet("background-color: darkgreen;") + # self.chassis_cam.setStyleSheet("background-color: darkgreen;") + self.camera_chassis_stylesheet_change_ready__signal.emit("background-color: darkgreen;") if self.camera_msg.camera_main_navigation is False: - self.main_cam.setStyleSheet("background-color: red;") + # self.main_cam.setStyleSheet("background-color: red;") + self.camera_main_stylesheet_change_ready__signal.emit("background-color: red;") else: - self.main_cam.setStyleSheet("background-color: darkgreen;") + # self.main_cam.setStyleSheet("background-color: darkgreen;") + self.camera_main_stylesheet_change_ready__signal.emit("background-color: darkgreen;") def __frsky_callback(self, data): self.FrSky_msg.FrSky_controller_connection_status = data.FrSky_controller_connection_status if self.FrSky_msg.FrSky_controller_connection_status is False: - self.frsky.setStyleSheet("background-color: red;") + self.frsky_stylesheet_change_ready__signal.emit("background-color: red;") else: - self.frsky.setStyleSheet("background-color: darkgreen;") + self.frsky_stylesheet_change_ready__signal.emit("background-color: darkgreen;") def __bogie_callback(self, data): self.bogie_msg.bogie_connection_1 = data.bogie_connection_1 @@ -105,19 +132,25 @@ class SensorCore(QtCore.QThread): self.bogie_msg.bogie_connection_3 = data.bogie_connection_3 if self.bogie_msg.bogie_connection_1 is False: - self.bogie_right.setStyleSheet("background-color: red;") + # self.bogie_right.setStyleSheet("background-color: red;") + self.bogie_connection_1_stylesheet_change_ready__signal.emit("background-color: red;") else: - self.bogie_right.setStyleSheet("background-color: darkgreen;") + # self.bogie_right.setStyleSheet("background-color: darkgreen;") + self.bogie_connection_1_stylesheet_change_ready__signal.emit("background-color: darkgreen;") if self.bogie_msg.bogie_connection_2 is False: - self.bogie_left.setStyleSheet("background-color: red;") + # self.bogie_left.setStyleSheet("background-color: red;") + self.bogie_connection_2_stylesheet_change_ready__signal.emit("background-color: red;") else: - self.bogie_left.setStyleSheet("background-color: darkgreen;") + # self.bogie_left.setStyleSheet("background-color: darkgreen;") + self.bogie_connection_2_stylesheet_change_ready__signal.emit("background-color: darkgreen;") if self.bogie_msg.bogie_connection_3 is False: - self.bogie_rear.setStyleSheet("background-color: red;") + # self.bogie_rear.setStyleSheet("background-color: red;") + self.bogie_connection_3_stylesheet_change_ready__signal.emit("background-color: red;") else: - self.bogie_rear.setStyleSheet("background-color: darkgreen;") + # self.bogie_rear.setStyleSheet("background-color: darkgreen;") + self.bogie_connection_3_stylesheet_change_ready__signal.emit("background-color: darkgreen;") def __jetson_callback(self, data): self.jetson_msg.jetson_CPU = data.jetson_CPU @@ -128,13 +161,19 @@ class SensorCore(QtCore.QThread): if self.jetson_msg.jetson_CPU > 79: self.jetson_cpu_stylesheet_change_ready__signal.emit("background-color: orange;") - # self.cpu.setStyleSheet("background-color: orange;") elif self.jetson_msg.jetson_CPU > 89: self.jetson_cpu_stylesheet_change_ready__signal.emit("background-color: red;") - # self.cpu.setStyleSheet("background-color: red;") else: self.jetson_cpu_stylesheet_change_ready__signal.emit("background-color: darkgreen;") - # self.cpu.setStyleSheet("background-color: darkgreen;") + + self.jetson_ram_update_ready__signal.emit(str(self.jetson_msg.jetson_RAM)) + + if self.jetson_msg.jetson_RAM > 79: + self.jetson_ram_stylesheet_change_ready__signal.emit("background-color: orange;") + elif self.jetson_msg.jetson_RAM > 89: + self.jetson_ram_stylesheet_change_ready__signal.emit("background-color: red;") + else: + self.jetson_ram_stylesheet_change_ready__signal.emit("background-color: darkgreen;") # self.jetson_msg.jetson_RAM = data.jetson_RAM # self.ram.setText(str(self.jetson_msg.jetson_RAM)) @@ -154,9 +193,11 @@ class SensorCore(QtCore.QThread): self.GPS_msg.GPS_connection_status = data.GPS_connection_status if self.GPS_msg.GPS_connection_status is False: - self.gps.setStyleSheet("background-color: red") + # self.gps.setStyleSheet("background-color: red") + self.gps_stylesheet_change_ready__signal.emit("background-color: red;") else: - self.gps.setStyleSheet("background-color: darkgreen;") + # self.gps.setStyleSheet("background-color: darkgreen;") + self.gps_stylesheet_change_ready__signal.emit("background-color: darkgreen;") def __misc_callback(self, data): self.misc_msg.arm_connection_status = data.arm_connection_status @@ -177,6 +218,17 @@ class SensorCore(QtCore.QThread): def connect_signals_and_slots(self): self.jetson_cpu_update_ready__signal.connect(self.cpu.setText) self.jetson_cpu_stylesheet_change_ready__signal.connect(self.cpu.setStyleSheet) + self.jetson_ram_update_ready__signal.connect(self.ram.setText) + self.jetson_ram_stylesheet_change_ready__signal(self.ram.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_3_stylesheet_change_ready__signal.connect(self.bogie_rear.setStyleSheet) + self.camera_zed_stylesheet_change_ready__signal.connect(self.zed.setStyleSheet) + self.camera_under_stylesheet_change_ready__signal.connect(self.under_cam.setStyleSheet) + self.camera_chassis_stylesheet_change_ready__signal.connect(self.chassis_cam.setStyleSheet) + self.camera_main_stylesheet_change_ready__signal.connect(self.main_cam.setStyleSheet) + self.gps_stylesheet_change_ready__signal.connect(self.gps.setStyleSheet) + self.frsky_stylesheet_change_ready__signal.connect(self.frsky.setStyleSheet) def setup_signals(self, start_signal, signals_and_slots_signal, kill_signal): start_signal.connect(self.start) From d2e1b7e22495799e9df440016625a1f5afa54afb Mon Sep 17 00:00:00 2001 From: Ken Steinfeldt Date: Thu, 15 Mar 2018 10:38:48 -0700 Subject: [PATCH 2/6] add emmc and gpu temp to outputs --- .../src/Framework/StatusSystems/StatusCore.py | 40 ++++++++++++------ .../src/Resources/Ui/left_screen.ui | 41 +++++++++++++++---- 2 files changed, 61 insertions(+), 20 deletions(-) diff --git a/software/ros_packages/ground_station/src/Framework/StatusSystems/StatusCore.py b/software/ros_packages/ground_station/src/Framework/StatusSystems/StatusCore.py index ff62b0b..2c3de6a 100644 --- a/software/ros_packages/ground_station/src/Framework/StatusSystems/StatusCore.py +++ b/software/ros_packages/ground_station/src/Framework/StatusSystems/StatusCore.py @@ -20,7 +20,10 @@ class SensorCore(QtCore.QThread): # ########## create signals for slots ########## jetson_cpu_update_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_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.cpu = self.screen_main_window.cpu # 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 ########## self.camera_status = rospy.Subscriber(CAMERA_TOPIC_NAME, CameraStatuses, self.__camera_callback) @@ -175,18 +180,23 @@ class SensorCore(QtCore.QThread): else: self.jetson_ram_stylesheet_change_ready__signal.emit("background-color: darkgreen;") - # self.jetson_msg.jetson_RAM = data.jetson_RAM - # self.ram.setText(str(self.jetson_msg.jetson_RAM)) - # if self.jetson_msg.jetson_RAM > 79: - # self.ram.setStyleSheet("background-color: orange;") - # elif self.jetson_msg.jetson_RAM > 89: - # self.ram.setStyleSheet("background-color: red;") - # else: - # self.ram.setStyleSheet("background-color: darkgreen;") - # - # self.jetson_msg.jetson_EMMC = data.jetson_EMMC - # self.jetson_msg.jetson_NVME_SSD = data.jetson_NVME_SSD - #rospy.loginfo(self.jetson_msg) + self.jetson_gpu_temp_update_ready__signal.emit(str(self.jetson_msg.jetson_GPU_temp)) + + if self.jetson_msg.jetson_GPU_temp > 64: + self.jetson_gpu_temp_stylesheet_change_ready__signal.emit("background-color: orange;") + elif self.jetson_msg.jetson_GPU_temp > 79: + self.jetson_gpu_temp_stylesheet_change_ready__signal.emit("background-color: red;") + else: + self.jetson_gpu_temp_stylesheet_change_ready__signal.emit("background-color: darkgreen;") + + self.jetson_emmc_update_ready__signal.emit(str(self.jetson_msg.jetson_EMMC)) + + 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): 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_ram_update_ready__signal.connect(self.ram.setText) 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_2_stylesheet_change_ready__signal.connect(self.bogie_left.setStyleSheet) self.bogie_connection_3_stylesheet_change_ready__signal.connect(self.bogie_rear.setStyleSheet) diff --git a/software/ros_packages/ground_station/src/Resources/Ui/left_screen.ui b/software/ros_packages/ground_station/src/Resources/Ui/left_screen.ui index 2fa285b..1f212a0 100644 --- a/software/ros_packages/ground_station/src/Resources/Ui/left_screen.ui +++ b/software/ros_packages/ground_station/src/Resources/Ui/left_screen.ui @@ -39,7 +39,16 @@ 0 - + + 0 + + + 0 + + + 0 + + 0 @@ -68,7 +77,16 @@ - + + 0 + + + 0 + + + 0 + + 0 @@ -80,22 +98,22 @@ 0 - + background-color: darkgreen; - placeholder + <html><head/><body><p align="center"><span style=" font-weight:600;">EMMC</span></p></body></html> - + background-color: darkgreen; - placeholder + <html><head/><body><p align="center"><span style=" font-weight:600;">GPU </span><span style=" font-weight:600;">Temp</span></p></body></html> @@ -798,7 +816,16 @@ Fix - + + 0 + + + 0 + + + 0 + + 0 From f33292a99220ecbeb3a42a2f57b4f7d096e77f06 Mon Sep 17 00:00:00 2001 From: Ken Steinfeldt Date: Thu, 15 Mar 2018 11:09:44 -0700 Subject: [PATCH 3/6] color change --- .../src/Framework/StatusSystems/StatusCore.py | 40 ++++++------ .../src/Resources/Ui/left_screen.ui | 63 ++++++------------- 2 files changed, 38 insertions(+), 65 deletions(-) diff --git a/software/ros_packages/ground_station/src/Framework/StatusSystems/StatusCore.py b/software/ros_packages/ground_station/src/Framework/StatusSystems/StatusCore.py index 2c3de6a..579676f 100644 --- a/software/ros_packages/ground_station/src/Framework/StatusSystems/StatusCore.py +++ b/software/ros_packages/ground_station/src/Framework/StatusSystems/StatusCore.py @@ -97,28 +97,28 @@ class SensorCore(QtCore.QThread): if self.camera_msg.camera_zed is False: # self.zed.setStyleSheet("background-color: red;") - self.camera_zed_stylesheet_change_ready__signal.emit("background-color: red;") + self.camera_zed_stylesheet_change_ready__signal.emit("background-color: darkred;") else: # self.zed.setStyleSheet("background-color: darkgreen;") self.camera_zed_stylesheet_change_ready__signal.emit("background-color: darkgreen;") if self.camera_msg.camera_undercarriage is False: - # self.under_cam.setStyleSheet("background-color: red;") - self.camera_under_stylesheet_change_ready__signal.emit("background-color: red;") + # self.under_cam.setStyleSheet("background-color: darkred;") + self.camera_under_stylesheet_change_ready__signal.emit("background-color: darkred;") else: # self.under_cam.setStyleSheet("background-color: darkgreen;") self.camera_under_stylesheet_change_ready__signal.emit("background-color: darkgreen;") if self.camera_msg.camera_chassis is False: - # self.chassis_cam.setStyleSheet("background-color: red;") - self.camera_chassis_stylesheet_change_ready__signal.emit("background-color: red;") + # self.chassis_cam.setStyleSheet("background-color: darkred;") + self.camera_chassis_stylesheet_change_ready__signal.emit("background-color: darkred;") else: # self.chassis_cam.setStyleSheet("background-color: darkgreen;") self.camera_chassis_stylesheet_change_ready__signal.emit("background-color: darkgreen;") if self.camera_msg.camera_main_navigation is False: - # self.main_cam.setStyleSheet("background-color: red;") - self.camera_main_stylesheet_change_ready__signal.emit("background-color: red;") + # self.main_cam.setStyleSheet("background-color: darkred;") + self.camera_main_stylesheet_change_ready__signal.emit("background-color: darkred;") else: # self.main_cam.setStyleSheet("background-color: darkgreen;") self.camera_main_stylesheet_change_ready__signal.emit("background-color: darkgreen;") @@ -127,7 +127,7 @@ class SensorCore(QtCore.QThread): self.FrSky_msg.FrSky_controller_connection_status = data.FrSky_controller_connection_status if self.FrSky_msg.FrSky_controller_connection_status is False: - self.frsky_stylesheet_change_ready__signal.emit("background-color: red;") + self.frsky_stylesheet_change_ready__signal.emit("background-color: darkred;") else: self.frsky_stylesheet_change_ready__signal.emit("background-color: darkgreen;") @@ -137,22 +137,22 @@ class SensorCore(QtCore.QThread): self.bogie_msg.bogie_connection_3 = data.bogie_connection_3 if self.bogie_msg.bogie_connection_1 is False: - # self.bogie_right.setStyleSheet("background-color: red;") - self.bogie_connection_1_stylesheet_change_ready__signal.emit("background-color: red;") + # self.bogie_right.setStyleSheet("background-color: darkred;") + self.bogie_connection_1_stylesheet_change_ready__signal.emit("background-color: darkred;") else: # self.bogie_right.setStyleSheet("background-color: darkgreen;") self.bogie_connection_1_stylesheet_change_ready__signal.emit("background-color: darkgreen;") if self.bogie_msg.bogie_connection_2 is False: - # self.bogie_left.setStyleSheet("background-color: red;") - self.bogie_connection_2_stylesheet_change_ready__signal.emit("background-color: red;") + # self.bogie_left.setStyleSheet("background-color: darkred;") + self.bogie_connection_2_stylesheet_change_ready__signal.emit("background-color: darkred;") else: # self.bogie_left.setStyleSheet("background-color: darkgreen;") self.bogie_connection_2_stylesheet_change_ready__signal.emit("background-color: darkgreen;") if self.bogie_msg.bogie_connection_3 is False: - # self.bogie_rear.setStyleSheet("background-color: red;") - self.bogie_connection_3_stylesheet_change_ready__signal.emit("background-color: red;") + # self.bogie_rear.setStyleSheet("background-color: darkred;") + self.bogie_connection_3_stylesheet_change_ready__signal.emit("background-color: darkred;") else: # self.bogie_rear.setStyleSheet("background-color: darkgreen;") self.bogie_connection_3_stylesheet_change_ready__signal.emit("background-color: darkgreen;") @@ -167,7 +167,7 @@ class SensorCore(QtCore.QThread): if self.jetson_msg.jetson_CPU > 79: self.jetson_cpu_stylesheet_change_ready__signal.emit("background-color: orange;") elif self.jetson_msg.jetson_CPU > 89: - self.jetson_cpu_stylesheet_change_ready__signal.emit("background-color: red;") + self.jetson_cpu_stylesheet_change_ready__signal.emit("background-color: darkred;") else: self.jetson_cpu_stylesheet_change_ready__signal.emit("background-color: darkgreen;") @@ -176,7 +176,7 @@ class SensorCore(QtCore.QThread): if self.jetson_msg.jetson_RAM > 79: self.jetson_ram_stylesheet_change_ready__signal.emit("background-color: orange;") elif self.jetson_msg.jetson_RAM > 89: - self.jetson_ram_stylesheet_change_ready__signal.emit("background-color: red;") + self.jetson_ram_stylesheet_change_ready__signal.emit("background-color: darkred;") else: self.jetson_ram_stylesheet_change_ready__signal.emit("background-color: darkgreen;") @@ -185,7 +185,7 @@ class SensorCore(QtCore.QThread): if self.jetson_msg.jetson_GPU_temp > 64: self.jetson_gpu_temp_stylesheet_change_ready__signal.emit("background-color: orange;") elif self.jetson_msg.jetson_GPU_temp > 79: - self.jetson_gpu_temp_stylesheet_change_ready__signal.emit("background-color: red;") + self.jetson_gpu_temp_stylesheet_change_ready__signal.emit("background-color: darkred;") else: self.jetson_gpu_temp_stylesheet_change_ready__signal.emit("background-color: darkgreen;") @@ -194,7 +194,7 @@ class SensorCore(QtCore.QThread): 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;") + self.jetson_emmc_stylesheet_change_ready__signal.emit("background-color: darkred;") else: self.jetson_emmc_stylesheet_change_ready__signal.emit("background-color: darkgreen") @@ -203,8 +203,8 @@ class SensorCore(QtCore.QThread): self.GPS_msg.GPS_connection_status = data.GPS_connection_status if self.GPS_msg.GPS_connection_status is False: - # self.gps.setStyleSheet("background-color: red") - self.gps_stylesheet_change_ready__signal.emit("background-color: red;") + # self.gps.setStyleSheet("background-color: darkred") + self.gps_stylesheet_change_ready__signal.emit("background-color: darkred;") else: # self.gps.setStyleSheet("background-color: darkgreen;") self.gps_stylesheet_change_ready__signal.emit("background-color: darkgreen;") diff --git a/software/ros_packages/ground_station/src/Resources/Ui/left_screen.ui b/software/ros_packages/ground_station/src/Resources/Ui/left_screen.ui index 1f212a0..3221e1a 100644 --- a/software/ros_packages/ground_station/src/Resources/Ui/left_screen.ui +++ b/software/ros_packages/ground_station/src/Resources/Ui/left_screen.ui @@ -39,16 +39,7 @@ 0 - - 0 - - - 0 - - - 0 - - + 0 @@ -77,16 +68,7 @@ - - 0 - - - 0 - - - 0 - - + 0 @@ -100,7 +82,7 @@ - background-color: darkgreen; + background-color: darkred; <html><head/><body><p align="center"><span style=" font-weight:600;">EMMC</span></p></body></html> @@ -110,7 +92,7 @@ - background-color: darkgreen; + background-color: darkred; <html><head/><body><p align="center"><span style=" font-weight:600;">GPU </span><span style=" font-weight:600;">Temp</span></p></body></html> @@ -145,7 +127,7 @@ - background-color:darkgreen; + background-color:darkred; QFrame::NoFrame @@ -193,7 +175,7 @@ Connected - background-color:darkgreen; + background-color:darkred; FrSky @@ -235,7 +217,7 @@ Connected false - background-color:darkgreen; + background-color:darkred; Right Bogie @@ -274,7 +256,7 @@ Connected - background-color:darkgreen; + background-color:darkred; QFrame::NoFrame @@ -316,7 +298,7 @@ Connected - background-color:darkgreen; + background-color:darkred; QFrame::NoFrame @@ -361,7 +343,7 @@ Connected false - background-color:darkgreen; + background-color:darkred; 3D Nav Mouse @@ -400,7 +382,7 @@ Connected - background-color:darkgreen; + background-color:darkred; QFrame::NoFrame @@ -448,7 +430,7 @@ Connected - background-color:darkgreen; + background-color:darkred; Chassis Camera @@ -493,7 +475,7 @@ Connected - background-color:darkgreen; + background-color:darkred; Undercarriage Camera @@ -510,7 +492,7 @@ Connected - background-color: darkgreen; + background-color: darkred; <html><head/><body><p align="center"><span style=" font-weight:600;">RAM</span></p></body></html> @@ -520,7 +502,7 @@ Connected - background-color: darkgreen; + background-color: darkred; <html><head/><body><p align="center"><span style=" font-weight:600;">CPU %</span></p></body></html> @@ -555,7 +537,7 @@ Connected - background-color:darkgreen; + background-color:darkred; QFrame::NoFrame @@ -600,7 +582,7 @@ Connected false - background-color:darkgreen; + background-color:darkred; GPS @@ -816,16 +798,7 @@ Fix - - 0 - - - 0 - - - 0 - - + 0 From 30afe7c5b0ba65ec59786b31e335140b44124465 Mon Sep 17 00:00:00 2001 From: Corwin Perren Date: Thu, 15 Mar 2018 11:11:10 -0700 Subject: [PATCH 4/6] Updated gui elements for IMU pitch and roll. Also updated left screen tab widget and lat/lon editing. --- .../src/Resources/Ui/left_screen.ui | 1463 +++++++++++------ .../src/Resources/Ui/right_screen.ui | 549 ++++--- 2 files changed, 1337 insertions(+), 675 deletions(-) diff --git a/software/ros_packages/ground_station/src/Resources/Ui/left_screen.ui b/software/ros_packages/ground_station/src/Resources/Ui/left_screen.ui index 2fa285b..8c781e5 100644 --- a/software/ros_packages/ground_station/src/Resources/Ui/left_screen.ui +++ b/software/ros_packages/ground_station/src/Resources/Ui/left_screen.ui @@ -89,358 +89,6 @@ - - - - background-color: darkgreen; - - - placeholder - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 9999999 - 9999999 - - - - - 10 - 75 - true - - - - background-color:darkgreen; - - - QFrame::NoFrame - - - Left Bogie -Connected - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 9999999 - 9999999 - - - - - 0 - 0 - - - - - 10 - 75 - true - - - - background-color:darkgreen; - - - FrSky -Connected - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 9999999 - 9999999 - - - - - 10 - 75 - true - - - - false - - - background-color:darkgreen; - - - Right Bogie -Connected - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 9999999 - 9999999 - - - - - 10 - 75 - true - - - - background-color:darkgreen; - - - QFrame::NoFrame - - - Logitech Joystick -Connected - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 9999999 - 9999999 - - - - - 10 - 75 - true - - - - background-color:darkgreen; - - - QFrame::NoFrame - - - Rear Bogie -Connected - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 9999999 - 9999999 - - - - - 10 - 75 - true - - - - false - - - background-color:darkgreen; - - - 3D Nav Mouse -Connected - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 9999999 - 9999999 - - - - - 10 - 75 - true - - - - background-color:darkgreen; - - - QFrame::NoFrame - - - Main Nav Camera -Connected - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 9999999 - 9999999 - - - - - 0 - 0 - - - - - 10 - 75 - true - - - - background-color:darkgreen; - - - Chassis Camera -Connected - - - Qt::AlignCenter - - - @@ -486,19 +134,61 @@ Connected - - - - - + + background-color: darkgreen; - <html><head/><body><p align="center"><span style=" font-weight:600;">RAM</span></p></body></html> + placeholder + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 9999999 + 9999999 + + + + + 10 + 75 + true + + + + false + + + background-color:darkgreen; + + + Right Bogie +Connected + + + Qt::AlignCenter + + + + + + @@ -509,6 +199,16 @@ Connected + + + + background-color: darkgreen; + + + <html><head/><body><p align="center"><span style=" font-weight:600;">RAM</span></p></body></html> + + + @@ -637,6 +337,306 @@ Fix + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 9999999 + 9999999 + + + + + 10 + 75 + true + + + + background-color:darkgreen; + + + QFrame::NoFrame + + + Rear Bogie +Connected + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 9999999 + 9999999 + + + + + 10 + 75 + true + + + + background-color:darkgreen; + + + QFrame::NoFrame + + + Main Nav Camera +Connected + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 9999999 + 9999999 + + + + + 10 + 75 + true + + + + false + + + background-color:darkgreen; + + + 3D Nav Mouse +Connected + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 9999999 + 9999999 + + + + + 10 + 75 + true + + + + background-color:darkgreen; + + + QFrame::NoFrame + + + Left Bogie +Connected + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 9999999 + 9999999 + + + + + 0 + 0 + + + + + 10 + 75 + true + + + + background-color:darkgreen; + + + Chassis Camera +Connected + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 9999999 + 9999999 + + + + + 0 + 0 + + + + + 10 + 75 + true + + + + background-color:darkgreen; + + + FrSky +Connected + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 9999999 + 9999999 + + + + + 10 + 75 + true + + + + background-color:darkgreen; + + + QFrame::NoFrame + + + Logitech Joystick +Connected + + + Qt::AlignCenter + + + @@ -665,78 +665,303 @@ Fix 0 - - - ROSBAG Recording - - - - - - Camera Recording - - - - - - - Start - - - - - - - Control Recording - - - - - - - Navigation Recording - - - - - - - Statuses Recording - - - - - - - Start - - - - - - - Start - - - - - - - Start - - - - - - Science Data + Science Readouts + + + + + + + + 12 + 75 + true + + + + Soil Probe + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + + Soil Temperature: + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + N/A + + + + + + + Soil PH: + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + N/A + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + Read Soil Probe + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + Qt::Vertical + + + + + + + + + + 12 + 75 + true + + + + Dust Sensor + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + + Small Dust Present: + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + Large Dust Present: + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + False + + + + + + + False + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + Settings + + + + + Ubiquiti Radio Channel + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Map Selection + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + OSU Campus + + + + + + + + + + 1 + + + 11 + + + + + + + Apply + + + + + + @@ -798,14 +1023,20 @@ Fix - + 0 - + + 6 + + 0 + + 0 + @@ -816,12 +1047,63 @@ Fix - Manual Waypoint Entry + Manual Waypoint Entry/Editing - + + + + 75 + true + + + + Decimal Format + + + + + + + + + QAbstractSpinBox::NoButtons + + + 9 + + + -90.000000000000000 + + + 90.000000000000000 + + + 0.000001000000000 + + + + + + + QAbstractSpinBox::NoButtons + + + 9 + + + -180.000000000000000 + + + 180.000000000000000 + + + 0.000001000000000 + + + @@ -829,9 +1111,6 @@ Fix - - - @@ -839,38 +1118,266 @@ Fix - - + + + + Qt::Horizontal + + + + 40 + 20 + + + - - - Qt::Vertical - - - - 20 - 40 - - - - - - + - 18 75 true - ENABLE AUTONOMY + Degrees/Minute/Second Format + + + + + + Lattitude + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + " + + + 3 + + + + + + + Longitude + + + + + + + " + + + 3 + + + + + + + ° + + + -90 + + + 90 + + + + + + + ' + + + 60 + + + + + + + ° + + + -180 + + + 90 + + + + + + + ' + + + 60 + + + + + + + + + + + + + N + + + + + S + + + + + + + + + + + + + + W + + + + + E + + + + + + + + + + Qt::Horizontal + + + + + + + + 12 + 75 + true + + + + Autonomy + + + + + + + 6 + + + + + + 12 + + + + Status: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 12 + + + + Control: + + + + + + + + 12 + 75 + true + + + + ENABLE + + + + + + + + 12 + + + + background-color:darkred; + + + DISABLED + + + Qt::AlignCenter + + + + + @@ -951,7 +1458,7 @@ QTableView QTableCornerButton::section{ false - false + true false @@ -983,45 +1490,60 @@ QTableView QTableCornerButton::section{ - LAT + # - LON + Lat - DIST + Lon + + + + + Dist - 32.1665 + 1 - -112.1115 + 32.1665 + + -112.1115 + + + 2.4 KM - 33.1124 + 2 - -111.4334 + 33.1124 + + -111.4334 + + + 5.7 KM @@ -1163,6 +1685,9 @@ GPS + + 0 + @@ -1213,11 +1738,14 @@ QTableView QTableCornerButton::section{ QAbstractItemView::SelectRows + + false + false - false + true false @@ -1249,45 +1777,50 @@ QTableView QTableCornerButton::section{ - LAT + Name - LON + Lat - DIST + Lon - + + + Dist + + + 32.1665 - + -112.1115 - + 2.4 KM - + 33.1124 - + -111.4334 - + 5.7 KM diff --git a/software/ros_packages/ground_station/src/Resources/Ui/right_screen.ui b/software/ros_packages/ground_station/src/Resources/Ui/right_screen.ui index ed7d282..2660aec 100644 --- a/software/ros_packages/ground_station/src/Resources/Ui/right_screen.ui +++ b/software/ros_packages/ground_station/src/Resources/Ui/right_screen.ui @@ -858,225 +858,354 @@ 0 - - - - 22 - 75 - true - - - - Current Speed - - - Qt::AlignCenter - - - - - - - 0 - + - - - - 22 - + + + 0 - - 0.0 - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - + + + + + + + + + 15 + 75 + true + + + + Current Speed + + + Qt::AlignCenter + + + + + + + 0 + + + + + + 14 + + + + 0.0 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 14 + + + + m/s + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + + 15 + 75 + true + + + + Speed Limit + + + Qt::AlignCenter + + + + + + + 100 + + + 50 + + + Qt::AlignCenter + + + true + + + Qt::Horizontal + + + false + + + QProgressBar::TopToBottom + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + + 15 + 75 + true + + + + Tank Drive Output + + + Qt::AlignCenter + + + + + + + QFormLayout::ExpandingFieldsGrow + + + 6 + + + + + + 75 + true + + + + Left + + + + + + + background-color:darkred; + + + 0 + + + 100 + + + 0 + + + true + + + + + + + + 75 + true + + + + Right + + + + + + + background-color:darkred; + + + 0 + + + 100 + + + 0 + + + true + + + + + + - - - - 22 - + + + Qt::Vertical - - m/s + + + 20 + 40 + - + + + + + + 0 + + + + + + 15 + 75 + true + + + + IMU Data + + + Qt::AlignCenter + + + + + + + 0 + + + + + 0 + + + + + -100 + + + 100 + + + + + + + + 75 + true + + + + Pitch + + + Qt::AlignCenter + + + + + + + + + 0 + + + + + -100 + + + 100 + + + false + + + true + + + + + + + + 75 + true + + + + Roll + + + Qt::AlignCenter + + + + + + + + - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - 22 - 75 - true - - - - Speed Limit - - - Qt::AlignCenter - - - - - - - 100 - - - 50 - - - Qt::AlignCenter - - - true - - - Qt::Horizontal - - - false - - - QProgressBar::TopToBottom - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - 22 - 75 - true - - - - Tank Drive Output - - - Qt::AlignCenter - - - - - - - 6 - - - - - - 75 - true - - - - Left - - - - - - - background-color:darkred; - - - 0 - - - 100 - - - 0 - - - true - - - - - - - - 75 - true - - - - Right - - - - - - - background-color:darkred; - - - 0 - - - 100 - - - 0 - - - true - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - From 0e184fee3d6c0f42dfa052c051650263f2515e42 Mon Sep 17 00:00:00 2001 From: Ken Steinfeldt Date: Thu, 15 Mar 2018 11:25:46 -0700 Subject: [PATCH 5/6] fixes weird ui merge garbage --- .../src/Resources/Ui/left_screen.ui | 445 ++++++++---------- 1 file changed, 206 insertions(+), 239 deletions(-) diff --git a/software/ros_packages/ground_station/src/Resources/Ui/left_screen.ui b/software/ros_packages/ground_station/src/Resources/Ui/left_screen.ui index 0f49ff5..5fda95e 100644 --- a/software/ros_packages/ground_station/src/Resources/Ui/left_screen.ui +++ b/software/ros_packages/ground_station/src/Resources/Ui/left_screen.ui @@ -95,66 +95,11 @@ background-color: darkred; - <html><head/><body><p align="center"><span style=" font-weight:600;">GPU </span><span style=" font-weight:600;">Temp</span></p></body></html> + <html><head/><body><p align="center"><span style=" font-size:9pt; font-weight:600;">GPU Temp C</span></p></body></html> - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 9999999 - 9999999 - - - - - 0 - 0 - - - - - 10 - 75 - true - - - - background-color:darkred; - - - Undercarriage Camera -Connected - - - Qt::AlignCenter - - - - - - - background-color: darkgreen; - - - placeholder - - - - + @@ -199,69 +144,7 @@ Connected - - - - background-color: darkgreen; - - - <html><head/><body><p align="center"><span style=" font-weight:600;">CPU %</span></p></body></html> - - - - - - - background-color: darkgreen; - - - <html><head/><body><p align="center"><span style=" font-weight:600;">RAM</span></p></body></html> - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 9999999 - 9999999 - - - - - 10 - 75 - true - - - - background-color:darkred; - - - QFrame::NoFrame - - - Rover -Connected - - - Qt::AlignCenter - - - - + @@ -303,7 +186,7 @@ Fix - + @@ -344,10 +227,7 @@ Fix - - - - + @@ -389,7 +269,7 @@ Connected - + @@ -466,116 +346,6 @@ Connected 3D Nav Mouse -Connected - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 9999999 - 9999999 - - - - - 10 - 75 - true - - - - background-color:darkred; - - - QFrame::NoFrame - - - Left Bogie -Connected - - - Qt::AlignCenter - - - - - - - - - - background-color: darkred; - - - <html><head/><body><p align="center"><span style=" font-weight:600;">RAM</span></p></body></html> - - - - - - - background-color: darkred; - - - <html><head/><body><p align="center"><span style=" font-weight:600;">CPU %</span></p></body></html> - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 9999999 - 9999999 - - - - - 0 - 0 - - - - - 10 - 75 - true - - - - background-color:darkred; - - - Chassis Camera Connected @@ -656,13 +426,210 @@ Connected - background-color:darkgreen; + background-color:darkred; QFrame::NoFrame Logitech Joystick +Connected + + + Qt::AlignCenter + + + + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 9999999 + 9999999 + + + + + 10 + 75 + true + + + + background-color:darkred; + + + QFrame::NoFrame + + + Rover +Connected + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 9999999 + 9999999 + + + + + 0 + 0 + + + + + 10 + 75 + true + + + + background-color:darkred; + + + Chassis Camera +Connected + + + Qt::AlignCenter + + + + + + + background-color: darkred; + + + <html><head/><body><p align="center"><span style=" font-weight:600;">RAM</span></p></body></html> + + + + + + + background-color: darkred; + + + <html><head/><body><p align="center"><span style=" font-weight:600;">CPU %</span></p></body></html> + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 9999999 + 9999999 + + + + + 0 + 0 + + + + + 10 + 75 + true + + + + background-color:darkred; + + + Undercarriage Camera +Connected + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 9999999 + 9999999 + + + + + 10 + 75 + true + + + + background-color:darkred; + + + QFrame::NoFrame + + + Left Bogie Connected @@ -696,7 +663,7 @@ Connected - 0 + 1 @@ -1031,7 +998,7 @@ Connected - Connection + 0 From ffef2711e9b281ea2773bd4a502dd46166855703 Mon Sep 17 00:00:00 2001 From: Ken Steinfeldt Date: Thu, 15 Mar 2018 11:28:34 -0700 Subject: [PATCH 6/6] take out unused vars --- .../ground_station/src/Framework/StatusSystems/StatusCore.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/software/ros_packages/ground_station/src/Framework/StatusSystems/StatusCore.py b/software/ros_packages/ground_station/src/Framework/StatusSystems/StatusCore.py index 579676f..cf63db4 100644 --- a/software/ros_packages/ground_station/src/Framework/StatusSystems/StatusCore.py +++ b/software/ros_packages/ground_station/src/Framework/StatusSystems/StatusCore.py @@ -50,8 +50,8 @@ class SensorCore(QtCore.QThread): self.shared_objects = shared_objects self.screen_main_window = self.shared_objects["screens"]["left_screen"] - self.cpu_read = self.screen_main_window.lineEdit # type: QtWidgets.QLabel - self.ram_read = self.screen_main_window.lineEdit_2 # type: QtWidgets.QLabel + # self.cpu_read = self.screen_main_window.lineEdit # type: QtWidgets.QLabel + # self.ram_read = self.screen_main_window.lineEdit_2 # type: QtWidgets.QLabel # ########## set vars to gui elements self.rover_conn = self.screen_main_window.rover # type: QtWidgets.QLabel