Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
debee651
Commit
debee651
authored
Oct 10, 2019
by
Valentin Platzgummer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
trying to add wp form wimaPlaner to flight view
parent
a48d2306
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
41 additions
and
4 deletions
+41
-4
MissionController.cc
src/MissionManager/MissionController.cc
+28
-0
MissionController.h
src/MissionManager/MissionController.h
+5
-0
ToDo.txt
src/Wima/ToDo.txt
+0
-4
WimaController.cc
src/Wima/WimaController.cc
+5
-0
notesOnWpExchange.txt
src/Wima/notesOnWpExchange.txt
+3
-0
No files found.
src/MissionManager/MissionController.cc
View file @
debee651
...
...
@@ -386,6 +386,34 @@ int MissionController::insertSimpleMissionItem(QGeoCoordinate coordinate, int i)
return
newItem
->
sequenceNumber
();
}
int
MissionController
::
insertSimpleMissionItem
(
const
MissionItem
&
missionItem
,
int
i
)
{
int
sequenceNumber
=
_nextSequenceNumber
();
SimpleMissionItem
*
newItem
=
new
SimpleMissionItem
(
_controllerVehicle
,
_flyView
,
missionItem
,
this
);
newItem
->
setSequenceNumber
(
sequenceNumber
);
newItem
->
setCommand
(
MAV_CMD_NAV_WAYPOINT
);
_initVisualItem
(
newItem
);
MAV_CMD
takeoffCmd
=
_controllerVehicle
->
vtol
()
?
MAV_CMD_NAV_VTOL_TAKEOFF
:
MAV_CMD_NAV_TAKEOFF
;
if
(
newItem
->
command
()
==
takeoffCmd
)
{
if
(
!
_controllerVehicle
->
firmwarePlugin
()
->
supportedMissionCommands
().
contains
(
takeoffCmd
))
{
return
-
1
;
// can not add this takeoff command for this vehicle
}
}
if
(
newItem
->
specifiesAltitude
())
{
double
prevAltitude
;
int
prevAltitudeMode
;
if
(
_findPreviousAltitude
(
i
,
&
prevAltitude
,
&
prevAltitudeMode
))
{
newItem
->
altitude
()
->
setRawValue
(
prevAltitude
);
newItem
->
setAltitudeMode
(
static_cast
<
QGroundControlQmlGlobal
::
AltitudeMode
>
(
prevAltitudeMode
));
}
}
newItem
->
setMissionFlightStatus
(
_missionFlightStatus
);
_visualItems
->
insert
(
i
,
newItem
);
return
newItem
->
sequenceNumber
();
}
int
MissionController
::
insertROIMissionItem
(
QGeoCoordinate
coordinate
,
int
i
)
{
int
sequenceNumber
=
_nextSequenceNumber
();
...
...
src/MissionManager/MissionController.h
View file @
debee651
...
...
@@ -108,6 +108,11 @@ public:
/// @return Sequence number for new item
Q_INVOKABLE
int
insertSimpleMissionItem
(
QGeoCoordinate
coordinate
,
int
i
);
/// Add a new simple mission item to the list
/// @param i: index to insert at
/// @return Sequence number for new item
int
insertSimpleMissionItem
(
const
MissionItem
&
missionItem
,
int
i
);
/// Add a new ROI mission item to the list
/// @param i: index to insert at
/// @return Sequence number for new item
...
...
src/Wima/ToDo.txt
deleted
100644 → 0
View file @
a48d2306
add refpt gui and edit constructor
new path optim required for circ survey
add gui elements for circ survey
solve bug for cantFindPath.wima on Desktop/WimaPath
src/Wima/WimaController.cc
View file @
debee651
...
...
@@ -214,6 +214,11 @@ void WimaController::containerDataValidChanged(bool valid)
for
(
auto
missionItem
:
tempMissionItems
)
_missionItems
.
append
(
const_cast
<
MissionItem
*>
(
missionItem
));
// losing const qualifier here
_missionController
->
removeAll
();
QmlObjectListModel
*
missionItems
=
_missionController
->
visualItems
();
for
(
auto
missionItem
:
tempMissionItems
)
_missionController
->
insertSimpleMissionItem
(
*
missionItem
,
missionItems
->
count
());
if
(
areaCounter
==
numAreas
)
_localPlanDataValid
=
true
;
...
...
src/Wima/notesOnWpExchange.txt
View file @
debee651
...
...
@@ -6,3 +6,6 @@ How to exchange mission between WimaPlaner and WimaController.
4) start/continue mission
5) return vehicle on battery low
6) go to 4) or quit if last waypoint reached
investigate load, loadFromVehicle, syncInProgress, _newMissionItemsAvailableFromVehicle
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment