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

Fixed clock element name

Browse Source
This commit is contained in:
Corwin Perren
2018-03-17 15:26:51 -07:00
parent 42ab7914c0
commit 744169267f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,7 +70,7 @@ class SensorCore(QtCore.QThread):
self.bogie_right = self.screen_main_window.right_bogie # type: QtWidgets.QLabel self.bogie_right = self.screen_main_window.right_bogie # type: QtWidgets.QLabel
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_qlcdnumber # 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.gpu_temp = self.screen_main_window.gpu_temp # type: QtWidgets.QLabel

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

@@ -72,10 +72,10 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLCDNumber" name="clock_2"/> <widget class="QLCDNumber" name="clock_qlcdnumber"/>
</item> </item>
<item> <item>
<widget class="QLCDNumber" name="timer_2"/> <widget class="QLCDNumber" name="timer_qlcdnumber"/>
</item> </item>
</layout> </layout>
</item> </item>