caperren/osurc_mars_rover_2017_2018
1
0
Fork 0
mirror of https://github.com/OSURoboticsClub/Rover_2017_2018.git synced 2025-11-09 02:31:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

small amount of cleanup for some missed changes

Browse Source
This commit is contained in:
Ken Steinfeldt
2018-03-08 16:03:31 -08:00
parent 3eac5910d2
commit 10750a7a5f
3 changed files with 113 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
software/ros_packages/rover_status/msg/RoverSysStatus.msg
View File

@@ -1,19 +1,20 @@
int8 UTC_GPS_time
int8 bogie_connection_1
int8 bogie_connection_2
int8 bogie_connection_3
int8 arm_connection_status
int8 arm_end_effector_connection_statuses
int8 camera_zed
int8 camera_undercarriage
int8 camera_chassis
int8 camera_main_navigation
int8 sample_containment_connection_status
int8 tower_connection_status
int8 chassis_pan_tilt_connection_status
bool bogie_connection_1
bool bogie_connection_2
bool bogie_connection_3
bool arm_connection_status
bool arm_end_effector_connection_statuses
bool camera_zed
bool camera_undercarriage
bool camera_chassis
bool camera_main_navigation
bool sample_containment_connection_status
bool tower_connection_status
bool chassis_pan_tilt_connection_status
int8 GPS_connection_status
int8 jetson_CPU
int8 jetson_RAM
int8 jetson_EMMC
int8 jetson_NVME_SSD
int8 FrSky_controller_connection_status
float64 jetson_CPU
float64 jetson_RAM
float64 jetson_EMMC
float64 jetson_NVME_SSD
float64 jetson_GPU_temp
bool FrSky_controller_connection_status

2
software/ros_packages/rover_status/src/system_statuses_node.py
View File

@@ -158,7 +158,7 @@ class SystemStatuses:
.replace("\n", "").replace("+", "").split()
self.jetson_msg.jetson_GPU_temp = float(parsed_temps[4])
except subprocess.CalledProcessError:
print 'sensors call failed (potential reason: on VM)'
print('sensors call failed (potential reason: on VM)')
self.jetson_msg.jetson_GPU_temp = -1.0
# EMMC and NVMe_SSD used % calculation