Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
74766ba8
Commit
74766ba8
authored
Mar 15, 2017
by
DonLakeFlyer
Browse files
FirmwarePlugin support indoor/outdoor brand image
parent
b0273cae
Changes
6
Hide whitespace changes
Inline
Side-by-side
src/FirmwarePlugin/APM/APMFirmwarePlugin.h
View file @
74766ba8
...
...
@@ -95,7 +95,8 @@ public:
QObject
*
loadParameterMetaData
(
const
QString
&
metaDataFile
);
GeoFenceManager
*
newGeoFenceManager
(
Vehicle
*
vehicle
)
{
return
new
APMGeoFenceManager
(
vehicle
);
}
RallyPointManager
*
newRallyPointManager
(
Vehicle
*
vehicle
)
{
return
new
APMRallyPointManager
(
vehicle
);
}
QString
brandImage
(
const
Vehicle
*
vehicle
)
const
{
Q_UNUSED
(
vehicle
);
return
QStringLiteral
(
"/qmlimages/APM/BrandImage"
);
}
QString
brandImageIndoor
(
const
Vehicle
*
vehicle
)
const
{
Q_UNUSED
(
vehicle
);
return
QStringLiteral
(
"/qmlimages/APM/BrandImage"
);
}
QString
brandImageOutdoor
(
const
Vehicle
*
vehicle
)
const
{
Q_UNUSED
(
vehicle
);
return
QStringLiteral
(
"/qmlimages/APM/BrandImage"
);
}
QString
missionFlightMode
(
void
)
final
;
QString
rtlFlightMode
(
void
)
final
;
...
...
src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.h
View file @
74766ba8
...
...
@@ -83,7 +83,8 @@ public:
bool
supportsMotorInterference
(
void
);
QString
brandImage
(
const
Vehicle
*
vehicle
)
const
{
Q_UNUSED
(
vehicle
);
return
QStringLiteral
(
"/qmlimages/APM/BrandImageSub"
);
}
QString
brandImageIndoor
(
const
Vehicle
*
vehicle
)
const
{
Q_UNUSED
(
vehicle
);
return
QStringLiteral
(
"/qmlimages/APM/BrandImageSub"
);
}
QString
brandImageOutdoor
(
const
Vehicle
*
vehicle
)
const
{
Q_UNUSED
(
vehicle
);
return
QStringLiteral
(
"/qmlimages/APM/BrandImageSub"
);
}
const
FirmwarePlugin
::
remapParamNameMajorVersionMap_t
&
paramNameRemapMajorVersionMap
(
void
)
const
final
{
return
_remapParamName
;
}
int
remapParamNameHigestMinorVersionNumber
(
int
majorVersionNumber
)
const
final
;
const
QVariantList
&
toolBarIndicators
(
const
Vehicle
*
vehicle
)
final
;
...
...
src/FirmwarePlugin/FirmwarePlugin.h
View file @
74766ba8
...
...
@@ -245,8 +245,11 @@ public:
/// Return the resource file which contains the set of params loaded for offline editing.
virtual
QString
offlineEditingParamFile
(
Vehicle
*
vehicle
)
{
Q_UNUSED
(
vehicle
);
return
QString
();
}
/// Return the resource file which contains the brand image for the vehicle.
virtual
QString
brandImage
(
const
Vehicle
*
vehicle
)
const
{
Q_UNUSED
(
vehicle
)
return
QString
();
}
/// Return the resource file which contains the brand image for the vehicle for Indoor theme.
virtual
QString
brandImageIndoor
(
const
Vehicle
*
vehicle
)
const
{
Q_UNUSED
(
vehicle
)
return
QString
();
}
/// Return the resource file which contains the brand image for the vehicle for Outdoor theme.
virtual
QString
brandImageOutdoor
(
const
Vehicle
*
vehicle
)
const
{
Q_UNUSED
(
vehicle
)
return
QString
();
}
/// Return the resource file which contains the vehicle icon used in the flight view when the view is dark (Satellite for instance)
virtual
QString
vehicleImageOpaque
(
const
Vehicle
*
vehicle
)
const
;
...
...
src/FirmwarePlugin/PX4/PX4FirmwarePlugin.h
View file @
74766ba8
...
...
@@ -58,7 +58,8 @@ public:
bool
adjustIncomingMavlinkMessage
(
Vehicle
*
vehicle
,
mavlink_message_t
*
message
)
override
;
GeoFenceManager
*
newGeoFenceManager
(
Vehicle
*
vehicle
)
override
{
return
new
PX4GeoFenceManager
(
vehicle
);
}
QString
offlineEditingParamFile
(
Vehicle
*
vehicle
)
override
{
Q_UNUSED
(
vehicle
);
return
QStringLiteral
(
":/FirmwarePlugin/PX4/PX4.OfflineEditing.params"
);
}
QString
brandImage
(
const
Vehicle
*
vehicle
)
const
override
{
Q_UNUSED
(
vehicle
);
return
QStringLiteral
(
"/qmlimages/PX4/BrandImage"
);
}
QString
brandImageIndoor
(
const
Vehicle
*
vehicle
)
const
override
{
Q_UNUSED
(
vehicle
);
return
QStringLiteral
(
"/qmlimages/PX4/BrandImage"
);
}
QString
brandImageOutdoor
(
const
Vehicle
*
vehicle
)
const
override
{
Q_UNUSED
(
vehicle
);
return
QStringLiteral
(
"/qmlimages/PX4/BrandImage"
);
}
QString
missionFlightMode
(
void
)
override
;
QString
rtlFlightMode
(
void
)
override
;
QString
takeControlFlightMode
(
void
)
override
;
...
...
src/Vehicle/Vehicle.cc
View file @
74766ba8
...
...
@@ -2192,9 +2192,14 @@ void Vehicle::_newGeoFenceAvailable(void)
}
}
QString
Vehicle
::
brandImage
(
void
)
const
QString
Vehicle
::
brandImage
Indoor
(
void
)
const
{
return
_firmwarePlugin
->
brandImage
(
this
);
return
_firmwarePlugin
->
brandImageIndoor
(
this
);
}
QString
Vehicle
::
brandImageOutdoor
(
void
)
const
{
return
_firmwarePlugin
->
brandImageOutdoor
(
this
);
}
QStringList
Vehicle
::
unhealthySensors
(
void
)
const
...
...
src/Vehicle/Vehicle.h
View file @
74766ba8
...
...
@@ -290,7 +290,8 @@ public:
Q_PROPERTY
(
bool
coaxialMotors
READ
coaxialMotors
CONSTANT
)
Q_PROPERTY
(
bool
xConfigMotors
READ
xConfigMotors
CONSTANT
)
Q_PROPERTY
(
bool
isOfflineEditingVehicle
READ
isOfflineEditingVehicle
CONSTANT
)
Q_PROPERTY
(
QString
brandImage
READ
brandImage
NOTIFY
firmwareTypeChanged
)
Q_PROPERTY
(
QString
brandImageIndoor
READ
brandImageIndoor
NOTIFY
firmwareTypeChanged
)
Q_PROPERTY
(
QString
brandImageOutdoor
READ
brandImageOutdoor
NOTIFY
firmwareTypeChanged
)
Q_PROPERTY
(
QStringList
unhealthySensors
READ
unhealthySensors
NOTIFY
unhealthySensorsChanged
)
Q_PROPERTY
(
QString
missionFlightMode
READ
missionFlightMode
CONSTANT
)
Q_PROPERTY
(
QString
rtlFlightMode
READ
rtlFlightMode
CONSTANT
)
...
...
@@ -567,7 +568,8 @@ public:
uint8_t
baseMode
()
const
{
return
_base_mode
;
}
uint32_t
customMode
()
const
{
return
_custom_mode
;
}
bool
isOfflineEditingVehicle
()
const
{
return
_offlineEditingVehicle
;
}
QString
brandImage
()
const
;
QString
brandImageIndoor
()
const
;
QString
brandImageOutdoor
()
const
;
QStringList
unhealthySensors
()
const
;
QString
missionFlightMode
()
const
;
QString
rtlFlightMode
()
const
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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