rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-15 07:29:15 +01:00
Code Issues Releases Activity

Merge remote-tracking branch 'origin/next' into thread/OP-1082_Activity_QML_Ticker

Browse Source
This commit is contained in:
Fredrik Arvidsson 2013-10-20 10:03:06 +02:00
commit e39c0b44ce
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
flight/modules/StateEstimation/filtercf.c
View File

@ -45,9 +45,9 @@
// Private constants
#define STACK_REQUIRED 512
#define STACK_REQUIRED 512
#define CALIBRATION_DELAY_MS 4000
#define CALIBRATION_DELAY_MS 4000
#define CALIBRATION_DURATION_MS 6000
// Private types

2
flight/pios/posix/libraries/FreeRTOS/Source/portable/GCC/Posix/port.c
View File

@ -646,7 +646,7 @@ void vPortSystemTickHandler()
/**
* call tick handler
*/
vTaskIncrementTick();
xTaskIncrementTick();
#if ( configUSE_PREEMPTION == 1 )

1
ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.h
View File

@ -44,7 +44,6 @@
#include <QTimer>
namespace Core {
class IConnection;
namespace Internal {

8
ground/openpilotgcs/src/plugins/coreplugin/workspacesettings.cpp
View File

@ -39,13 +39,11 @@ using namespace Core::Internal;
const int WorkspaceSettings::MAX_WORKSPACES = 10;
WorkspaceSettings::WorkspaceSettings(QObject *parent) :
IOptionsPage(parent)
{
}
IOptionsPage(parent)
{}
WorkspaceSettings::~WorkspaceSettings()
{
}
{}
// IOptionsPage