Stacey Sheldon
|
2119067722
|
Merge remote-tracking branch 'op-revo/james/revo' into revo-next
Conflicts:
Makefile
flight/Modules/Attitude/revolution/attitude.c
flight/Modules/Battery/battery.c
flight/Modules/FixedWingPathFollower/fixedwingpathfollower.c
flight/Modules/GPS/GPS.c
flight/Modules/ManualControl/inc/manualcontrol.h
flight/Modules/ManualControl/manualcontrol.c
flight/Modules/OveroSync/overosync.c
flight/Modules/PathPlanner/inc/pathplanner.h
flight/Modules/PathPlanner/pathplanner.c
flight/Modules/Sensors/sensors.c
flight/Modules/VtolPathFollower/vtolpathfollower.c
flight/PiOS/Boards/STM32F4xx_Revolution.h
flight/PiOS/Boards/pios_board.h
flight/PiOS/STM32F4xx/library.mk
flight/PiOS/inc/pios_hmc5883.h
flight/PiOS/inc/pios_l3gd20.h
flight/PiOS/inc/pios_rfm22b_priv.h
flight/Revolution/Makefile
flight/Revolution/Makefile.osx
flight/Revolution/System/inc/pios_config.h
flight/Revolution/UAVObjects.inc
ground/openpilotgcs/src/libs/utils/coordinateconversions.cpp
ground/openpilotgcs/src/libs/utils/homelocationutil.cpp
ground/openpilotgcs/src/libs/utils/homelocationutil.h
ground/openpilotgcs/src/plugins/config/configrevowidget.cpp
ground/openpilotgcs/src/plugins/hitlnew/il2simulator.cpp
ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
ground/openpilotgcs/src/plugins/plugins.pro
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
package/Makefile
shared/uavobjectdefinition/fixedwingpathfollowersettings.xml
shared/uavobjectdefinition/fixedwingpathfollowerstatus.xml
shared/uavobjectdefinition/flightstatus.xml
shared/uavobjectdefinition/hwsettings.xml
shared/uavobjectdefinition/manualcontrolsettings.xml
shared/uavobjectdefinition/pathdesired.xml
shared/uavobjectdefinition/vtolpathfollowersettings.xml
shared/uavobjectdefinition/waypoint.xml
|
2012-10-30 00:08:43 -04:00 |
|
James Cotton
|
86422b8b9e
|
VtolPathFollower: Make sure to clear the alarm when running so it doesn't show as
uninintialized
|
2012-09-11 02:34:31 -05:00 |
|
James Cotton
|
36fcdcc107
|
Make PH use axis lock by default
|
2012-07-24 14:10:05 -05:00 |
|
James Cotton
|
463ad550e2
|
A few comments in my code and some simplication to the fixedwingfollower to get
it compiling against my path planner.
|
2012-06-08 10:46:40 -05:00 |
|
James Cotton
|
574ab3fcaa
|
Make the VtolPathFollower an optional module
Note that RTH mode right now checks that throttle control is enabled, but this
should only occur if the system is a VTOL.
|
2012-06-08 10:46:38 -05:00 |
|
Sambas
|
50ed363330
|
Axislock as default for VtolPathFollower
|
2012-06-07 17:42:51 +03:00 |
|
James Cotton
|
21eb48c58c
|
Add a RTH flight mode and remove it from the waypoint actions as that is
redundant with flying to (0,0,0)
|
2012-06-03 22:14:11 -05:00 |
|
a*morale
|
d071491265
|
removed include for positiondesired.h
|
2012-05-29 00:56:39 +02:00 |
|
Corvus Corax
|
e6f4a40d3e
|
path library: updated API and usage from pathfollowers, added new conditions and additional user feedback in pathstatus
|
2012-05-28 01:51:17 +02:00 |
|
Corvus Corax
|
79b717b4f7
|
Fixes to PathFollowers
|
2012-05-24 23:28:13 +02:00 |
|
Corvus Corax
|
9bdfe68bf5
|
PathFollower: refactoring (especially fixed wing)
|
2012-05-24 18:19:52 +02:00 |
|
Corvus Corax
|
63cd7b063f
|
Refactored Guidance to apropriate pathfollower in uavobjects
|
2012-05-24 11:09:53 +02:00 |
|
Corvus Corax
|
09f25ab11b
|
Refactorted VTOLPathFollower to fit into new scheme: optional module, reports status and knows advanced FlightModes
|
2012-05-21 12:10:01 +02:00 |
|
James Cotton
|
4ec4edd15c
|
When enabling position hold altitude mode take the throttle from before as the
"hover" throttle
|
2012-05-08 03:12:14 -05:00 |
|
James Cotton
|
2857b58f8e
|
Migrate path planner from position desired to path desired
|
2012-05-08 03:04:44 -05:00 |
|
James Cotton
|
a8bdd4a44a
|
Coalescene PositionDesired and PathDesired into PathDesired and add a mode
field to indicate how it should be interpreted.
|
2012-05-08 02:29:58 -05:00 |
|
James Cotton
|
27d1c4be93
|
Extend list of airframe types for VTOL guidance
|
2012-05-08 02:29:58 -05:00 |
|
James Cotton
|
cbedb5b53b
|
Move Guidance to VtolPathFollower to make room for FWPathFollower
|
2012-05-08 02:29:50 -05:00 |
|