Conflicts:
ground/openpilotgcs/src/plugins/setupwizard/pages/multipage.cpp
ground/openpilotgcs/src/plugins/setupwizard/resources/connection-diagrams.svg
Conflicts resolved in artwork, same style as FW branch
Fixed Wing wizard made only available on Revo
Moved motor for fixed wing to channel 3 since channel 3 got its own timer.
Fixed a crash in config plugin when selecting Fixed Wing.
Added code in outputcalibration in Fixed Wing setup to set min and max values as well as neutral for servos.
Added Controller type Nano.
Could not resolve property : SVGID_1_
Error comes from qsvghandler.cpp or qsvgstyle.cpp in the QT libraries Qt5.2.0//5.2.0-beta1/Src/qtsvg/src/svg/
The fixedwing-shapes.svg and flyingwing-shapes.svg files need modified to prevent the errors caused by qsvgtinydocument.cpp in the QT libraries.
Couldn't find node aileron. Skipping rendering.
Couldn't find node vtail. Skipping rendering.
These errors come from the case statement that was added to updateImageAnd Description() for FixedWingPage
+ switch (type) {
+ case SetupWizard::FIXED_WING_AILERON:
+ elementId = "aileron";
+ break;
+ case SetupWizard::FIXED_WING_VTAIL:
+ elementId = "vtail";
+ break;
+ default:
+ elementId = "";
+ break;
+ }
A similar error needs to be resolved in connectiondiagram.cpp
+ switch (m_configSource->getVehicleSubType()) {
+ case VehicleConfigurationSource::FIXED_WING_AILERON:
+ elementsToShow << "aileron";
+ break;
+ case VehicleConfigurationSource::FIXED_WING_VTAIL:
+ elementsToShow << "vtail";
+ break;
+ default:
+ break;
+ }
Likewise outputcalibrationpage.cpp will need to reverence the elements inside the SVG file properly.
+ m_vehicleElementIds << "fixed-aileron" << "aileron";
+ m_vehicleHighlightElementIndexes << 0 << 1;
...
+ m_vehicleElementIds << "fixed-vtail" << "vtail";
+ m_vehicleHighlightElementIndexes << 0 << 1;
Until these elements are fixed in the SVG files the wizard will not render properly and allow the user to click *next*.
Renamed FlashPage to FlashDance, eeh, no SavePage :)
Removed unnecessary dependency in setupwizard.pro
Fixed a bug with the Next button on the first page.
Fixed a bug with the cancel button on the last page.
Changed layout on some pages to make room for longer texts.
Changed default neutral value for output from 1080 to 1000.
Renamed 'Hexacopter H' to 'Hexacopter X'