diff --git a/flight/Revolution/UAVObjects.inc b/flight/Revolution/UAVObjects.inc index f5573742b..326961d0d 100644 --- a/flight/Revolution/UAVObjects.inc +++ b/flight/Revolution/UAVObjects.inc @@ -59,7 +59,7 @@ UAVOBJSRCFILENAMES += nedaccel UAVOBJSRCFILENAMES += nedposition UAVOBJSRCFILENAMES += objectpersistence UAVOBJSRCFILENAMES += overosyncstats -UAVOBJSRCFILENAMES += pathcommand +UAVOBJSRCFILENAMES += pathaction UAVOBJSRCFILENAMES += pathdesired UAVOBJSRCFILENAMES += pathplannersettings UAVOBJSRCFILENAMES += pathstatus diff --git a/ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro b/ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro index 6bc71b400..ab54007b1 100644 --- a/ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro +++ b/ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro @@ -54,7 +54,7 @@ HEADERS += $$UAVOBJECT_SYNTHETICS/accessorydesired.h \ $$UAVOBJECT_SYNTHETICS/gpsposition.h \ $$UAVOBJECT_SYNTHETICS/gpstime.h \ $$UAVOBJECT_SYNTHETICS/gpssatellites.h \ - $$UAVOBJECT_SYNTHETICS/pathcommand.h \ + $$UAVOBJECT_SYNTHETICS/pathaction.h \ $$UAVOBJECT_SYNTHETICS/pathdesired.h \ $$UAVOBJECT_SYNTHETICS/pathplannersettings.h \ $$UAVOBJECT_SYNTHETICS/pathstatus.h \ @@ -121,7 +121,7 @@ SOURCES += $$UAVOBJECT_SYNTHETICS/accessorydesired.cpp \ $$UAVOBJECT_SYNTHETICS/gpsposition.cpp \ $$UAVOBJECT_SYNTHETICS/gpstime.cpp \ $$UAVOBJECT_SYNTHETICS/gpssatellites.cpp \ - $$UAVOBJECT_SYNTHETICS/pathcommand.cpp \ + $$UAVOBJECT_SYNTHETICS/pathaction.cpp \ $$UAVOBJECT_SYNTHETICS/pathdesired.cpp \ $$UAVOBJECT_SYNTHETICS/pathplannersettings.cpp \ $$UAVOBJECT_SYNTHETICS/pathstatus.cpp \ diff --git a/shared/uavobjectdefinition/pathaction.xml b/shared/uavobjectdefinition/pathaction.xml new file mode 100644 index 000000000..abb95abcc --- /dev/null +++ b/shared/uavobjectdefinition/pathaction.xml @@ -0,0 +1,28 @@ + + + A waypoint command the pathplanner is to use at a certain waypoint + + + + + + + + + + + + + + + + diff --git a/shared/uavobjectdefinition/pathstatus.xml b/shared/uavobjectdefinition/pathstatus.xml new file mode 100644 index 000000000..70b1f2ba0 --- /dev/null +++ b/shared/uavobjectdefinition/pathstatus.xml @@ -0,0 +1,14 @@ + + + Status of the current path mode Can come from any @ref PathFollower module + + + + + + + + + + +