diff --git a/software/ros_packages/rover_status/CMakeLists.txt b/software/ros_packages/rover_status/CMakeLists.txt index 0000223..5bed061 100644 --- a/software/ros_packages/rover_status/CMakeLists.txt +++ b/software/ros_packages/rover_status/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 2.8.3) -project(rover_statuses) +project(rover_status) ## Compile as C++11, supported in ROS Kinetic and newer # add_compile_options(-std=c++11) diff --git a/software/ros_packages/rover_status/package.xml b/software/ros_packages/rover_status/package.xml index 0750d55..f18eb93 100644 --- a/software/ros_packages/rover_status/package.xml +++ b/software/ros_packages/rover_status/package.xml @@ -1,8 +1,8 @@ - system_statuses + rover_status 0.0.0 - The system_statuses package + The rover_status package @@ -19,7 +19,7 @@ - + diff --git a/software/ros_packages/rover_status/src/system_statuses_node.py b/software/ros_packages/rover_status/src/system_statuses_node.py index 0d663b4..d10a9f8 100755 --- a/software/ros_packages/rover_status/src/system_statuses_node.py +++ b/software/ros_packages/rover_status/src/system_statuses_node.py @@ -4,7 +4,7 @@ import os.path import psutil import subprocess from system_statuses.msg import CameraStatuses, BogieStatuses, FrSkyStatus, GPSInfo, MiscStatuses, JetsonInfo - +from rover_control.msg import DriveCommandMessage class SystemStatuses: @@ -136,7 +136,10 @@ class SystemStatuses: # Check FrSky Controller Connection Status (WIP) def __set_frsky_controller_connection_status(self): - self.FrSky_msg.FrSky_controller_connection_status = 0 + rospy.Subscriber('/rover_control/command_control/iris_drive', DriveCommandMessage, self.__frsky_callback) + + def __frsky_callback(self, data): + self.FrSky_msg.FrSky_controller_connection_status = data.controller_present # Used mainly for init, sets all previous values in one go def __update_all_previous_values(self):