Commit 8344f169 authored by Michael Carpenter's avatar Michael Carpenter

Fix for static const float cannot be initialized within a class definition,...

Fix for static const float cannot be initialized within a class definition, and other windows compile errors.
parent 69982e28
...@@ -38,7 +38,7 @@ This file is part of the QGROUNDCONTROL project ...@@ -38,7 +38,7 @@ This file is part of the QGROUNDCONTROL project
#define PROTOCOL_TIMEOUT_MS 2000 ///< maximum time to wait for pending messages until timeout #define PROTOCOL_TIMEOUT_MS 2000 ///< maximum time to wait for pending messages until timeout
#define PROTOCOL_DELAY_MS 20 ///< minimum delay between sent messages #define PROTOCOL_DELAY_MS 20 ///< minimum delay between sent messages
#define PROTOCOL_MAX_RETRIES 5 ///< maximum number of send retries (after timeout) #define PROTOCOL_MAX_RETRIES 5 ///< maximum number of send retries (after timeout)
const float UASWaypointManager::defaultAltitudeHomeOffset = 30.0f;
UASWaypointManager::UASWaypointManager(UAS* _uas) UASWaypointManager::UASWaypointManager(UAS* _uas)
: uas(_uas), : uas(_uas),
current_retries(0), current_retries(0),
......
...@@ -180,7 +180,7 @@ private: ...@@ -180,7 +180,7 @@ private:
quint16 uasid; quint16 uasid;
// XXX export to settings // XXX export to settings
static const float defaultAltitudeHomeOffset = 30.0f; ///< Altitude offset in meters from home for new waypoints static const float defaultAltitudeHomeOffset; ///< Altitude offset in meters from home for new waypoints
}; };
#endif // UASWAYPOINTMANAGER_H #endif // UASWAYPOINTMANAGER_H
...@@ -212,7 +212,11 @@ void QGCMapWidget::loadSettings(bool changePosition) ...@@ -212,7 +212,11 @@ void QGCMapWidget::loadSettings(bool changePosition)
if (trailType == mapcontrol::UAVTrailType::ByDistance) if (trailType == mapcontrol::UAVTrailType::ByDistance)
{ {
// XXX // XXX
#ifdef Q_OS_WIN
#pragma message ("WARNING: Settings loading for trail type not implemented")
#else
#warning Settings loading for trail type not implemented #warning Settings loading for trail type not implemented
#endif
} }
else if (trailType == mapcontrol::UAVTrailType::ByTimeElapsed) else if (trailType == mapcontrol::UAVTrailType::ByTimeElapsed)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment