caperren/osurc_mars_rover_2017_2018
1
0
Fork 0
mirror of https://github.com/OSURoboticsClub/Rover_2017_2018.git synced 2025-12-31 03:24:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Got pan/tilt and tower combo node done. Other misc changes.

Browse Source
This commit is contained in:
Corwin Perren
2018-07-14 20:54:50 -07:00
parent de93764849
commit 1b7f5437b9
10 changed files with 271 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -91,7 +91,7 @@ class SensorCore(QtCore.QThread):
self.battery_status = rospy.Subscriber(BATTERY_TOPIC_NAME, BatteryStatusMessage, self.__battery_callback)
self.camera_msg = CameraStatuses()
self.bogie_msg = BogieStatuses()
self.bogie_msg = None # BogieStatuses()
self.FrSky_msg = FrSkyStatus()
self.GPS_msg = GPSInfo()
self.jetson_msg = JetsonInfo()
@@ -148,7 +148,7 @@ class SensorCore(QtCore.QThread):
self.frsky_stylesheet_change_ready__signal.emit(COLOR_GREEN)
def __jetson_callback(self, data):
self.jetson_cpu_update_ready__signal.emit("TX2 CPU\n" + str(data.jetson_CPU) + "%")
self.jetson_cpu_update_ready__signal.emit("TX2 CPU\n" + str(data.jetson_CPU) + " %")
if data.jetson_CPU > 85:
self.jetson_cpu_stylesheet_change_ready__signal.emit(COLOR_ORANGE)
@@ -157,7 +157,7 @@ class SensorCore(QtCore.QThread):
else:
self.jetson_cpu_stylesheet_change_ready__signal.emit(COLOR_GREEN)
self.jetson_ram_update_ready__signal.emit("TX2 RAM\n" + str(data.jetson_RAM) + "%")
self.jetson_ram_update_ready__signal.emit("TX2 RAM\n" + str(data.jetson_RAM) + " %")
if data.jetson_RAM > 79:
self.jetson_ram_stylesheet_change_ready__signal.emit(COLOR_ORANGE)
@@ -166,7 +166,7 @@ class SensorCore(QtCore.QThread):
else:
self.jetson_ram_stylesheet_change_ready__signal.emit(COLOR_GREEN)
self.jetson_gpu_temp_update_ready__signal.emit("TX2 TEMP\n" + str(data.jetson_GPU_temp) + "°C")
self.jetson_gpu_temp_update_ready__signal.emit("TX2 TEMP\n" + str(data.jetson_GPU_temp) + " °C")
if data.jetson_GPU_temp > 64:
self.jetson_gpu_temp_stylesheet_change_ready__signal.emit(COLOR_ORANGE)
@@ -175,7 +175,7 @@ class SensorCore(QtCore.QThread):
else:
self.jetson_gpu_temp_stylesheet_change_ready__signal.emit(COLOR_GREEN)
self.jetson_emmc_update_ready__signal.emit("TX2 EMMC\n" + str(data.jetson_EMMC) + "%")
self.jetson_emmc_update_ready__signal.emit("TX2 EMMC\n" + str(data.jetson_EMMC) + " %")
if data.jetson_EMMC > 79:
self.jetson_emmc_stylesheet_change_ready__signal.emit(COLOR_ORANGE)
@@ -207,7 +207,7 @@ class SensorCore(QtCore.QThread):
else:
self.battery_voltage_stylesheet_change_ready__signal.emit(COLOR_RED)
self.battery_voltage_update_ready__signal.emit("Battery Voltage\n" + str(voltage) + "V")
self.battery_voltage_update_ready__signal.emit("Battery Voltage\n" + str(voltage) + " V")
def __display_time(self):
time = QtCore.QTime.currentTime()

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

@@ -13,7 +13,7 @@ import json
#####################################
# Global Variables
#####################################
THREAD_HERTZ = 2
THREAD_HERTZ = 5
ACCESS_POINT_IP = "192.168.1.20" # The channel only has to be set on the access point. The staion will adjust.
ACCESS_POINT_USER = "ubnt"

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

@@ -264,7 +264,11 @@
<string notr="true">background-color:darkgreen; border: 0.5px solid black;</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;TX2 EMMC&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>TX2 EMMC
-- %</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@@ -797,7 +801,11 @@ Disconnected</string>
<string notr="true">background-color:darkgreen; border: 0.5px solid black;</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;TX2 CPU&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>TX2 CPU
-- %</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@@ -817,7 +825,11 @@ Disconnected</string>
<string notr="true">background-color:darkgreen; border: 0.5px solid black;</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-size:9pt; font-weight:600;&quot;&gt;TX2 TEMP&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>TX2 Temp
-- °C</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@@ -963,7 +975,11 @@ Connected</string>
<string notr="true">background-color:darkgreen; border: 0.5px solid black;</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;TX2 RAM&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>TX2 RAM
-- %</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@@ -1047,7 +1063,7 @@ Connected</string>
</property>
<property name="text">
<string>Connection Quality
0.0%</string>
-- %</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@@ -1088,8 +1104,8 @@ Connected</string>
<enum>QFrame::NoFrame</enum>
</property>
<property name="text">
<string>RX Rate: 240.0 Mbps
TX Rate: 300 Mbps</string>
<string>RX Rate: --- Mbps
TX Rate: --- Mbps</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@@ -1131,7 +1147,7 @@ TX Rate: 300 Mbps</string>
</property>
<property name="text">
<string>Successful Transmit
0.0%</string>
-- %</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@@ -1172,8 +1188,8 @@ TX Rate: 300 Mbps</string>
<enum>QFrame::NoFrame</enum>
</property>
<property name="text">
<string>TX Latency: 10000 ms
RX Latency: 10000 ms</string>
<string>TX Latency: ----- ms
RX Latency: ----- ms</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>