Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | telemetry_statur: use 4 separate topics | Anton Babushkin | 2014-07-06 | 2 | -2/+17 |
| | |||||
* | Use NAV-PVT with ubx7 and ubx8 modules | Kynos | 2014-07-03 | 1 | -1/+0 |
| | | | | This replaces NAV-SOL, NAV-POSLLH, NAV-VELNED and NAV-TIMEUTC. | ||||
* | Merged master to gnss_rework | Lorenz Meier | 2014-07-02 | 2 | -42/+30 |
|\ | |||||
| * | Merge pull request #984 from PX4/rc_channels | Lorenz Meier | 2014-06-30 | 1 | -42/+26 |
| |\ | | | | | | | rc_channels cleanup | ||||
| | * | rc_channels topic cleanup | Anton Babushkin | 2014-05-20 | 1 | -42/+26 |
| | | | |||||
| * | | Merged master into power_enforce | Lorenz Meier | 2014-06-30 | 13 | -50/+241 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into power_enforce | Lorenz Meier | 2014-06-26 | 2 | -5/+17 |
| |\ \ \ | |||||
| * | | | | system status topic: Add support for circuit breaker | Lorenz Meier | 2014-05-25 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | commander: Enforce (in presence of power sensing) that a) system is not ↵ | Lorenz Meier | 2014-05-25 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | purely servo rail powered and b) power rail voltage is higher than 4.5V on the main avionics rail | ||||
* | | | | | Merged upstream master into gnss_rework branch | Kynos | 2014-06-30 | 14 | -50/+243 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Merge branch 'master' of github.com:PX4/Firmware into ↵ | Lorenz Meier | 2014-06-29 | 1 | -0/+1 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | navigator_rewrite_estimator | ||||
| | * \ \ \ | Merge pull request #1089 from PX4/navigator_rewrite | Lorenz Meier | 2014-06-29 | 8 | -47/+69 |
| | |\ \ \ \ | | | | | | | | | | | | | | | Navigator rewrite | ||||
| | * | | | | | mtecs: add flightpathangle filter | Thomas Gubler | 2014-06-29 | 1 | -0/+1 |
| | | | | | | | |||||
| | * | | | | | Merge remote-tracking branch 'upstream/master' into mtecs | Thomas Gubler | 2014-06-28 | 1 | -0/+2 |
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | |||||
| * | | | | | | Merge branch 'navigator_rewrite' into navigator_rewrite_estimator | Julian Oes | 2014-06-27 | 1 | -0/+2 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | * | | | | | Merge branch 'master' into navigator_rewrite | Julian Oes | 2014-06-27 | 1 | -0/+2 |
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/modules/commander/commander.cpp src/modules/commander/state_machine_helper.h src/modules/mavlink/mavlink_messages.cpp | ||||
| | | * | | | | extend integrator reset flags in uorb attitude setpoint topic to all axes | Thomas Gubler | 2014-06-24 | 1 | -0/+2 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'navigator_rewrite' into navigator_rewrite_estimator | Julian Oes | 2014-06-27 | 1 | -0/+1 |
| |\| | | | | | |||||
| | * | | | | | navigator: added NAV_CMD_IDLE, added RTL_STATE_LOITER and RTL_STATE_LANDED ↵ | Anton Babushkin | 2014-06-27 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of FINISHED | ||||
| * | | | | | | Merge branch 'navigator_rewrite' into navigator_rewrite_estimator | Julian Oes | 2014-06-19 | 1 | -3/+2 |
| |\| | | | | | |||||
| | * | | | | | commander/navigator: renamed FS modes to RTL and RTGS (return to ground station) | Julian Oes | 2014-06-19 | 1 | -3/+2 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'navigator_rewrite' into navigator_rewrite_estimator | Julian Oes | 2014-06-19 | 1 | -0/+2 |
| |\| | | | | | |||||
| | * | | | | | commander: added some failsafe logic | Julian Oes | 2014-06-18 | 1 | -0/+2 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'navigator_rewrite' into navigator_rewrite_estimator | Julian Oes | 2014-06-18 | 2 | -15/+14 |
| |\| | | | | | |||||
| | * | | | | | commander: modes display fixes, don't activate failsafe while disarmed | Anton Babushkin | 2014-06-17 | 1 | -1/+2 |
| | | | | | | | |||||
| | * | | | | | commander: failsafe_state removed, replaced with bool failsafe, navigation ↵ | Anton Babushkin | 2014-06-16 | 1 | -14/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | state and failsafe determined directly from main state and conditions | ||||
| | * | | | | | mavlink: store last heartbeat time in telemetry_status topic | Anton Babushkin | 2014-06-16 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Merge remote-tracking branch 'upstream/navigator_rewrite' into ↵ | Thomas Gubler | 2014-06-13 | 1 | -18/+19 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | navigator_rewrite_estimator | ||||
| | * | | | | | Merge branch 'navigator_rewrite' of github.com:PX4/Firmware into ↵ | Julian Oes | 2014-06-12 | 1 | -0/+1 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | navigator_rewrite | ||||
| | * | | | | | | navigator: renamed the different RTL states | Julian Oes | 2014-06-12 | 1 | -18/+19 |
| | | | | | | | | |||||
| * | | | | | | | Merge remote-tracking branch 'upstream/navigator_rewrite' into ↵ | Thomas Gubler | 2014-06-11 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | navigator_rewrite_estimator | ||||
| | * | | | | | | Merge remote-tracking branch 'upstream/mtecs' into navigator_rewrite | Thomas Gubler | 2014-06-11 | 1 | -0/+1 |
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | / / / | | | | |/ / / | | | |/| | | | |||||
| | | * | | | | mtecs: filter airspeed | Thomas Gubler | 2014-06-11 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Merge remote-tracking branch 'px4/mtecs_estimator' into ↵ | Julian Oes | 2014-06-07 | 1 | -3/+3 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | navigator_rewrite_estimator Conflicts: src/modules/ekf_att_pos_estimator/ekf_att_pos_estimator_main.cpp | ||||
| | * | | | | | Extend estimator status | Lorenz Meier | 2014-06-04 | 1 | -3/+3 |
| | |/ / / / | |||||
| * | | | | | Merge remote-tracking branch 'px4/mtecs' into navigator_rewrite | Julian Oes | 2014-06-06 | 3 | -0/+80 |
| |\| | | | | |||||
| | * | | | | Merge branch 'mtecs' into mtecs_wind_estimate | Lorenz Meier | 2014-06-01 | 1 | -5/+15 |
| | |\ \ \ \ | |||||
| | | * | | | | Merge branch 'master' of github.com:PX4/Firmware into mtecs | Lorenz Meier | 2014-06-01 | 1 | -5/+15 |
| | | |\| | | | |||||
| | * | | | | | wind estimate: added uORB topic | Lorenz Meier | 2014-06-01 | 2 | -0/+70 |
| | |/ / / / | |||||
| | * | | | | mtecs publish state | Thomas Gubler | 2014-05-30 | 1 | -0/+10 |
| | | | | | | |||||
| * | | | | | Merge branch 'mtecs' into navigator_rewrite | Julian Oes | 2014-06-03 | 3 | -0/+87 |
| |\| | | | | |||||
| | * | | | | introduce tecs status uorb message | Thomas Gubler | 2014-05-24 | 3 | -0/+87 |
| | | |/ / | | |/| | | |||||
| * | | | | Merge remote-tracking branch 'px4/master' into navigator_rewrite | Julian Oes | 2014-06-03 | 1 | -5/+15 |
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | Conflicts: src/modules/navigator/navigator_main.cpp | ||||
| * | | | | navigator: mission class added (WIP) | Julian Oes | 2014-06-03 | 2 | -26/+16 |
| | | | | | |||||
| * | | | | commander and navigator: lot's of changes, failsafe handling in commander, ↵ | Julian Oes | 2014-05-27 | 3 | -21/+30 |
| | | | | | | | | | | | | | | | | | | | | navigator only for execution (WIP) | ||||
| * | | | | Merge branch 'master' into navigator_rewrite | Julian Oes | 2014-05-26 | 5 | -25/+50 |
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/drivers/gps/gps.cpp src/drivers/gps/mtk.cpp src/modules/commander/commander.cpp src/modules/ekf_att_pos_estimator/ekf_att_pos_estimator_main.cpp src/modules/navigator/mission.cpp src/modules/navigator/mission.h src/modules/navigator/navigator_main.cpp src/modules/navigator/navigator_state.h src/modules/position_estimator_inav/position_estimator_inav_main.c | ||||
| * | | | | eph and epv renaming, make this compile again | Julian Oes | 2014-04-26 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Merge remote-tracking branch 'px4/ekf_home_init' into ↵ | Julian Oes | 2014-04-26 | 6 | -14/+16 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | navigator_cleanup_ekf_home_init Conflicts: src/modules/commander/commander.cpp src/modules/mc_pos_control/mc_pos_control_main.cpp src/modules/navigator/navigator_main.cpp src/modules/uORB/topics/vehicle_global_position.h | ||||
| | * | | | | Send current local position estimate as well | Lorenz Meier | 2014-04-26 | 1 | -1/+4 |
| | | | | | | |||||
| | * | | | | Merged mpc_rc into ekf_params | Lorenz Meier | 2014-04-26 | 6 | -54/+30 |
| | |\ \ \ \ |