Merge branch 'master' into new_state_machine_drton

2026-05-21 01:12:11 +00:00 · 2013-08-15 10:33:45 +02:00
parent 39ae01dd07 d2f19c7d84
commit 7476b03543
118 changed files with 11512 additions and 1195 deletions
--- a/Documentation/commander_app.odg
+++ b/Documentation/commander_app.odg
--- a/Documentation/commander_app.png
+++ b/Documentation/commander_app.png
--- a/Documentation/dsm_bind.odt
+++ b/Documentation/dsm_bind.odt
--- a/Documentation/dsm_bind.pdf
+++ b/Documentation/dsm_bind.pdf
--- a/Documentation/flight_mode_state_machine.odg
+++ b/Documentation/flight_mode_state_machine.odg
--- a/Documentation/mixing_architecture.graffle
+++ b/Documentation/mixing_architecture.graffle
--- a/Documentation/position_control.odg
+++ b/Documentation/position_control.odg
--- a/Documentation/position_control.png
+++ b/Documentation/position_control.png
--- a/Documentation/position_estimator_app.odg
+++ b/Documentation/position_estimator_app.odg
--- a/Documentation/position_estimator_app.pdf
+++ b/Documentation/position_estimator_app.pdf
--- a/Documentation/position_estimator_app.png
+++ b/Documentation/position_estimator_app.png
--- a/Documentation/rc_mode_switch.odg
+++ b/Documentation/rc_mode_switch.odg
--- a/Documentation/rc_mode_switch.pdf
+++ b/Documentation/rc_mode_switch.pdf
--- a/Documentation/state_machine.odg
+++ b/Documentation/state_machine.odg
--- a/Documentation/state_machine.png
+++ b/Documentation/state_machine.png