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

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

Browse Source
This commit is contained in:
Corwin Perren
2018-03-15 11:54:24 -07:00
parent 594c5f4ecc 56373dfde2
commit 9c1e2d801c
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
software/ros_packages/ground_station/src/Framework/MapSystems/RoverMapCoordinator.py
View File

@@ -59,21 +59,21 @@ class RoverMapCoordinator(QtCore.QThread):
self.logger.debug("Stopping Map Coordinator Thread") self.logger.debug("Stopping Map Coordinator Thread")
def _setup_map_threads(self): # def _setup_map_threads(self):
self.google_maps_object = RoverMap.GMapsStitcher(1280, # self.google_maps_object = RoverMap.GMapsStitcher(1280,
720, # 720,
44.567161, # 44.567161,
-123.278432, # -123.278432,
18, # 18,
'satellite', # 'satellite',
None, 20) # None, 20)
def _map_setup(self): def _map_setup(self):
self.google_maps_object = RoverMap.GMapsStitcher(1280, self.google_maps_object = RoverMap.GMapsStitcher(1280,
720, 720,
44.567161, 44.567161,
-123.278432, -123.278432,
18, 14,
'satellite', 'satellite',
None, 20) None, 20)
self.overlay_image_object = ( self.overlay_image_object = (
@@ -133,7 +133,8 @@ class RoverMapCoordinator(QtCore.QThread):
def update_overlay(self): def update_overlay(self):
navigation_list = self._get_table_elements(self.navigation_label) navigation_list = self._get_table_elements(self.navigation_label)
landmark_list = self._get_table_elements(self.landmark_label) # landmark_list = self._get_table_elements(self.landmark_label)
landmark_list = []
self.overlay_image_object.update_new_location(self.latitude, self.overlay_image_object.update_new_location(self.latitude,
self.longitude, self.longitude,
70, 70,

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

@@ -50,8 +50,8 @@ class SensorCore(QtCore.QThread):
self.shared_objects = shared_objects self.shared_objects = shared_objects
self.screen_main_window = self.shared_objects["screens"]["left_screen"] self.screen_main_window = self.shared_objects["screens"]["left_screen"]
self.cpu_read = self.screen_main_window.lineEdit # 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 # self.ram_read = self.screen_main_window.lineEdit_2 # type: QtWidgets.QLabel
# ########## set vars to gui elements # ########## set vars to gui elements
self.rover_conn = self.screen_main_window.rover # type: QtWidgets.QLabel self.rover_conn = self.screen_main_window.rover # type: QtWidgets.QLabel
@@ -229,11 +229,11 @@ class SensorCore(QtCore.QThread):
self.jetson_cpu_update_ready__signal.connect(self.cpu.setText) self.jetson_cpu_update_ready__signal.connect(self.cpu.setText)
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.connect(self.ram.setStyleSheet)
self.jetson_emmc_update_ready__signal.connect(self.emmc.setText) self.jetson_emmc_update_ready__signal.connect(self.emmc.setText)
self.jetson_emmc_stylesheet_change_ready__signal.connect(self.emmc.setStyleSheet) 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_update_ready__signal.connect(self.gpu_temp.setText)
self.jetson_gpu_temp_stylesheet_change_ready__signal(self.gpu_temp.setStyleSheet) self.jetson_gpu_temp_stylesheet_change_ready__signal.connect(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)