diff --git a/flight/PiOS.posix/posix/Libraries/FreeRTOS/Source/portable/GCC/Posix/port.c b/flight/PiOS.posix/posix/Libraries/FreeRTOS/Source/portable/GCC/Posix/port.c
index 1deb36cc7..18215c10f 100644
--- a/flight/PiOS.posix/posix/Libraries/FreeRTOS/Source/portable/GCC/Posix/port.c
+++ b/flight/PiOS.posix/posix/Libraries/FreeRTOS/Source/portable/GCC/Posix/port.c
@@ -274,7 +274,6 @@ void vPortStartFirstTask( void )
*/
portBASE_TYPE xPortStartScheduler( void )
{
- portBASE_TYPE xResult;
sigset_t xSignalToBlock;
/**
@@ -337,9 +336,9 @@ portBASE_TYPE xPortStartScheduler( void )
PORT_PRINT( "Cleaning Up, Exiting.\n" );
/* Cleanup the mutexes */
- xResult = pthread_mutex_destroy( &xRunningThreadMutex );
- xResult = pthread_mutex_destroy( &xYieldingThreadMutex );
- xResult = pthread_mutex_destroy( &xGuardMutex );
+ pthread_mutex_destroy( &xRunningThreadMutex );
+ pthread_mutex_destroy( &xYieldingThreadMutex );
+ pthread_mutex_destroy( &xGuardMutex );
vPortFree( (void *)pxThreads );
/* Should not get here! */
@@ -353,13 +352,12 @@ portBASE_TYPE xPortStartScheduler( void )
void vPortEndScheduler( void )
{
portBASE_TYPE xNumberOfThreads;
-portBASE_TYPE xResult;
for ( xNumberOfThreads = 0; xNumberOfThreads < MAX_NUMBER_OF_TASKS; xNumberOfThreads++ )
{
if ( ( pthread_t )NULL != pxThreads[ xNumberOfThreads ].hThread )
{
/* Kill all of the threads, they are in the detached state. */
- xResult = pthread_cancel( pxThreads[ xNumberOfThreads ].hThread );
+ pthread_cancel( pxThreads[ xNumberOfThreads ].hThread );
}
}
@@ -683,7 +681,6 @@ void vPortForciblyEndThread( void *pxTaskToDelete )
xTaskHandle hTaskToDelete = ( xTaskHandle )pxTaskToDelete;
xThreadState* xTaskToDelete;
xThreadState* xTaskToResume;
-portBASE_TYPE xResult;
PORT_ENTER();
@@ -706,7 +703,7 @@ portBASE_TYPE xResult;
/* Send a signal to wake the task so that it definitely cancels. */
pthread_testcancel();
- xResult = pthread_cancel( xTaskToDelete->hThread );
+ pthread_cancel( xTaskToDelete->hThread );
}
else
diff --git a/ground/openpilotgcs/src/plugins/config/configgadget.qrc b/ground/openpilotgcs/src/plugins/config/configgadget.qrc
index bd9d905c2..ffdb93e66 100644
--- a/ground/openpilotgcs/src/plugins/config/configgadget.qrc
+++ b/ground/openpilotgcs/src/plugins/config/configgadget.qrc
@@ -7,7 +7,7 @@
images/AHRS-v1.3.png
images/paper-plane.svg
images/curve-bg.svg
- images/quad-shapes.svg
+ images/multirotor-shapes.svg
images/ccpm_setup.svg
images/PipXtreme.png
images/Transmitter.png
diff --git a/ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp b/ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
index 84b531d6b..e9eca53e8 100644
--- a/ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
+++ b/ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
@@ -120,8 +120,8 @@ ConfigVehicleTypeWidget::ConfigVehicleTypeWidget(QWidget *parent) : ConfigTaskWi
airframeTypes << "Fixed Wing" << "Multirotor" << "Helicopter" << "Ground" << "Custom";
m_aircraft->aircraftType->addItems(airframeTypes);
- m_aircraft->aircraftType->setCurrentIndex(0); //Set default vehicle to Fixed Wing
- m_aircraft->airframesWidget->setCurrentIndex(0); // Force the tab index to match
+ m_aircraft->aircraftType->setCurrentIndex(1); //Set default vehicle to Fixed Wing
+ m_aircraft->airframesWidget->setCurrentIndex(1); // Force the tab index to match
QStringList fixedWingTypes;
fixedWingTypes << "Elevator aileron rudder" << "Elevon" << "Vtail";
@@ -138,7 +138,7 @@ ConfigVehicleTypeWidget::ConfigVehicleTypeWidget(QWidget *parent) : ConfigTaskWi
"Hexacopter" << "Hexacopter X" << "Hexacopter Y6" <<
"Octocopter" << "Octocopter V" << "Octo Coax +" << "Octo Coax X" ;
m_aircraft->multirotorFrameType->addItems(multiRotorTypes);
- m_aircraft->multirotorFrameType->setCurrentIndex(1); //Set default model to "Quad +"
+ m_aircraft->multirotorFrameType->setCurrentIndex(2); //Set default model to "Quad X"
//NEW STYLE: Loop through the widgets looking for all widgets that have "ChannelBox" in their name
@@ -152,7 +152,7 @@ ConfigVehicleTypeWidget::ConfigVehicleTypeWidget(QWidget *parent) : ConfigTaskWi
m_aircraft->quadShape->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
m_aircraft->quadShape->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
QSvgRenderer *renderer = new QSvgRenderer();
- renderer->load(QString(":/configgadget/images/quad-shapes.svg"));
+ renderer->load(QString(":/configgadget/images/multirotor-shapes.svg"));
quad = new QGraphicsSvgItem();
quad->setSharedRenderer(renderer);
quad->setElementId("quad-plus");
diff --git a/ground/openpilotgcs/src/plugins/config/images/quad-shapes.svg b/ground/openpilotgcs/src/plugins/config/images/multirotor-shapes.svg
similarity index 92%
rename from ground/openpilotgcs/src/plugins/config/images/quad-shapes.svg
rename to ground/openpilotgcs/src/plugins/config/images/multirotor-shapes.svg
index c11e74cf6..de5f2bd64 100644
--- a/ground/openpilotgcs/src/plugins/config/images/quad-shapes.svg
+++ b/ground/openpilotgcs/src/plugins/config/images/multirotor-shapes.svg
@@ -3559,17 +3559,17 @@
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:window-width="1920"
- inkscape:window-height="1088"
+ inkscape:window-width="1680"
+ inkscape:window-height="1002"
id="namedview4185"
showgrid="false"
- inkscape:zoom="0.25"
- inkscape:cx="2447.9751"
- inkscape:cy="482.05665"
+ inkscape:zoom="0.5"
+ inkscape:cx="2129.6843"
+ inkscape:cy="654.00839"
inkscape:window-x="0"
inkscape:window-y="0"
- inkscape:window-maximized="1"
- inkscape:current-layer="g4191"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="quad-hexa-H"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
@@ -3737,13 +3737,6 @@
style="fill:#b1c7eb;fill-opacity:1;fill-rule:nonzero;stroke:none"
id="path5107"
inkscape:connector-curvature="0" />