Commit d13f930e authored by Gus Grubba's avatar Gus Grubba

Merge pull request #2668 from dogmaphobic/esp8266Test

Using proper Fact testing to test if the WiFi Bridge is present.
parents c0393e63 ebbcd773
...@@ -104,24 +104,11 @@ const QVariantList& PX4AutoPilotPlugin::vehicleComponents(void) ...@@ -104,24 +104,11 @@ const QVariantList& PX4AutoPilotPlugin::vehicleComponents(void)
_components.append(QVariant::fromValue((VehicleComponent*)_radioComponent)); _components.append(QVariant::fromValue((VehicleComponent*)_radioComponent));
//-- Is there an ESP8266 Connected? //-- Is there an ESP8266 Connected?
#ifdef QT_DEBUG if(factExists(FactSystem::ParameterProvider, MAV_COMP_ID_UDP_BRIDGE, "SW_VER")) {
#ifndef __mobile__
//-- Unit test barfs if I ask for a parameter that does not exists. The whole poing of the
// test below is to behave differently if ESP8266 is present or not.
if (!qgcApp()->runningUnitTests()) {
#endif
#endif
Fact* espVersion = getFact(FactSystem::ParameterProvider, MAV_COMP_ID_UDP_BRIDGE, "SW_VER");
if(espVersion && espVersion->componentId() == MAV_COMP_ID_UDP_BRIDGE) {
_esp8266Component = new PX4ESP8266Component(_vehicle, this); _esp8266Component = new PX4ESP8266Component(_vehicle, this);
_esp8266Component->setupTriggerSignals(); _esp8266Component->setupTriggerSignals();
_components.append(QVariant::fromValue((VehicleComponent*)_esp8266Component)); _components.append(QVariant::fromValue((VehicleComponent*)_esp8266Component));
} }
#ifdef QT_DEBUG
#ifndef __mobile__
}
#endif
#endif
_flightModesComponent = new FlightModesComponent(_vehicle, this); _flightModesComponent = new FlightModesComponent(_vehicle, this);
_flightModesComponent->setupTriggerSignals(); _flightModesComponent->setupTriggerSignals();
......
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