From 0c602430d4bc92f148f0db837a39600286d44c28 Mon Sep 17 00:00:00 2001
From: Gareth Ellis <gareth.ellis0@gmail.com>
Date: Tue, 15 Oct 2019 13:03:02 -0700
Subject: [PATCH 1/2] Increased Controller Spawner Timeout In All Gazebo Launch
 Files

---
 autorally_gazebo/launch/autoRallyJumpGazeboSim.launch      | 2 +-
 autorally_gazebo/launch/autoRallyTrackCCRFGazeboSim.launch | 2 +-
 autorally_gazebo/launch/autoRallyTrackGazeboSim.launch     | 2 +-
 autorally_gazebo/launch/singlePlatform.launch              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/autorally_gazebo/launch/autoRallyJumpGazeboSim.launch b/autorally_gazebo/launch/autoRallyJumpGazeboSim.launch
index 873e1771..6c67a60b 100644
--- a/autorally_gazebo/launch/autoRallyJumpGazeboSim.launch
+++ b/autorally_gazebo/launch/autoRallyJumpGazeboSim.launch
@@ -80,7 +80,7 @@ rosservice call autorally_platform/gazebo/delete_model '{model_name: autoRallyPl
     <!-- Load the joint controllers. One of these publishes the joint states
          to joint_states. -->
     <node name="controller_spawner" pkg="controller_manager" type="spawner"
-          args="$(find autorally_gazebo)/config/autoRallyPlatformJointCtrlrParams.yaml"/>
+          args="$(find autorally_gazebo)/config/autoRallyPlatformJointCtrlrParams.yaml --timeout 120"/>
 
     <!-- Control the steering, axle, and shock absorber joints. -->
     <node name="autorally_controller" pkg="autorally_gazebo"
diff --git a/autorally_gazebo/launch/autoRallyTrackCCRFGazeboSim.launch b/autorally_gazebo/launch/autoRallyTrackCCRFGazeboSim.launch
index fac5ec1b..0a37cb6a 100644
--- a/autorally_gazebo/launch/autoRallyTrackCCRFGazeboSim.launch
+++ b/autorally_gazebo/launch/autoRallyTrackCCRFGazeboSim.launch
@@ -68,7 +68,7 @@ limitations under the License.
 
   <!-- load controllers -->
   <node name="controller_spawner" pkg="controller_manager" type="spawner"
-          args="$(find autorally_gazebo)/config/autoRallyPlatformJointCtrlrParams.yaml"/>
+          args="$(find autorally_gazebo)/config/autoRallyPlatformJointCtrlrParams.yaml --timeout 120"/>
 
   <!-- Control the steering, axle, and shock absorber joints. -->
   <node name="autorally_controller" pkg="autorally_gazebo"
diff --git a/autorally_gazebo/launch/autoRallyTrackGazeboSim.launch b/autorally_gazebo/launch/autoRallyTrackGazeboSim.launch
index 79f88577..0d4d4d84 100644
--- a/autorally_gazebo/launch/autoRallyTrackGazeboSim.launch
+++ b/autorally_gazebo/launch/autoRallyTrackGazeboSim.launch
@@ -68,7 +68,7 @@ limitations under the License.
 
   <!-- load controllers -->
   <node name="controller_spawner" pkg="controller_manager" type="spawner"
-          args="$(find autorally_gazebo)/config/autoRallyPlatformJointCtrlrParams.yaml"/>
+          args="$(find autorally_gazebo)/config/autoRallyPlatformJointCtrlrParams.yaml --timeout 120"/>
 
   <!-- Control the steering, axle, and shock absorber joints. -->
   <node name="autorally_controller" pkg="autorally_gazebo"
diff --git a/autorally_gazebo/launch/singlePlatform.launch b/autorally_gazebo/launch/singlePlatform.launch
index afe07d87..cc398afb 100644
--- a/autorally_gazebo/launch/singlePlatform.launch
+++ b/autorally_gazebo/launch/singlePlatform.launch
@@ -64,7 +64,7 @@ limitations under the License.
 
   <!-- load joint controllers -->
   <node name="controller_spawner" pkg="controller_manager" type="spawner"
-          args="$(find autorally_gazebo)/config/autoRallyPlatformJointCtrlrParams.yaml"/>
+          args="$(find autorally_gazebo)/config/autoRallyPlatformJointCtrlrParams.yaml --timeout 120"/>
 
   <!-- Control the steering, axle, and shock absorber joints. -->
   <node name="autorally_controller" pkg="autorally_gazebo"

From 2809af478667ee27161912cad12a340c103ad3da Mon Sep 17 00:00:00 2001
From: Gareth Ellis <gareth.ellis0@gmail.com>
Date: Tue, 15 Oct 2019 13:11:48 -0700
Subject: [PATCH 2/2] Added StateEstimator To 'autoRallyTackGazeboSim.launch'

---
 autorally_gazebo/launch/autoRallyTrackGazeboSim.launch | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/autorally_gazebo/launch/autoRallyTrackGazeboSim.launch b/autorally_gazebo/launch/autoRallyTrackGazeboSim.launch
index 0d4d4d84..211d5c20 100644
--- a/autorally_gazebo/launch/autoRallyTrackGazeboSim.launch
+++ b/autorally_gazebo/launch/autoRallyTrackGazeboSim.launch
@@ -84,6 +84,15 @@ limitations under the License.
         type="ground_truth_republisher.py" output="screen">
   </node>
 
+
+  <!-- Run state estimator -->
+  <include file="$(find autorally_core)/launch/stateEstimator.launch">
+    <arg name="sim" value="true"/>
+    <arg name="InvertY" value="false"/>
+    <arg name="InvertZ" value="false"/>
+    <arg name="FixedInitialPose" value="true"/>
+  </include>
+
   <include file="$(find autorally_core)/launch/autorally_core_manager.launch" />
   <include file="$(find autorally_control)/launch/joystickController.launch" />
 </launch>