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
SetupWizard : Updated Hexa, HexaX and HexaH default values, default
Throttle curve at 90% max
Fixed a previous bug sign in HexaH (and HexaX because previously copied)
: Bug was in M4 Roll and M6 Yaw.
SetupWizard : Updated Hexa, HexaC and HexaH default values, default Throttle curve at 90% max
Fixed a previous bug sign in HexaH (and HexaX because previously copied) : Bug was in M4 Roll and M6 Yaw.
Removed some translations and simplified some gradients.
Added support for output calibration of Aileron and v-tail wings.
Added comments in the code explaining the various arrays with
indexes and ids in the output configuration page class.
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*.
This is an attempt I made several months back at enabling the fixed wing wizard. AILERON and VTAIL concepts added where necessary. VehicleConfigurationHelper::setupAileron() and friends are completely wrong, need to be sorted out.
The files that go in setupwiz/resources need to be corrected to show motor direction. Basically need an inverse copy merged into existing images, see multirotor svg files for comparison.
m_vehicleElementIds and m_vehicleHighlightElementIndexes need to be fixed in the SVG files and code appropriately. The ID tags in the sVG files are incrorect. likewise grouping are incorrect. Could use help from someone more profficient in SVG files.
*work in progress*
