rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-05 21:52:10 +01:00
Code Issues Releases Activity

Merge branch 'next' into thread/OP-1245_FlightLog_Configuration_And_Control_GUI

Browse Source
This commit is contained in:
m_thread 2014-03-30 18:36:53 +02:00
commit 93ce3a1e54
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ground/openpilotgcs/src/plugins/opmap/modelmapproxy.cpp
View File

@ -292,11 +292,9 @@ void modelMapProxy::dataChanged(const QModelIndex &topLeft, const QModelIndex &b
void modelMapProxy::rowsInserted(const QModelIndex &parent, int first, int last) void modelMapProxy::rowsInserted(const QModelIndex &parent, int first, int last)
{ {
Q_UNUSED(parent); Q_UNUSED(parent);
Q_UNUSED(first);
Q_UNUSED(last);
/*
for (int x = first; x < last + 1; x++) { for (int x = first; x < last + 1; x++) {
QModelIndex index; QModelIndex index;
WayPointItem *item; WayPointItem *item;
internals::PointLatLng latlng; internals::PointLatLng latlng;
@ -324,8 +322,8 @@ void modelMapProxy::rowsInserted(const QModelIndex &parent, int first, int last)
} else { } else {
item = myMap->WPInsert(latlng, altitude, desc, x); item = myMap->WPInsert(latlng, altitude, desc, x);
} }
} }
*/
refreshOverlays(); refreshOverlays();
} }
void modelMapProxy::deleteWayPoint(int number) void modelMapProxy::deleteWayPoint(int number)

4
shared/uavobjectdefinition/systemalarms.xml
View File

@ -43,8 +43,8 @@
</elementnames> </elementnames>
</field> </field>
<access gcs="readwrite" flight="readwrite"/> <access gcs="readwrite" flight="readwrite"/>
<telemetrygcs acked="true" updatemode="onchange" period="0"/> <telemetrygcs acked="true" updatemode="manual" period="0"/>
<telemetryflight acked="true" updatemode="onchange" period="0"/> <telemetryflight acked="true" updatemode="throttled" period="100"/>
<logging updatemode="manual" period="0"/> <logging updatemode="manual" period="0"/>
</object> </object>
</xml> </xml>