From 1635c83df06134a0893ef3f410de79b692e9de2a Mon Sep 17 00:00:00 2001 From: Stacey Sheldon Date: Sun, 1 Jul 2012 23:22:55 -0400 Subject: [PATCH 1/4] simposix: fix warnings --- .../FreeRTOS/Source/portable/GCC/Posix/port.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) 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 From 4d5ddba2f9940bf637d782dbe9ed3610e645d984 Mon Sep 17 00:00:00 2001 From: David Date: Sat, 7 Jul 2012 16:44:15 +1000 Subject: [PATCH 2/4] Rename quad-shapes to multi-rotor shapes --- .../src/plugins/config/configgadget.qrc | 2 +- .../config/configvehicletypewidget.cpp | 2 +- .../src/plugins/config/images/quad-shapes.svg | 6793 ----------------- 3 files changed, 2 insertions(+), 6795 deletions(-) delete mode 100644 ground/openpilotgcs/src/plugins/config/images/quad-shapes.svg 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..4dda07858 100644 --- a/ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp @@ -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/quad-shapes.svg deleted file mode 100644 index c11e74cf6..000000000 --- a/ground/openpilotgcs/src/plugins/config/images/quad-shapes.svg +++ /dev/null @@ -1,6793 +0,0 @@ - - - -image/svg+xml \ No newline at end of file From 9ed60a2283845c7d85eacb70f19a1e3d9c96b9b1 Mon Sep 17 00:00:00 2001 From: David Date: Sat, 7 Jul 2012 20:10:36 +1000 Subject: [PATCH 3/4] Lets default to MultiRotor and to a Quad X type as it is most common --- .../src/plugins/config/configvehicletypewidget.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp b/ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp index 4dda07858..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 From ec864c71cb8982dd32d33ece100e8b4f1dd717ce Mon Sep 17 00:00:00 2001 From: David Date: Sat, 7 Jul 2012 20:46:57 +1000 Subject: [PATCH 4/4] Add update from dcat, fix prop directions --- .../config/images/multirotor-shapes.svg | 6774 +++++++++++++++++ 1 file changed, 6774 insertions(+) create mode 100644 ground/openpilotgcs/src/plugins/config/images/multirotor-shapes.svg diff --git a/ground/openpilotgcs/src/plugins/config/images/multirotor-shapes.svg b/ground/openpilotgcs/src/plugins/config/images/multirotor-shapes.svg new file mode 100644 index 000000000..de5f2bd64 --- /dev/null +++ b/ground/openpilotgcs/src/plugins/config/images/multirotor-shapes.svg @@ -0,0 +1,6774 @@ + + + +image/svg+xml \ No newline at end of file