rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
Code Issues Releases Activity

Type fix.

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@270 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
gussy 2010-03-08 10:10:26 +00:00 committed by gussy
parent 4f5d7ae83a
commit 6fd5da7489
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
flight/OpenPilot/Modules/Telemetry/telemetry.c
View File

@ -61,8 +61,6 @@ int32_t TelemetryInitialize(void)
// TODO: Get telemetry settings object // TODO: Get telemetry settings object
TelemetryPort = COM_USART1; TelemetryPort = COM_USART1;
// TODO: Re-Initialise communication ports
// Initialise UAVTalk // Initialise UAVTalk
UAVTalkInitialize(&transmitData); UAVTalkInitialize(&transmitData);
@ -70,7 +68,7 @@ int32_t TelemetryInitialize(void)
UAVObjIterate(&registerObject); UAVObjIterate(&registerObject);
// Start telemetry task // Start telemetry task
xTaskCreate( telemetryTask, (signed char*)"Telemetry", STACK_SIZE, NULL, TASK_PRIORITY, &telemetryTaskHandle ); xTaskCreate(telemetryTask, (signed char*)"Telemetry", STACK_SIZE, NULL, TASK_PRIORITY, &telemetryTaskHandle);
return 0; return 0;
} }
@ -176,12 +174,6 @@ static void telemetryTask(void)
} }
/* This blocks the task until there is something on the buffer */ /* This blocks the task until there is something on the buffer */
/* TODO: This needs to check the USB semaphore as well, somehow */
/* This isn't really going to work
xSemaphoreTake(PIOS_USART1_Buffer, portMAX_DELAY);
UAVTalkProcessInputStream(PIOS_COM_ReceiveBuffer(TelemetryPort));
*/
if(PIOS_COM_ReceiveBufferUsed(TelemetryPort) > 0) if(PIOS_COM_ReceiveBufferUsed(TelemetryPort) > 0)
{ {
UAVTalkProcessInputStream(PIOS_COM_ReceiveBuffer(TelemetryPort)); UAVTalkProcessInputStream(PIOS_COM_ReceiveBuffer(TelemetryPort));