mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2024-12-02 10:24:11 +01:00
OP-1122 OP-1120 fixed regressions introduced by previous refactoring of waypoint to board transmission - re-introduced calls to updated() which are needed for some reason I don't yet understand
- without the updated() call the waypoint are not sent to the board (or at least they get overwritten by the board waypoint) - with the updated() call i see lots of "!!!!!! Making request for an object: Waypoint" for which a request is already in progress!!!!!! messages.
This commit is contained in:
parent
f942cdf9d6
commit
3efea32507
@ -82,6 +82,7 @@ void ModelUavoProxy::modelToObjects()
|
||||
|
||||
// send action update to UAV
|
||||
action->setData(actionData);
|
||||
action->updated();
|
||||
qDebug() << "ModelUAVProxy::modelToObjects - sent action instance :" << action->getInstID();
|
||||
}
|
||||
else {
|
||||
@ -105,6 +106,7 @@ void ModelUavoProxy::modelToObjects()
|
||||
|
||||
// send waypoint update to UAV
|
||||
waypoint->setData(waypointData);
|
||||
waypoint->updated();
|
||||
qDebug() << "ModelUAVProxy::modelToObjects - sent waypoint instance :" << waypoint->getInstID();
|
||||
}
|
||||
}
|
||||
@ -136,7 +138,7 @@ Waypoint *ModelUavoProxy::createWaypoint(int index, Waypoint *newWaypoint) {
|
||||
|
||||
PathAction *ModelUavoProxy::createPathAction(int index, PathAction *newAction) {
|
||||
PathAction *action = NULL;
|
||||
int count = objManager->getNumInstances(waypointObj->getObjID());
|
||||
int count = objManager->getNumInstances(actionObj->getObjID());
|
||||
if (index < count) {
|
||||
// reuse object
|
||||
qDebug() << "ModelUAVProxy::createPathAction - reused action instance :" << index << "/" << count;
|
||||
|
Loading…
Reference in New Issue
Block a user