Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into navigator_new | Thomas Gubler | 2014-01-17 | 1 | -4/+5 |
|\ | | | | | | | | | | | | | Conflicts: makefiles/config_px4fmu-v1_backside.mk src/modules/commander/commander.cpp src/modules/sdlog2/sdlog2.c | ||||
| * | Merged origin/master into batt_fixes | Lorenz Meier | 2014-01-07 | 2 | -37/+34 |
| |\ | |||||
| * \ | Merge branch 'master' into batt_fixes | Anton Babushkin | 2013-11-11 | 1 | -2/+2 |
| |\ \ | |||||
| * | | | Track raw battery voltage and filtered battery voltage separately. Estimate ↵ | Anton Babushkin | 2013-11-11 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | remaining battery as min(voltage_estimate, discharged_estimate). Battery voltage LPF time increased. | ||||
| * | | | sensors: minor cleanup, bugs fixed, use unsigned long for discharged ↵ | Anton Babushkin | 2013-11-10 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | integration to avoid rounding errors. | ||||
* | | | | navigator: AUTO_READY nav state added, RTL implemented properly | Anton Babushkin | 2014-01-02 | 1 | -0/+1 |
| | | | | |||||
* | | | | navigator: takeoff and mission fixes | Anton Babushkin | 2014-01-02 | 1 | -1/+1 |
| | | | | |||||
* | | | | navigator: force takeoff if first mission item is not takeoff and vehicle landed | Anton Babushkin | 2014-01-01 | 1 | -1/+1 |
| | | | | |||||
* | | | | navigator: MISSION_LOITER and RTL_LOITER modes removed | Anton Babushkin | 2013-12-31 | 1 | -2/+0 |
| | | | | |||||
* | | | | navigator: NAV_STATE_INIT removed, minor fixes | Anton Babushkin | 2013-12-31 | 2 | -3/+2 |
| | | | | |||||
* | | | | Added NONE = not mapped state for mission and return switches | Anton Babushkin | 2013-12-30 | 1 | -0/+2 |
| | | | | |||||
* | | | | Waypoints and missionlib: lot's of cleanup | Julian Oes | 2013-12-29 | 1 | -1/+0 |
| | | | | |||||
* | | | | Moving nav state from commander to navigator, WIP | Anton Babushkin | 2013-12-29 | 2 | -19/+18 |
| | | | | |||||
* | | | | Home position: use double for lat/lon and float for altitude, set home ↵ | Julian Oes | 2013-12-27 | 1 | -11/+9 |
| | | | | | | | | | | | | | | | | position to global position instead of GPS position once we have a fix | ||||
* | | | | Merge remote-tracking branch ↵ | Julian Oes | 2013-12-27 | 1 | -0/+5 |
|\ \ \ \ | | | | | | | | | | | | | | | | 'thomasgubler_private/fw_autoland_att_tecs_navigator_termination_controlgroups' into navigator_new | ||||
| * | | | | Navigator: add MissionFeasibilityChecker class; performs validation of ↵ | Thomas Gubler | 2013-12-25 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | landing waypoint set-up for fixed wing for now, but can be extended for other checks (e.g. check mission against geofence) | ||||
* | | | | | Topics: Move from global_position_setpoint to mission_item_triplet | Julian Oes | 2013-12-26 | 1 | -86/+0 |
| | | | | | |||||
* | | | | | Mission topic: corrected comment | Julian Oes | 2013-12-26 | 1 | -2/+2 |
|/ / / / | |||||
* | | | | Waypoints/Navigator: Use two different dataman storage places, keep old ↵ | Julian Oes | 2013-12-25 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | waypoints until all new ones are written | ||||
* | | | | add minimal pitch field to mission item | Thomas Gubler | 2013-12-23 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge remote-tracking branch 'private_julian/fw_autoland_att_tecs_navigator' ↵ | Thomas Gubler | 2013-12-23 | 1 | -2/+9 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into fw_autoland_att_tecs_navigator_termination_controlgroups Conflicts: src/modules/navigator/navigator_main.cpp | ||||
| * | | | | Navigator: handle onboard and mavlink missions | Julian Oes | 2013-12-16 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Dataman: Start dataman and use it in waypoints and navigator instead of ↵ | Julian Oes | 2013-12-03 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | mission items in mission topic | ||||
* | | | | | Merge remote-tracking branch 'upstream/control_groups' into ↵ | Thomas Gubler | 2013-12-23 | 1 | -7/+4 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | fw_autoland_att_tecs_navigator_termination_controlgroups Conflicts: src/systemcmds/tests/module.mk src/systemcmds/tests/tests.h | ||||
| * | | | | Support 18 channels correctly on FMU | Lorenz Meier | 2013-12-22 | 1 | -7/+4 |
| | | | | | |||||
* | | | | | Merge remote-tracking branch 'upstream/master' into ↵ | Thomas Gubler | 2013-12-13 | 1 | -30/+30 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fw_autoland_att_tecs_navigator_termination_controlgroups Conflicts: src/drivers/px4io/px4io.cpp | ||||
| * | | | | actuator_controls_effective topic removed | Anton Babushkin | 2013-11-16 | 1 | -30/+30 |
| | |_|/ | |/| | | |||||
* | | | | added simple flight termination state machine which enbales parachute on request | Thomas Gubler | 2013-12-08 | 2 | -0/+9 |
| |/ / |/| | | |||||
* | | | Navigator: Added onboard mission (not usable yet) | Julian Oes | 2013-11-29 | 1 | -0/+1 |
| | | | |||||
* | | | Navigator and mavlink: more mavlink cleanup and set current waypoint option ↵ | Julian Oes | 2013-11-27 | 1 | -0/+1 |
| | | | | | | | | | | | | support added | ||||
* | | | Mavlink and navigator: Disable some functions in mavlink that are taken over ↵ | Julian Oes | 2013-11-27 | 1 | -0/+67 |
| | | | | | | | | | | | | by navigator, introduce topic to report mission status from commander back to mavlink | ||||
* | | | Mission topic: make nav_cmd compatible to the mavlink command | Julian Oes | 2013-11-22 | 1 | -8/+11 |
| | | | |||||
* | | | Navigator, waypoints: save index in mission item and use this in navigator | Julian Oes | 2013-11-22 | 2 | -0/+5 |
| | | | |||||
* | | | Mission topic: the autocontinue option was missing | Julian Oes | 2013-11-20 | 1 | -0/+1 |
| | | | |||||
* | | | Waypoints: Get time inside WP radius right | Julian Oes | 2013-11-20 | 1 | -1/+1 |
| | | | |||||
* | | | Mission topic: Use mission topic instead of global position for triplet | Julian Oes | 2013-11-20 | 1 | -12/+13 |
| | | | |||||
* | | | Mission topic: please allow the sign to be negative as well | Julian Oes | 2013-11-19 | 1 | -1/+1 |
| | | | |||||
* | | | Mission topic: get rid of magic params | Julian Oes | 2013-11-19 | 1 | -6/+4 |
| | | | |||||
* | | | Merge remote-tracking branch 'jean-m-cyr/master' into navigator_wip | Julian Oes | 2013-11-18 | 1 | -0/+80 |
|\ \ \ | |/ / |/| | | |||||
| * | | Add data manager module and fence support to navigator | Jean Cyr | 2013-11-03 | 1 | -0/+80 |
| |/ | | | | | | | | | | | | | | | - Add function to geo.c to determine if global position is inside fence - Add navigator support/commands for maintaining fence coords. - Add data manager module to support persistence fence storage. Can store other data, but only used for fence at this time. - Add unit tests for data manager | ||||
* / | fix MEAS airspeed and airspeed calibration | Thomas Gubler | 2013-11-10 | 1 | -2/+2 |
|/ | |||||
* | Merge remote-tracking branch 'px4/master' into pwm_ioctls | Julian Oes | 2013-10-19 | 1 | -1/+0 |
|\ | | | | | | | | | Conflicts: src/drivers/px4io/px4io.cpp | ||||
| * | Merge pull request #446 from PX4/commander_fixes | Lorenz Meier | 2013-10-13 | 1 | -1/+0 |
| |\ | | | | | | | commander fixes | ||||
| | * | commander: remove duplicate publishing of vehicle_control_mode and ↵ | Anton Babushkin | 2013-10-07 | 1 | -1/+0 |
| | | | | | | | | | | | | actuator_armed topics, remove unused "counter" field from topics | ||||
* | | | Merge remote-tracking branch 'px4/master' into pwm_ioctls | Julian Oes | 2013-10-11 | 4 | -0/+72 |
|\| | | | | | | | | | | | | | | Conflicts: src/drivers/px4io/px4io.cpp | ||||
| * | | Dynamic integral resets for straight and circle mode, announcing turn radius now | Lorenz Meier | 2013-10-08 | 1 | -0/+2 |
| | | | |||||
| * | | Added support for dynamic turn radii | Lorenz Meier | 2013-10-08 | 1 | -0/+2 |
| | | | |||||
| * | | Merged status changes | Lorenz Meier | 2013-10-06 | 2 | -0/+68 |
| |\ \ | | |/ | |/| | |||||
| | * | added error_count field to sensor report structures | Andrew Tridgell | 2013-09-12 | 1 | -0/+1 |
| | | | |||||
| | * | uORB: added new servorail_status object | Andrew Tridgell | 2013-09-12 | 1 | -0/+67 |
| | | | | | | | | | | | | used for VSERVO and RSSI on FMUv2 |