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

Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018

Browse Source
This commit is contained in:
Chris Pham
2018-03-17 15:35:38 -07:00
parent 98d40c34e0 df75949dd1
commit fd94901f7d
3 changed files with 13 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_left = self.screen_main_window.left_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.ram = self.screen_main_window.ram # type: QtWidgets.QLabel
self.gpu_temp = self.screen_main_window.gpu_temp # type: QtWidgets.QLabel

BIN
software/ros_packages/ground_station/src/Resources/Images/osurclogo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

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

@@ -72,10 +72,10 @@
</widget>
</item>
<item>
<widget class="QLCDNumber" name="clock_2"/>
<widget class="QLCDNumber" name="clock_qlcdnumber"/>
</item>
<item>
<widget class="QLCDNumber" name="timer_2"/>
<widget class="QLCDNumber" name="timer_qlcdnumber"/>
</item>
</layout>
</item>
@@ -1981,6 +1981,11 @@ QTableView QTableCornerButton::section{
<string>Dist</string>
</property>
</column>
<item row="0" column="0">
<property name="text">
<string>Astronaut</string>
</property>
</item>
<item row="0" column="1">
<property name="text">
<string>32.1665</string>
@@ -1996,6 +2001,11 @@ QTableView QTableCornerButton::section{
<string>2.4 KM</string>
</property>
</item>
<item row="1" column="0">
<property name="text">
<string>Water</string>
</property>
</item>
<item row="1" column="1">
<property name="text">
<string>33.1124</string>