diff --git a/src/triton_controls/config/thruster_config.yaml b/src/triton_controls/config/thruster_config.yaml index d277005..fe221ec 100644 --- a/src/triton_controls/config/thruster_config.yaml +++ b/src/triton_controls/config/thruster_config.yaml @@ -20,6 +20,13 @@ bits_per_thruster: 5 max_fwd: 3.71 # kgf max_rev: 2.92 # kgf + t3: + contrib: + z: 1.0 + lx: -0.219431 + ly: -0.055 + lz: 0.09 + t5: contrib: x: -1.0 diff --git a/src/triton_gazebo/models/triton_auv/model.sdf b/src/triton_gazebo/models/triton_auv/model.sdf index e2e443c..8f52ac2 100644 --- a/src/triton_gazebo/models/triton_auv/model.sdf +++ b/src/triton_gazebo/models/triton_auv/model.sdf @@ -29,27 +29,32 @@ + + model://triton_thruster - -0.325 0 0 1.57 0 + -0.325 0 0 0 0 thruster1 + model://triton_thruster - 0 -0.22 0.0045 0 0 0 + -0.062 -0.22 0.0045 0.785 0 0 thruster2 + model://triton_thruster - -0.21 -0.33 0.0075 0 -0.785 0 + 0.21 -0.33 0.0075 0 -0.785 0 thruster4 - + + model://triton_thruster - 0.21 -0.33 0.0075 0 0.785 0 + -0.219431 -0.055 0.09 0 3.14 0 thruster3 @@ -83,8 +88,8 @@ frame::frame 1 - 0.0209673336007 - -0.14826 -0.1687 0.2339 + 0.00340702866633 + 0.1 -0.062 -0.00878 diff --git a/src/triton_gazebo/models/triton_frame/model. b/src/triton_gazebo/models/triton_frame/model. new file mode 100644 index 0000000..e69de29 diff --git a/src/triton_gazebo/models/triton_frame/model.sdf b/src/triton_gazebo/models/triton_frame/model.sdf index d7337ca..8defade 100644 --- a/src/triton_gazebo/models/triton_frame/model.sdf +++ b/src/triton_gazebo/models/triton_frame/model.sdf @@ -4,17 +4,18 @@ + - 17.43388 + 29.4835 - 0.42659179587 - 0.00091257391 - -0.00613671114 - 0.47862692534 - -0.00224649356 - 0.42575057622 + 0.548853532 + 0.000990367 + 0.007434770 + 0.725638212 + 0.045963196 + 1.077000000 - -0.14826 -0.1687 0.19368 0 -0 0 + 0.1 -0.062 -0.00878 0 -0 0