rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-04-08 00:53:48 +02:00
Code Issues Releases Activity

Updated files inside OpenPilot to use the single openpilot.h header file rather than multiple headers inside each file. This resolves a few build warnings/errors and makes the code cleaner.

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@257 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
gussy 2010-03-06 06:17:17 +00:00 committed by gussy
parent 5e70edb021
commit 0e8b618953
13 changed files with 21 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
flight/OpenPilot/Modules/Telemetry/inc/telemetry.h
View File

@ -29,8 +29,6 @@
#ifndef TELEMETRY_H #ifndef TELEMETRY_H
#define TELEMETRY_H #define TELEMETRY_H
#include <stdint.h> int32_t TelemetryInitialize(void);
int32_t TelemetryInitialize();
#endif // TELEMETRY_H #endif // TELEMETRY_H

15
flight/OpenPilot/System/inc/openpilot.h
View File

@ -31,15 +31,20 @@
/* PIOS Includes */ /* PIOS Includes */
#include <pios.h> #include <pios.h>
/* OpenPilot Modules */
#include "telemetry.h"
/* OpenPilot Includes */ /* OpenPilot Includes */
#include <op_config.h> #include <op_config.h>
#include <op_logging.h> #include <op_logging.h>
/* FreeRTOS Includes */ /* UAVObjects */
#include <FreeRTOS.h> #include "uavobjectmanager.h"
#include <task.h> #include "eventdispatcher.h"
#include <queue.h> #include "utlist.h"
#include <semphr.h>
/* UAVTalk */
#include "uavtalk.h"
/* Global Functions */ /* Global Functions */
extern void OpenPilotInit(void); extern void OpenPilotInit(void);

2
flight/OpenPilot/System/inc/pios_board.h
View File

@ -197,7 +197,7 @@
#define PIOS_IRQ_PRIO_HIGHEST 4 // for USART etc... #define PIOS_IRQ_PRIO_HIGHEST 4 // for USART etc...
//------------------------- //-------------------------
// Receiver PWM inputs // Receiver PWM inputs
//------------------------- //-------------------------
#define RECEIVER1_GPIO_PORT GPIOB #define RECEIVER1_GPIO_PORT GPIOB
#define RECEIVER1_PIN GPIO_Pin_0 // PB0 #define RECEIVER1_PIN GPIO_Pin_0 // PB0

9
flight/OpenPilot/UAVObjects/eventdispatcher.c
View File

@ -24,14 +24,7 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include <stdlib.h> // for malloc #include "openpilot.h"
#include <string.h> // for memcpy, memcmp
#include "eventdispatcher.h"
#include "utlist.h"
#include "FreeRTOS.h"
#include "task.h"
#include "queue.h"
#include "semphr.h"
// Private constants // Private constants
#define MAX_QUEUE_SIZE 10 #define MAX_QUEUE_SIZE 10

3
flight/OpenPilot/UAVObjects/inc/eventdispatcher.h
View File

@ -26,9 +26,6 @@
#ifndef EVENTDISPATCHER_H #ifndef EVENTDISPATCHER_H
#define EVENTDISPATCHER_H #define EVENTDISPATCHER_H
#include <stdint.h>
#include "uavobjectmanager.h"
// Public types // Public types
// Public functions // Public functions

4
flight/OpenPilot/UAVObjects/inc/uavobjectmanager.h
View File

@ -26,10 +26,6 @@
#ifndef UAVOBJECTMANAGER_H #ifndef UAVOBJECTMANAGER_H
#define UAVOBJECTMANAGER_H #define UAVOBJECTMANAGER_H
#include <stdint.h>
#include "FreeRTOS.h"
#include "queue.h"
#define UAVOBJ_ALL_INSTANCES 0xFFFF #define UAVOBJ_ALL_INSTANCES 0xFFFF
typedef uint32_t UAVObjHandle; typedef uint32_t UAVObjHandle;

3
flight/OpenPilot/UAVObjects/inc/uavobjecttemplate.h
View File

@ -31,9 +31,6 @@
#ifndef $(NAMEUC)_H #ifndef $(NAMEUC)_H
#define $(NAMEUC)_H #define $(NAMEUC)_H
#include <stdint.h>
#include "uavobjectmanager.h"
// Object constants // Object constants
#define $(NAMEUC)_OBJID $(OBJID) #define $(NAMEUC)_OBJID $(OBJID)
#define $(NAMEUC)_NAME "$(NAME)" #define $(NAMEUC)_NAME "$(NAME)"

9
flight/OpenPilot/UAVObjects/uavobjectmanager.c
View File

@ -24,14 +24,7 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include <stdlib.h> // for malloc #include "openpilot.h"
#include <string.h> // for strcmp
#include "uavobjectmanager.h"
#include "eventdispatcher.h"
#include "utlist.h"
#include "FreeRTOS.h"
#include "queue.h"
#include "semphr.h"
// Constants // Constants

2
flight/OpenPilot/UAVObjects/uavobjectsinit.c
View File

@ -24,7 +24,7 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "uavobjectsinit.h" #include "openpilot.h"
/** /**
* Initialize all objects. * Initialize all objects.

3
flight/OpenPilot/UAVObjects/uavobjecttemplate.c
View File

@ -30,9 +30,8 @@
#define $(METAOBJECT) #define $(METAOBJECT)
#include <string.h> // for memcpy #include "openpilot.h"
#include "$(NAMELC).h" #include "$(NAMELC).h"
#include "uavobjectmanager.h"

3
flight/OpenPilot/UAVTalk/inc/uavtalk.h
View File

@ -26,9 +26,6 @@
#ifndef UAVTALK_H #ifndef UAVTALK_H
#define UAVTALK_H #define UAVTALK_H
#include <stdint.h>
#include "uavobjectmanager.h"
// Public constants // Public constants
#define UAVTALK_WAITFOREVER -1 #define UAVTALK_WAITFOREVER -1
#define UAVTALK_NOWAIT 0 #define UAVTALK_NOWAIT 0

4
flight/OpenPilot/UAVTalk/uavtalk.c
View File

@ -25,9 +25,7 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "uavtalk.h" #include "openpilot.h"
#include "FreeRTOS.h"
#include "semphr.h"
// Private constants // Private constants
#define TYPE_MASK 0xFC #define TYPE_MASK 0xFC

9
flight/PiOS/pios.h
View File

@ -28,16 +28,15 @@
#ifndef PIOS_H #ifndef PIOS_H
#define PIOS_H #define PIOS_H
/* PIOS Compile Time Configuration */ /* PIOS Compile Time Configuration */
#include "pios_config.h" #include "pios_config.h"
#include "pios_board.h" #include "pios_board.h"
/* FreeRTOS Includes */ /* FreeRTOS Includes */
#include <FreeRTOS.h> #include "FreeRTOS.h"
#include <task.h> #include "task.h"
#include <queue.h> #include "queue.h"
#include <semphr.h> #include "semphr.h"
/* C Lib Includes */ /* C Lib Includes */
#include <stdio.h> #include <stdio.h>