mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-03-15 07:29:15 +01:00
Merge remote-tracking branch 'origin/next' into thread/OP-1082_Activity_QML_Ticker
This commit is contained in:
commit
e39c0b44ce
@ -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
|
||||
|
@ -646,7 +646,7 @@ void vPortSystemTickHandler()
|
||||
/**
|
||||
* call tick handler
|
||||
*/
|
||||
vTaskIncrementTick();
|
||||
xTaskIncrementTick();
|
||||
|
||||
|
||||
#if ( configUSE_PREEMPTION == 1 )
|
||||
|
@ -44,7 +44,6 @@
|
||||
#include <QTimer>
|
||||
|
||||
namespace Core {
|
||||
|
||||
class IConnection;
|
||||
|
||||
namespace Internal {
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user