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-03 19:58:24 -08:00
parent 0b64840ea4 575c5bc935
commit 21f9a66f58
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
software/ros_packages/rover_status/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 2.8.3) cmake_minimum_required(VERSION 2.8.3)
project(rover_statuses) project(rover_status)
## Compile as C++11, supported in ROS Kinetic and newer ## Compile as C++11, supported in ROS Kinetic and newer
# add_compile_options(-std=c++11) # add_compile_options(-std=c++11)

6
software/ros_packages/rover_status/package.xml
View File

@@ -1,8 +1,8 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<package format="2"> <package format="2">
<name>system_statuses</name> <name>rover_status</name>
<version>0.0.0</version> <version>0.0.0</version>
<description>The system_statuses package</description> <description>The rover_status package</description>
<!-- One maintainer tag required, multiple allowed, one person per tag --> <!-- One maintainer tag required, multiple allowed, one person per tag -->
<!-- Example: --> <!-- Example: -->
@@ -19,7 +19,7 @@
<!-- Url tags are optional, but multiple are allowed, one per tag --> <!-- Url tags are optional, but multiple are allowed, one per tag -->
<!-- Optional attribute type can be: website, bugtracker, or repository --> <!-- Optional attribute type can be: website, bugtracker, or repository -->
<!-- Example: --> <!-- Example: -->
<!-- <url type="website">http://wiki.ros.org/system_statuses</url> --> <!-- <url type="website">http://wiki.ros.org/rover_status</url> -->
<!-- Author tags are optional, multiple are allowed, one per tag --> <!-- Author tags are optional, multiple are allowed, one per tag -->

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

@@ -4,7 +4,7 @@ import os.path
import psutil import psutil
import subprocess import subprocess
from system_statuses.msg import CameraStatuses, BogieStatuses, FrSkyStatus, GPSInfo, MiscStatuses, JetsonInfo from system_statuses.msg import CameraStatuses, BogieStatuses, FrSkyStatus, GPSInfo, MiscStatuses, JetsonInfo
from rover_control.msg import DriveCommandMessage
class SystemStatuses: class SystemStatuses:
@@ -136,7 +136,10 @@ class SystemStatuses:
# Check FrSky Controller Connection Status (WIP) # Check FrSky Controller Connection Status (WIP)
def __set_frsky_controller_connection_status(self): 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 # Used mainly for init, sets all previous values in one go
def __update_all_previous_values(self): def __update_all_previous_values(self):