Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
5f28e42
debugging changes
amaarquadri Mar 16, 2022
cfe656d
Merge branch 'master' into gazebo-debug
amaarquadri Mar 16, 2022
3756421
Merge branch 'master' into gazebo-debug
amaarquadri Mar 16, 2022
67d6d84
Merge branch 'master' into gazebo-debug
amaarquadri Mar 16, 2022
624a233
add publisher
amaarquadri Mar 17, 2022
bbc0f8d
correct coordinate system in OmniscientStateEstimationNode
amaarquadri Mar 17, 2022
6a58bdd
fix coordinate system
amaarquadri Mar 17, 2022
1a5f022
update COM offset
amaarquadri Mar 17, 2022
e03c809
add missing imports
amaarquadri Mar 17, 2022
62dae61
fix typos
amaarquadri Mar 17, 2022
96f209a
fix function names
amaarquadri Mar 17, 2022
7c57db6
bug fix
amaarquadri Mar 17, 2022
f41b179
fix typos
amaarquadri Mar 17, 2022
069759f
add Quaternion rotate and unrotate for Wrench and Accel
amaarquadri Mar 17, 2022
270c6da
update wrench calculations
amaarquadri Mar 17, 2022
af28c0c
comment out gravity
amaarquadri Mar 17, 2022
b9818ac
bug fixes
amaarquadri Mar 17, 2022
fc98450
fix typos
amaarquadri Mar 17, 2022
7922f14
add toStr to Wrench and Accel
amaarquadri Mar 17, 2022
891d3db
debug info
amaarquadri Mar 17, 2022
1993fd3
test
amaarquadri Mar 17, 2022
af8f36a
check for division by zero
amaarquadri Mar 17, 2022
20f006b
try pitch PID
amaarquadri Mar 17, 2022
fc803cb
enable omniscient state estimation
amaarquadri Mar 17, 2022
9d69c41
remove PIDs
amaarquadri Mar 17, 2022
6788758
bug fix
amaarquadri Mar 17, 2022
dd5eaf2
enable speed_pid
amaarquadri Mar 17, 2022
e42f847
enable pitch control
amaarquadri Mar 17, 2022
d9156f9
enable speed_pid
amaarquadri Mar 17, 2022
9304d97
add node for debugging rpy
amaarquadri Mar 17, 2022
a23e6f6
add rpy node to launch file
amaarquadri Mar 17, 2022
c98ec5d
add new message to CMakeLists.txt
amaarquadri Mar 17, 2022
89d4507
hardcode velocity in applied loads to test pitch control
amaarquadri Mar 17, 2022
d482af1
decrease pitch gains
amaarquadri Mar 17, 2022
e6e4634
correct NED to NWU quaternion conversions
amaarquadri Mar 17, 2022
8d997f3
update throttle PID gains
amaarquadri Mar 17, 2022
ed7fb56
add documentation to README.md
amaarquadri Mar 17, 2022
e2d1e6c
remove leading slashes from topic names
amaarquadri Mar 17, 2022
c78cf2d
Merge branch 'master' into gazebo-debug
amaarquadri Mar 17, 2022
cfb0b48
remove duplicate
amaarquadri Mar 17, 2022
a8ee2f3
Merge branch 'master' into gazebo-debug
amaarquadri Mar 17, 2022
b953e29
Merge branch 'master' into gazebo-debug
amaarquadri Mar 17, 2022
b6cb197
Merge branch 'master' into gazebo-debug
amaarquadri Mar 17, 2022
15eff0e
update pitch gains
amaarquadri Mar 17, 2022
6e3c3ba
enable aileron roll torques
amaarquadri Mar 17, 2022
46d9e86
Merge branch 'master' into gazebo-debug
amaarquadri Mar 18, 2022
f804df4
Merge branch 'master' into gazebo-debug
amaarquadri Mar 18, 2022
36b92ad
update pitch gains
amaarquadri Mar 18, 2022
2c20d8a
Merge branch 'master' into gazebo-debug
amaarquadri Mar 18, 2022
103922a
Merge branch 'master' into gazebo-debug
amaarquadri Mar 18, 2022
a8c12eb
bug fix: class name
amaarquadri Mar 18, 2022
3e5fa6b
Merge branch 'master' into gazebo-debug
amaarquadri Mar 18, 2022
ebfaa55
Merge branch 'master' into gazebo-debug
amaarquadri Mar 19, 2022
f006d5f
Merge branch 'master' into gazebo-debug
amaarquadri Mar 19, 2022
6f590de
Merge branch 'master' into gazebo-debug
amaarquadri Mar 19, 2022
3b84bef
Merge branch 'master' into gazebo-debug
amaarquadri Mar 20, 2022
642ab6d
remove off-diagonal elements from inertia matrix
amaarquadri Mar 21, 2022
fb99430
comment out COM offset
amaarquadri Mar 21, 2022
eadc480
Merge branch 'master' into gazebo-debug
amaarquadri Mar 21, 2022
419e244
reverted brningup.launch to master
amaarquadri Mar 21, 2022
bbd535b
add smoothing back
amaarquadri Mar 21, 2022
4661292
remove deprecated stuff
amaarquadri Mar 21, 2022
5f7082a
clean up
amaarquadri Mar 21, 2022
490b6c6
Merge branch 'master' into gazebo-debug
amaarquadri Mar 21, 2022
dc31868
Merge branch 'master' into gazebo-debug
amaarquadri Mar 21, 2022
56a4dcf
reintroduce lift and gravitational forces
amaarquadri Mar 21, 2022
4b49ad8
Merge branch 'master' into gazebo-debug
amaarquadri Mar 23, 2022
3e2b066
Merge branch 'master' into gazebo-debug
amaarquadri Mar 23, 2022
804cb84
remove simplifications
amaarquadri Mar 23, 2022
b602c3c
clean up
amaarquadri Mar 23, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions bmb_control/scripts/rqt_plot.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
rqt_plot /aircraft_state/pose/position/z /aircraft_state/twist/linear/x:z /control_inputs/elevator_angle:propeller_force /state_command/pitch:speed
5 changes: 2 additions & 3 deletions bmb_description/urdf/aris.urdf.xacro
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,8 @@
</visual>
<inertial>
<mass value="3.3"/>
<inertia ixx="12.327" ixy="-3.07" ixz="0.739"
iyy="1.711" iyz="-2.789" izz="12.659"/>
<origin xyz="-0.12195 0.00111 0.06595" rpy="0 0 0"/>
<inertia ixx="12.327" ixy="0" ixz="0"
iyy="1.711" iyz="0" izz="12.659"/>
</inertial>
<collision>
<geometry>
Expand Down
6 changes: 3 additions & 3 deletions bmb_gazebo/src/ARISControlPlugin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
using namespace gazebo;

static const auto COM_OFFSET =
bmbToIgnitionVector3(Vector3<double>{-0.12195, 0.00111, 0.06595});
bmbToIgnitionVector3(Vector3<double>{}); // -0.12195, 0.00111, 0.06595});

ARISControlPlugin::~ARISControlPlugin() {
#if GAZEBO_MAJOR_VERSION >= 8
Expand Down Expand Up @@ -88,11 +88,11 @@ void ARISControlPlugin::Load(physics::ModelPtr _model, sdf::ElementPtr _sdf) {
"control_inputs", 1, &ARISControlPlugin::controlInputsCallback, this);

// initialize linear velocity to 10m/s
base_link->SetLinearVel(bmbToIgnitionVector3(Vector3<double>{10}));
// base_link->SetLinearVel(bmbToIgnitionVector3(Vector3<double>{10}));

// set camera to follow the model
// TODO: get this working
gui::Events::follow(_model->GetName());
// gui::Events::follow(_model->GetName());

ROS_INFO("ARIS ready to fly. The force will be with you");
}
Expand Down
21 changes: 8 additions & 13 deletions bmb_world_model/src/AppliedLoads.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,19 @@
#include <cmath>

// aerodynamic slope constants
static constexpr Wrench<double> BODY_M_WRENCH{
-0.320883207023485, 0, -1.39627650007691, 0, -0.250343385330279, 0};
static constexpr Wrench<double> AILERON_M_WRENCH{
-0.0331320958688885, 0,
0.131535586088028, 0.0547822725108043,
0.0125388081950779, 0.00886500122201903};
static constexpr Wrench<double> BODY_M_WRENCH{0, 0, -1.39627650007691};
static constexpr Wrench<double> AILERON_M_WRENCH{0, 0, 0, 0.0547822725108043};
static constexpr Wrench<double> ELEVATOR_M_WRENCH{
-0.0238646243046933, 0, 0.0803509547078008, 0, 0.0842508724650606, 0};
static constexpr Wrench<double> RUDDER_M_WRENCH{0, 0, 0,
0, 0, 0.000279918236359769};
0, 0, 0, 0, 0.0842508724650606, 0};
static constexpr Wrench<double> RUDDER_M_WRENCH{};

// aerodynamic offset constants
static constexpr Wrench<double> BODY_B_WRENCH{
-0.0595573697856826, 0, -0.204721453757253, 0, 0.0015675980775375, 0};
static constexpr Wrench<double> BODY_B_WRENCH{-0.0595573697856826, 0,
-0.204721453757253};

// propeller constants
static constexpr double THRUST_TORQUE_RATIO_PROPELLER = 1;
static constexpr Vector3<double> L_FRONT_PROPELLER{0, 0, 0};
static constexpr double THRUST_TORQUE_RATIO_PROPELLER = 0;
static constexpr Vector3<double> L_FRONT_PROPELLER{};

using bmb_utilities::saturation;

Expand Down