diff --git a/flight/OpenPilot/openpilot.c b/flight/OpenPilot/openpilot.c index d843cb5de..570d93d85 100644 --- a/flight/OpenPilot/openpilot.c +++ b/flight/OpenPilot/openpilot.c @@ -35,7 +35,7 @@ /** -* Main function +* OpenPilot Main function */ void OpenPilotInit(void) { @@ -53,7 +53,7 @@ void OpenPilotInit(void) -> MicroSD: Simply logs data to the MicroSD card -> Telemetry: Sends telemetry using a queue - - Supervisor should have highest possibly priority (Idle + 14?) + - Supervisor should have highest possibly priority (Idle + 14) We only have 5 task levels, as long as it yeilds that is fine. - Supervisor should also act as the warnings system, low batter etc) - Supervisor should handle all telemetry inputs (not outputs), and act accordingly - ARC and HARC tasks should be split into two parts, gathering sensor data and acting on sensor data. diff --git a/flight/PiOS/STM32F10x/pios_sys.c b/flight/PiOS/STM32F10x/pios_sys.c index 7d72682df..8042b1956 100644 --- a/flight/PiOS/STM32F10x/pios_sys.c +++ b/flight/PiOS/STM32F10x/pios_sys.c @@ -47,7 +47,7 @@ void PIOS_SYS_Init(void) /* Setup STM32 system (RCC, clock, PLL and Flash configuration) - CMSIS Function */ SystemInit(); - /* Initialize NVIC */ + /* Initialize Basic NVIC */ NVIC_Configuration(); /* Initialize LEDs */ @@ -69,15 +69,6 @@ void PIOS_SYS_Init(void) } -/** -* Configures base level GPIO ports. -*/ -void GPIO_Configuration(void) -{ - -} - - /** * Configures Vector Table base location and SysTick */ diff --git a/flight/PiOS/inc/pios_config.h b/flight/PiOS/inc/pios_config.h index fc2dede7e..0b6f247da 100644 --- a/flight/PiOS/inc/pios_config.h +++ b/flight/PiOS/inc/pios_config.h @@ -3,8 +3,8 @@ * * @file pios_config.h * @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2009. - * @brief Main configuration header. - * - Compile time configuration the project. + * @brief PiOS configuration header. + * - Central compile time config for the project. * @see The GNU Public License (GPL) Version 3 * *****************************************************************************/ diff --git a/flight/PiOS/pios.c b/flight/PiOS/pios.c index 996363855..b96991936 100644 --- a/flight/PiOS/pios.c +++ b/flight/PiOS/pios.c @@ -59,7 +59,7 @@ int main() /* Initialise OpenPilot */ OpenPilotInit(); - /* *tart the task which calls the application hooks */ + /* Start the task which calls the application hooks */ xTaskCreate(HooksTask, (signed portCHAR *)"Hooks", configMINIMAL_STACK_SIZE, NULL, PRIORITY_TASK_HOOKS, NULL); /* Start the scheduler */ @@ -102,6 +102,7 @@ static void HooksTask(void *pvParameters) void vApplicationIdleHook(void) { /* Called when the scheduler has no tasks to run */ + /* In here we could implement full stats for FreeRTOS Although this would need us to enable stats in FreeRTOS which is *very* costly. With the function below we can @@ -113,3 +114,4 @@ void vApplicationIdleHook(void) ulIdleCycleCount++; IdleTimePercent = ((ulIdleCycleCount / xTaskGetTickCount()) * 100); } + diff --git a/flight/PiOS/pios_config.h b/flight/PiOS/pios_config.h deleted file mode 100644 index 0b6f247da..000000000 --- a/flight/PiOS/pios_config.h +++ /dev/null @@ -1,34 +0,0 @@ -/** - ****************************************************************************** - * - * @file pios_config.h - * @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2009. - * @brief PiOS configuration header. - * - Central compile time config for the project. - * @see The GNU Public License (GPL) Version 3 - * - *****************************************************************************/ -/* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - - -#ifndef PIOS_CONFIG_H -#define PIOS_CONFIG_H - - - - -#endif /* PIOS_CONFIG_H */