1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00

OP-1274 fixes for revolution

This commit is contained in:
Alessio Morale 2014-03-23 18:58:19 +01:00
parent e9fff2b6fa
commit 36e304f579
7 changed files with 20 additions and 6 deletions

View File

@ -81,7 +81,7 @@ int32_t AirspeedStart()
} }
// Start main task // Start main task
xTaskCreate(airspeedTask, (signed char *)"Airspeed", STACK_SIZE_BYTES / 4, NULL, TASK_PRIORITY, &taskHandle); xTaskCreate(airspeedTask, (const char *)"Airspeed", STACK_SIZE_BYTES / 4, NULL, TASK_PRIORITY, &taskHandle);
PIOS_TASK_MONITOR_RegisterTask(TASKINFO_RUNNING_AIRSPEED, taskHandle); PIOS_TASK_MONITOR_RegisterTask(TASKINFO_RUNNING_AIRSPEED, taskHandle);
return 0; return 0;
} }

View File

@ -68,7 +68,7 @@ static void SettingsUpdatedCb(UAVObjEvent *ev);
int32_t AltitudeStart() int32_t AltitudeStart()
{ {
// Start main task // Start main task
xTaskCreate(altitudeTask, (signed char *)"Altitude", STACK_SIZE_BYTES / 4, NULL, TASK_PRIORITY, &taskHandle); xTaskCreate(altitudeTask, (const char *)"Altitude", STACK_SIZE_BYTES / 4, NULL, TASK_PRIORITY, &taskHandle);
PIOS_TASK_MONITOR_RegisterTask(TASKINFO_RUNNING_ALTITUDE, taskHandle); PIOS_TASK_MONITOR_RegisterTask(TASKINFO_RUNNING_ALTITUDE, taskHandle);
return 0; return 0;

View File

@ -94,7 +94,7 @@ int32_t FixedWingPathFollowerStart()
{ {
if (followerEnabled) { if (followerEnabled) {
// Start main task // Start main task
xTaskCreate(pathfollowerTask, (signed char *)"PathFollower", STACK_SIZE_BYTES / 4, NULL, TASK_PRIORITY, &pathfollowerTaskHandle); xTaskCreate(pathfollowerTask, (const char *)"PathFollower", STACK_SIZE_BYTES / 4, NULL, TASK_PRIORITY, &pathfollowerTaskHandle);
PIOS_TASK_MONITOR_RegisterTask(TASKINFO_RUNNING_PATHFOLLOWER, pathfollowerTaskHandle); PIOS_TASK_MONITOR_RegisterTask(TASKINFO_RUNNING_PATHFOLLOWER, pathfollowerTaskHandle);
} }

View File

@ -134,7 +134,7 @@ int32_t SensorsInitialize(void)
int32_t SensorsStart(void) int32_t SensorsStart(void)
{ {
// Start main task // Start main task
xTaskCreate(SensorsTask, (signed char *)"Sensors", STACK_SIZE_BYTES / 4, NULL, TASK_PRIORITY, &sensorsTaskHandle); xTaskCreate(SensorsTask, (const char *)"Sensors", STACK_SIZE_BYTES / 4, NULL, TASK_PRIORITY, &sensorsTaskHandle);
PIOS_TASK_MONITOR_RegisterTask(TASKINFO_RUNNING_SENSORS, sensorsTaskHandle); PIOS_TASK_MONITOR_RegisterTask(TASKINFO_RUNNING_SENSORS, sensorsTaskHandle);
#ifdef PIOS_INCLUDE_WDG #ifdef PIOS_INCLUDE_WDG
PIOS_WDG_RegisterFlag(PIOS_WDG_SENSORS); PIOS_WDG_RegisterFlag(PIOS_WDG_SENSORS);

View File

@ -112,7 +112,7 @@ int32_t VtolPathFollowerStart()
{ {
if (vtolpathfollower_enabled) { if (vtolpathfollower_enabled) {
// Start main task // Start main task
xTaskCreate(vtolPathFollowerTask, (signed char *)"VtolPathFollower", STACK_SIZE_BYTES / 4, NULL, TASK_PRIORITY, &pathfollowerTaskHandle); xTaskCreate(vtolPathFollowerTask, (const char *)"VtolPathFollower", STACK_SIZE_BYTES / 4, NULL, TASK_PRIORITY, &pathfollowerTaskHandle);
PIOS_TASK_MONITOR_RegisterTask(TASKINFO_RUNNING_PATHFOLLOWER, pathfollowerTaskHandle); PIOS_TASK_MONITOR_RegisterTask(TASKINFO_RUNNING_PATHFOLLOWER, pathfollowerTaskHandle);
} }

View File

@ -36,6 +36,20 @@
#include "msheap.h" #include "msheap.h"
#if defined(PIOS_INCLUDE_FREERTOS)
#define MPU_WRAPPERS_INCLUDED_FROM_API_FILE
#include "FreeRTOS.h"
#include "task.h"
#undef MPU_WRAPPERS_INCLUDED_FROM_API_FILE
#else
#define traceMALLOC(...)
#define traceFREE(...)
#endif
/* /*
* Integrity checking. * Integrity checking.
* *

View File

@ -97,7 +97,7 @@ int main()
/* For Revolution we use a FreeRTOS task to bring up the system so we can */ /* For Revolution we use a FreeRTOS task to bring up the system so we can */
/* always rely on FreeRTOS primitive */ /* always rely on FreeRTOS primitive */
result = xTaskCreate(initTask, (const signed char *)"init", result = xTaskCreate(initTask, (const char *)"init",
INIT_TASK_STACK, NULL, INIT_TASK_PRIORITY, INIT_TASK_STACK, NULL, INIT_TASK_PRIORITY,
&initTaskHandle); &initTaskHandle);
PIOS_Assert(result == pdPASS); PIOS_Assert(result == pdPASS);