Skip to content
Snippets Groups Projects
Commit 43004c3d authored by Paul Beuchat's avatar Paul Beuchat
Browse files

Small changes to make Parameter Service work again

parent 75188f9a
No related branches found
No related tags found
No related merge requests found
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
file = "$(find d_fall_pps)/param/YamlFileNames.yaml" file = "$(find d_fall_pps)/param/YamlFileNames.yaml"
ns = "YamlFileNames" ns = "YamlFileNames"
/> />
<!-- rosparam <rosparam
command = "load" command = "load"
file = "$(find d_fall_pps)/param/SafeController.yaml" file = "$(find d_fall_pps)/param/SafeController.yaml"
ns = "SafeController" ns = "SafeController"
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
command = "load" command = "load"
file = "$(find d_fall_pps)/param/MpcController.yaml" file = "$(find d_fall_pps)/param/MpcController.yaml"
ns = "MpcController" ns = "MpcController"
/ --> />
</node> </node>
<!-- AGENT GUI (aka. the "student GUI") --> <!-- AGENT GUI (aka. the "student GUI") -->
......
safeController: "SafeControllerService/RateController" #safeController: "SafeControllerService/RateController"
demoController: "DemoControllerService/DemoController" #demoController: "DemoControllerService/DemoController"
studentController: "StudentControllerService/StudentController" #studentController: "StudentControllerService/StudentController"
mpcController: "MpcControllerService/MpcController" #mpcController: "MpcControllerService/MpcController"
strictSafety: false strictSafety: false
angleMargin: 0.6 angleMargin: 0.6
......
...@@ -61,7 +61,7 @@ controller_mode : 6 ...@@ -61,7 +61,7 @@ controller_mode : 6
# each of (x,y,z,roll,pitch,yaw) # each of (x,y,z,roll,pitch,yaw)
# 3 - Quad-rotor Model Based Method # 3 - Quad-rotor Model Based Method
# Uses the model of the quad-rotor and the previous inputs # Uses the model of the quad-rotor and the previous inputs
estimator_method : 2 estimator_method : 1
# The LQR Controller parameters for "mode = 1" # The LQR Controller parameters for "mode = 1"
...@@ -99,7 +99,7 @@ gainMatrixYawRate_Nested : [ 0.00, 0.00, 2.30] ...@@ -99,7 +99,7 @@ gainMatrixYawRate_Nested : [ 0.00, 0.00, 2.30]
# The paramters for the "Angle Reponse Test" controller mode # The paramters for the "Angle Reponse Test" controller mode
angleResponseTest_pitchAngle_degrees : 20 angleResponseTest_pitchAngle_degrees : 25
angleResponseTest_distance_meters : 0.02 angleResponseTest_distance_meters : 0.02
......
#equlibrium offset #equlibrium offset
mass : 30 mass : 29
#quadratic motor regression equation (a0, a1, a2) #quadratic motor regression equation (a0, a1, a2)
motorPoly: [5.484560e-4, 1.032633e-6, 2.130295e-11] motorPoly: [5.484560e-4, 1.032633e-6, 2.130295e-11]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment