Commit Graph

5953 Commits

Author SHA1 Message Date
Lorenz Meier 63b18399c2 Butchered MAVLink C++ app to compile and link - there is no hope it will work out of the box 8) 2014-01-28 21:05:00 +01:00
Lorenz Meier 1e3d2acbf6 Not building yet, things are coming together slowly on mavlink app 2014-01-28 19:30:23 +01:00
Lorenz Meier e28910127d Merged origin/beta 2014-01-28 15:57:29 +01:00
Lorenz Meier 9c355d280e Merged beta into mavlink rework branch 2014-01-28 15:13:14 +01:00
Lorenz Meier e6f5bc64fe Merge pull request #618 from PX4/fsm_visualisation
FSM visualisation script
2014-01-28 05:59:09 -08:00
Julian Oes 99875bbd28 FSM visualisation script: cope with prefixed state names 2014-01-28 12:31:23 +01:00
Julian Oes 547080f188 Revert "Navigator: make state names generic so that they can be used by the FSM visualisation tool later"
This reverts commit 984a815b94.
2014-01-28 12:29:30 +01:00
Julian Oes 1488d32d0f FSM visualisation script: renamed the file 2014-01-28 10:49:14 +01:00
Julian Oes c5a3dd9168 FSM visualisation script: use argparse instead of optionparse and some minor cleanup 2014-01-28 10:46:44 +01:00
Julian Oes 6002819f8f Navigator: FSM bugfix and missing break 2014-01-28 10:21:48 +01:00
Julian Oes cd9ec04904 Added FSM visualisation script 2014-01-28 10:15:28 +01:00
Julian Oes 984a815b94 Navigator: make state names generic so that they can be used by the FSM visualisation tool later 2014-01-28 10:08:23 +01:00
Thomas Gubler fff97da360 Merge remote-tracking branch 'upstream/beta' into beta 2014-01-27 23:46:57 +01:00
Thomas Gubler 3f79057dd1 fw att pos estimator: fix output lat/lon conversion (introduced by changes in 58792c5ca6) 2014-01-27 23:46:02 +01:00
Lorenz Meier 428a90f4ae Merge branch 'master' into beta 2014-01-27 22:12:52 +01:00
Lorenz Meier fbafeab792 Merge branch 'master' of github.com:PX4/Firmware 2014-01-27 22:12:35 +01:00
Lorenz Meier dc3907fb36 Merge branch 'master' of github.com:PX4/Firmware into beta 2014-01-27 18:16:50 +01:00
Lorenz Meier 7e855b5a23 Deleted test - should not be in mainline 2014-01-27 17:20:24 +01:00
Lorenz Meier 4c4cd41b72 Registered all new system types 2014-01-27 17:14:31 +01:00
Lorenz Meier 068cc190e2 Updated / added all system types that have been available before 2014-01-27 17:14:18 +01:00
Lorenz Meier ba90dc87f6 HOTFIX: Re-enable legacy config support, uncomment commented out configs. Needs more work. 2014-01-27 16:43:44 +01:00
Anton Babushkin 20108ed95d commander: minor refactoring current_status -> status 2014-01-27 13:18:54 +01:00
Anton Babushkin ad51e0a08a navigator: minor mavlink messages and comments fixes 2014-01-27 12:09:23 +01:00
Anton Babushkin 1e63e8d932 navigator: wait before landing in RTL 2014-01-27 12:07:27 +01:00
Anton Babushkin 4cfff5d8e5 Merge branch 'beta' of https://github.com/PX4/Firmware into beta 2014-01-26 20:13:42 +01:00
Lorenz Meier 1b2273a88b Merge branch 'master' of github.com:PX4/Firmware into beta 2014-01-26 19:58:57 +01:00
Lorenz Meier ac77fe9c27 WIP state on getting MAVLink as a class, much of the work done, but does not compile yet 2014-01-26 18:40:02 +01:00
Anton Babushkin 9e9105048a commander, navigator: failsafe fixes, mavlink messages cleanup 2014-01-26 15:46:14 +01:00
Lorenz Meier fdc7aa3be2 Merge branch 'master' of github.com:PX4/Firmware 2014-01-26 14:58:34 +01:00
Lorenz Meier 2dc3cf5e43 Remove unneeded header and commented out dead code from MEAS airspeed driver 2014-01-26 14:58:21 +01:00
Anton Babushkin c841929e3f commander: «home position set» condition fixed, failsafe fixes, navigator: state indication bugfix, control_mode fixes 2014-01-26 14:12:27 +01:00
Anton Babushkin b7c69262a7 state_machine_helper: added missed transition to FAILSAFE_STATE_LAND, transition conditions fixed 2014-01-26 11:58:50 +01:00
Anton Babushkin 7d2efe9367 commander, navigator: minor cleanup (refactoring), code style fixed 2014-01-26 11:52:33 +01:00
Anton Babushkin c7f0553938 cammander: state machine can now deny current state (e.g. when position lock lost during EASY mode), added FAILSAFE_STATE_LAND 2014-01-26 11:50:34 +01:00
Anton Babushkin 062b64a1e2 navigator: RTL on failsafe bug fixed 2014-01-25 23:49:33 +01:00
Anton Babushkin 92ddf7903b commander: more user-friendly states indication 2014-01-25 23:37:26 +01:00
Anton Babushkin ebc7cb03b7 «flighttermination state» replaced by more general «failsafe state» 2014-01-25 23:24:12 +01:00
Lorenz Meier 8149bf95fc Merge pull request #603 from PX4/rc_config_cleanup
RC config params set to more useful default values - needs more testing
2014-01-25 13:46:55 -08:00
Lorenz Meier e8a1b620e9 Merge branch 'master' into beta 2014-01-24 18:25:26 +01:00
Lorenz Meier e07d91613b Remove unused field 2014-01-24 18:24:54 +01:00
Lorenz Meier 06227331ea Checking out registers page state from master, as this is clearly a symptom of a bad merge 2014-01-24 18:21:28 +01:00
Lorenz Meier bcf34e2807 Merge branch 'master' into beta 2014-01-24 18:17:18 +01:00
Lorenz Meier b26c23c5f4 Merge branch 'cleanup' 2014-01-24 18:14:15 +01:00
Lorenz Meier a81cf70460 Merge branch 'cleanup' into beta 2014-01-24 18:11:52 +01:00
Lorenz Meier 29d90a2f84 Merge branch 'sbus2' into beta 2014-01-24 18:11:44 +01:00
Lorenz Meier 8f67307aed Merge pull request #606 from PX4/sbus2
Sbus2
2014-01-24 08:56:26 -08:00
Lorenz Meier 880342b9c1 Missing header for mixer status change. 2014-01-24 17:37:34 +01:00
Lorenz Meier bd15653b17 Use the proper status registers for locking out from mixer updates and return the value of the mixer change. 2014-01-24 17:37:01 +01:00
Lorenz Meier 33688fec9c Make the sensors app less verbose 2014-01-24 17:36:13 +01:00
Lorenz Meier 15f8e5acf1 Make in the comments explicit that we don’t do anything here under normal circumstances to make it less tempting to comment out the helpful debug tools in this section. 2014-01-24 17:35:29 +01:00