rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-19 09:54:15 +01:00
Code Issues Releases Activity

Merge branch 'next' into corvuscorax/onboardlogging

Browse Source
This commit is contained in:
Corvus Corax 2013-11-19 18:49:58 +01:00
commit d235a24e23
14 changed files with 65 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flight/modules/System/systemmod.c
View File

@ -169,12 +169,14 @@ MODULE_INITCALL(SystemModInitialize, 0);
*/
static void systemTask(__attribute__((unused)) void *parameters)
{
/* start the delayed callback scheduler */
CallbackSchedulerStart();
uint8_t cycleCount = 0;
/* create all modules thread */
MODULE_TASKCREATE_ALL;
/* start the delayed callback scheduler */
CallbackSchedulerStart();
if (mallocFailed) {
/* We failed to malloc during task creation,
* system behaviour is undefined. Reset and let

6
flight/targets/boards/coptercontrol/firmware/pios_board.c
View File

@ -197,6 +197,9 @@ void PIOS_Board_Init(void)
PIOS_Assert(0);
}
/* Initialize the delayed callback library */
CallbackSchedulerInitialize();
/* Initialize UAVObject libraries */
EventDispatcherInitialize();
UAVObjInitialize();
@ -237,9 +240,6 @@ void PIOS_Board_Init(void)
AlarmsSet(SYSTEMALARMS_ALARM_BOOTFAULT, SYSTEMALARMS_ALARM_CRITICAL);
}
/* Initialize the delayed callback library */
CallbackSchedulerInitialize();
/* Set up pulse timers */
PIOS_TIM_InitClock(&tim_1_cfg);
PIOS_TIM_InitClock(&tim_2_cfg);

6
flight/targets/boards/coptercontrol/firmware/pios_board_posix.c
View File

@ -38,6 +38,9 @@ void PIOS_Board_Init(void)
/* Delay system */
PIOS_DELAY_Init();
/* Initialize the delayed callback library */
CallbackSchedulerInitialize();
/* Initialize UAVObject libraries */
EventDispatcherInitialize();
UAVObjInitialize();
@ -50,9 +53,6 @@ void PIOS_Board_Init(void)
PIOS_Assert(0);
}
/* Initialize the delayed callback library */
CallbackSchedulerInitialize();
/* Initialize the PiOS library */
PIOS_COM_Init();
}

6
flight/targets/boards/oplinkmini/firmware/pios_board.c
View File

@ -105,6 +105,9 @@ void PIOS_Board_Init(void)
PIOS_Assert(0);
}
/* Initialize the delayed callback library */
CallbackSchedulerInitialize();
/* Initialize UAVObject libraries */
EventDispatcherInitialize();
UAVObjInitialize();
@ -145,9 +148,6 @@ void PIOS_Board_Init(void)
PIOS_LED_Init(&pios_led_cfg);
#endif /* PIOS_INCLUDE_LED */
/* Initialize the delayed callback library */
CallbackSchedulerInitialize();
#if defined(PIOS_INCLUDE_TIM)
/* Set up pulse timers */
PIOS_TIM_InitClock(&tim_1_cfg);

6
flight/targets/boards/oplinkmini/firmware/pios_board_posix.c
View File

@ -38,6 +38,9 @@ void PIOS_Board_Init(void)
/* Delay system */
PIOS_DELAY_Init();
/* Initialize the delayed callback library */
CallbackSchedulerInitialize();
/* Initialize UAVObject libraries */
EventDispatcherInitialize();
UAVObjInitialize();
@ -50,9 +53,6 @@ void PIOS_Board_Init(void)
PIOS_Assert(0);
}
/* Initialize the delayed callback library */
CallbackSchedulerInitialize();
/* Initialize the PiOS library */
PIOS_COM_Init();
}

6
flight/targets/boards/osd/firmware/pios_board.c
View File

@ -177,6 +177,9 @@ void PIOS_Board_Init(void)
PIOS_Assert(0);
}
/* Initialize the delayed callback library */
CallbackSchedulerInitialize();
/* Initialize UAVObject libraries */
EventDispatcherInitialize();
UAVObjInitialize();
@ -191,9 +194,6 @@ void PIOS_Board_Init(void)
/* Initialize the alarms library */
AlarmsInitialize();
/* Initialize the delayed callback library */
CallbackSchedulerInitialize();
/* IAP System Setup */
PIOS_IAP_Init();
uint16_t boot_count = PIOS_IAP_ReadBootCount();

6
flight/targets/boards/revolution/firmware/pios_board.c
View File

@ -403,6 +403,9 @@ void PIOS_Board_Init(void)
PIOS_Assert(0);
}
/* Initialize the delayed callback library */
CallbackSchedulerInitialize();
/* Initialize UAVObject libraries */
EventDispatcherInitialize();
UAVObjInitialize();
@ -415,9 +418,6 @@ void PIOS_Board_Init(void)
/* Initialize the alarms library */
AlarmsInitialize();
/* Initialize the delayed callback library */
CallbackSchedulerInitialize();
/* Set up pulse timers */
PIOS_TIM_InitClock(&tim_1_cfg);
PIOS_TIM_InitClock(&tim_3_cfg);

6
flight/targets/boards/revolution/firmware/pios_board_sim.c
View File

@ -131,6 +131,9 @@ void PIOS_Board_Init(void)
/* Delay system */
PIOS_DELAY_Init();
/* Initialize the delayed callback library */
CallbackSchedulerInitialize();
/* Initialize UAVObject libraries */
EventDispatcherInitialize();
UAVObjInitialize();
@ -150,9 +153,6 @@ void PIOS_Board_Init(void)
PIOS_Assert(0);
}
/* Initialize the delayed callback library */
CallbackSchedulerInitialize();
#if defined(PIOS_INCLUDE_COM)
#if defined(PIOS_INCLUDE_TELEMETRY_RF) && 1
{

6
flight/targets/boards/revoproto/firmware/pios_board.c
View File

@ -443,6 +443,9 @@ void PIOS_Board_Init(void)
PIOS_Assert(0);
}
/* Initialize the delayed callback library */
CallbackSchedulerInitialize();
/* Initialize UAVObject libraries */
EventDispatcherInitialize();
UAVObjInitialize();
@ -452,9 +455,6 @@ void PIOS_Board_Init(void)
/* Initialize the alarms library */
AlarmsInitialize();
/* Initialize the delayed callback library */
CallbackSchedulerInitialize();
/* Set up pulse timers */
PIOS_TIM_InitClock(&tim_1_cfg);
PIOS_TIM_InitClock(&tim_2_cfg);

6
flight/targets/boards/revoproto/firmware/pios_board_sim.c
View File

@ -131,6 +131,9 @@ void PIOS_Board_Init(void)
/* Delay system */
PIOS_DELAY_Init();
/* Initialize the delayed callback library */
CallbackSchedulerInitialize();
/* Initialize UAVObject libraries */
EventDispatcherInitialize();
UAVObjInitialize();
@ -151,9 +154,6 @@ void PIOS_Board_Init(void)
PIOS_Assert(0);
}
/* Initialize the delayed callback library */
CallbackSchedulerInitialize();
#if defined(PIOS_INCLUDE_COM)
#if defined(PIOS_INCLUDE_TELEMETRY_RF) && 1
{

6
flight/targets/boards/simposix/firmware/pios_board.c
View File

@ -131,6 +131,9 @@ void PIOS_Board_Init(void)
PIOS_Assert(0);
}
/* Initialize the delayed callback library */
CallbackSchedulerInitialize();
/* Initialize UAVObject libraries */
EventDispatcherInitialize();
UAVObjInitialize();
@ -142,9 +145,6 @@ void PIOS_Board_Init(void)
/* Initialize the alarms library */
AlarmsInitialize();
/* Initialize the delayed callback library */
CallbackSchedulerInitialize();
/* Configure IO ports */
/* Configure Telemetry port */

54
flight/uavobjects/eventdispatcher.c
View File

@ -41,7 +41,8 @@
#define STACK_SIZE configMINIMAL_STACK_SIZE
#endif /* PIOS_EVENTDISPATCHER_STACK_SIZE */
#define TASK_PRIORITY (tskIDLE_PRIORITY + 3)
#define CALLBACK_PRIORITY CALLBACK_PRIORITY_CRITICAL
#define TASK_PRIORITY CALLBACK_TASK_FLIGHTCONTROL
#define MAX_UPDATE_PERIOD_MS 1000
// Private types
@ -70,7 +71,7 @@ typedef struct PeriodicObjectListStruct PeriodicObjectList;
// Private variables
static PeriodicObjectList *mObjList;
static xQueueHandle mQueue;
static xTaskHandle mEventTaskHandle;
static DelayedCallbackInfo *eventSchedulerCallback;
static xSemaphoreHandle mMutex;
static EventStats mStats;
@ -101,8 +102,8 @@ int32_t EventDispatcherInitialize()
// Create event queue
mQueue = xQueueCreate(MAX_QUEUE_SIZE, sizeof(EventCallbackInfo));
// Create task
xTaskCreate(eventTask, (signed char *)"Event", STACK_SIZE, NULL, TASK_PRIORITY, &mEventTaskHandle);
// Create callback
eventSchedulerCallback = DelayedCallbackCreate(&eventTask, CALLBACK_PRIORITY, TASK_PRIORITY, STACK_SIZE * 4);
// Done
return 0;
@ -145,7 +146,9 @@ int32_t EventCallbackDispatch(UAVObjEvent *ev, UAVObjEventCallback cb)
evInfo.cb = cb;
evInfo.queue = 0;
// Push to queue
return xQueueSend(mQueue, &evInfo, 0); // will not block if queue is full
int32_t result = xQueueSend(mQueue, &evInfo, 0); // will not block if queue is full
DelayedCallbackDispatch(eventSchedulerCallback);
return result;
}
/**
@ -276,38 +279,33 @@ static int32_t eventPeriodicUpdate(UAVObjEvent *ev, UAVObjEventCallback cb, xQue
}
/**
* Event task, responsible of invoking callbacks.
* Delayed event callback, responsible of invoking (event) callbacks.
*/
static void eventTask()
{
uint32_t timeToNextUpdateMs;
uint32_t delayMs;
static uint32_t timeToNextUpdateMs = 0;
EventCallbackInfo evInfo;
/* Must do this in task context to ensure that TaskMonitor has already finished its init */
PIOS_TASK_MONITOR_RegisterTask(TASKINFO_RUNNING_EVENTDISPATCHER, mEventTaskHandle);
// Wait for queue message
int limit = MAX_QUEUE_SIZE;
// Initialize time
timeToNextUpdateMs = xTaskGetTickCount() * portTICK_RATE_MS;
// Loop forever
while (1) {
// Calculate delay time
delayMs = timeToNextUpdateMs - (xTaskGetTickCount() * portTICK_RATE_MS);
// Wait for queue message
if (xQueueReceive(mQueue, &evInfo, delayMs / portTICK_RATE_MS) == pdTRUE) {
// Invoke callback, if one
if (evInfo.cb != 0) {
evInfo.cb(&evInfo.ev); // the function is expected to copy the event information
}
while (xQueueReceive(mQueue, &evInfo, 0) == pdTRUE) {
// Invoke callback, if any
if (evInfo.cb != 0) {
evInfo.cb(&evInfo.ev); // the function is expected to copy the event information
}
// Process periodic updates
if ((xTaskGetTickCount() * portTICK_RATE_MS) >= timeToNextUpdateMs) {
timeToNextUpdateMs = processPeriodicUpdates();
// limit loop to max queue size to slightly reduce the impact of recursive events
if (!--limit) {
break;
}
}
// Process periodic updates
if ((xTaskGetTickCount() * portTICK_RATE_MS) >= timeToNextUpdateMs) {
timeToNextUpdateMs = processPeriodicUpdates();
}
DelayedCallbackSchedule(eventSchedulerCallback, timeToNextUpdateMs - (xTaskGetTickCount() * portTICK_RATE_MS), CALLBACK_UPDATEMODE_SOONER);
}
/**

7
ground/openpilotgcs/src/libs/utils/mytabbedstackwidget.cpp
View File

@ -36,20 +36,20 @@ MyTabbedStackWidget::MyTabbedStackWidget(QWidget *parent, bool isVertical, bool
m_vertical(isVertical),
m_iconAbove(iconAbove)
{
m_listWidget = new QListWidget(this);
m_listWidget = new QListWidget();
m_stackWidget = new QStackedWidget();
m_stackWidget->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Expanding);
QBoxLayout *toplevelLayout;
if (m_vertical) {
toplevelLayout = new QHBoxLayout;
toplevelLayout = new QHBoxLayout();
toplevelLayout->addWidget(m_listWidget);
toplevelLayout->addWidget(m_stackWidget);
m_listWidget->setFlow(QListView::TopToBottom);
m_listWidget->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
m_listWidget->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
} else {
toplevelLayout = new QVBoxLayout;
toplevelLayout = new QVBoxLayout();
toplevelLayout->addWidget(m_stackWidget);
toplevelLayout->addWidget(m_listWidget);
m_listWidget->setFlow(QListView::LeftToRight);
@ -59,6 +59,7 @@ MyTabbedStackWidget::MyTabbedStackWidget(QWidget *parent, bool isVertical, bool
if (m_iconAbove && m_vertical) {
m_listWidget->setFixedWidth(80); // this should be computed instead
m_listWidget->setWrapping(false);
}
toplevelLayout->setSpacing(0);

7
ground/openpilotgcs/src/libs/utils/mytabbedstackwidget.h
View File

@ -51,10 +51,7 @@ public:
int currentIndex() const;
void insertCornerWidget(int index, QWidget *widget);
int cornerWidgetCount()
{
return m_cornerWidgetCount;
}
QWidget *currentWidget()
{
return m_stackWidget->currentWidget();
@ -77,10 +74,8 @@ private slots:
private:
QListWidget *m_listWidget;
QStackedWidget *m_stackWidget;
QWidget *m_selectionWidget;
bool m_vertical;
bool m_iconAbove;
int m_cornerWidgetCount;
};
#endif // MYTABBEDSTACKWIDGET_H