rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-02 19:29:15 +01:00
Code Issues Releases Activity

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

Browse Source 
- 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:
Philippe Renon 2013-11-19 23:30:56 +01:00
parent f942cdf9d6
commit 3efea32507
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ground/openpilotgcs/src/plugins/opmap/modeluavoproxy.cpp
View File

@ -82,6 +82,7 @@ void ModelUavoProxy::modelToObjects()
// send action update to UAV // send action update to UAV
action->setData(actionData); action->setData(actionData);
action->updated();
qDebug() << "ModelUAVProxy::modelToObjects - sent action instance :" << action->getInstID(); qDebug() << "ModelUAVProxy::modelToObjects - sent action instance :" << action->getInstID();
} }
else { else {
@ -105,6 +106,7 @@ void ModelUavoProxy::modelToObjects()
// send waypoint update to UAV // send waypoint update to UAV
waypoint->setData(waypointData); waypoint->setData(waypointData);
waypoint->updated();
qDebug() << "ModelUAVProxy::modelToObjects - sent waypoint instance :" << waypoint->getInstID(); 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 *ModelUavoProxy::createPathAction(int index, PathAction *newAction) {
PathAction *action = NULL; PathAction *action = NULL;
int count = objManager->getNumInstances(waypointObj->getObjID()); int count = objManager->getNumInstances(actionObj->getObjID());
if (index < count) { if (index < count) {
// reuse object // reuse object
qDebug() << "ModelUAVProxy::createPathAction - reused action instance :" << index << "/" << count; qDebug() << "ModelUAVProxy::createPathAction - reused action instance :" << index << "/" << count;