mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2024-11-29 07:24:13 +01:00
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.
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@257 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
parent
5e70edb021
commit
0e8b618953
@ -29,8 +29,6 @@
|
||||
#ifndef TELEMETRY_H
|
||||
#define TELEMETRY_H
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
int32_t TelemetryInitialize();
|
||||
int32_t TelemetryInitialize(void);
|
||||
|
||||
#endif // TELEMETRY_H
|
||||
|
@ -31,15 +31,20 @@
|
||||
/* PIOS Includes */
|
||||
#include <pios.h>
|
||||
|
||||
/* OpenPilot Modules */
|
||||
#include "telemetry.h"
|
||||
|
||||
/* OpenPilot Includes */
|
||||
#include <op_config.h>
|
||||
#include <op_logging.h>
|
||||
|
||||
/* FreeRTOS Includes */
|
||||
#include <FreeRTOS.h>
|
||||
#include <task.h>
|
||||
#include <queue.h>
|
||||
#include <semphr.h>
|
||||
/* UAVObjects */
|
||||
#include "uavobjectmanager.h"
|
||||
#include "eventdispatcher.h"
|
||||
#include "utlist.h"
|
||||
|
||||
/* UAVTalk */
|
||||
#include "uavtalk.h"
|
||||
|
||||
/* Global Functions */
|
||||
extern void OpenPilotInit(void);
|
||||
|
@ -197,7 +197,7 @@
|
||||
#define PIOS_IRQ_PRIO_HIGHEST 4 // for USART etc...
|
||||
|
||||
//-------------------------
|
||||
// Receiver PWM inputs
|
||||
// Receiver PWM inputs
|
||||
//-------------------------
|
||||
#define RECEIVER1_GPIO_PORT GPIOB
|
||||
#define RECEIVER1_PIN GPIO_Pin_0 // PB0
|
||||
|
@ -24,14 +24,7 @@
|
||||
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#include <stdlib.h> // for malloc
|
||||
#include <string.h> // for memcpy, memcmp
|
||||
#include "eventdispatcher.h"
|
||||
#include "utlist.h"
|
||||
#include "FreeRTOS.h"
|
||||
#include "task.h"
|
||||
#include "queue.h"
|
||||
#include "semphr.h"
|
||||
#include "openpilot.h"
|
||||
|
||||
// Private constants
|
||||
#define MAX_QUEUE_SIZE 10
|
||||
|
@ -26,9 +26,6 @@
|
||||
#ifndef EVENTDISPATCHER_H
|
||||
#define EVENTDISPATCHER_H
|
||||
|
||||
#include <stdint.h>
|
||||
#include "uavobjectmanager.h"
|
||||
|
||||
// Public types
|
||||
|
||||
// Public functions
|
||||
|
@ -26,10 +26,6 @@
|
||||
#ifndef UAVOBJECTMANAGER_H
|
||||
#define UAVOBJECTMANAGER_H
|
||||
|
||||
#include <stdint.h>
|
||||
#include "FreeRTOS.h"
|
||||
#include "queue.h"
|
||||
|
||||
#define UAVOBJ_ALL_INSTANCES 0xFFFF
|
||||
|
||||
typedef uint32_t UAVObjHandle;
|
||||
|
@ -31,9 +31,6 @@
|
||||
#ifndef $(NAMEUC)_H
|
||||
#define $(NAMEUC)_H
|
||||
|
||||
#include <stdint.h>
|
||||
#include "uavobjectmanager.h"
|
||||
|
||||
// Object constants
|
||||
#define $(NAMEUC)_OBJID $(OBJID)
|
||||
#define $(NAMEUC)_NAME "$(NAME)"
|
||||
|
@ -24,14 +24,7 @@
|
||||
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#include <stdlib.h> // for malloc
|
||||
#include <string.h> // for strcmp
|
||||
#include "uavobjectmanager.h"
|
||||
#include "eventdispatcher.h"
|
||||
#include "utlist.h"
|
||||
#include "FreeRTOS.h"
|
||||
#include "queue.h"
|
||||
#include "semphr.h"
|
||||
#include "openpilot.h"
|
||||
|
||||
// Constants
|
||||
|
||||
|
@ -24,7 +24,7 @@
|
||||
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#include "uavobjectsinit.h"
|
||||
#include "openpilot.h"
|
||||
|
||||
/**
|
||||
* Initialize all objects.
|
||||
|
@ -30,9 +30,8 @@
|
||||
|
||||
#define $(METAOBJECT)
|
||||
|
||||
#include <string.h> // for memcpy
|
||||
#include "openpilot.h"
|
||||
#include "$(NAMELC).h"
|
||||
#include "uavobjectmanager.h"
|
||||
|
||||
|
||||
|
||||
|
@ -26,9 +26,6 @@
|
||||
#ifndef UAVTALK_H
|
||||
#define UAVTALK_H
|
||||
|
||||
#include <stdint.h>
|
||||
#include "uavobjectmanager.h"
|
||||
|
||||
// Public constants
|
||||
#define UAVTALK_WAITFOREVER -1
|
||||
#define UAVTALK_NOWAIT 0
|
||||
|
@ -25,9 +25,7 @@
|
||||
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#include "uavtalk.h"
|
||||
#include "FreeRTOS.h"
|
||||
#include "semphr.h"
|
||||
#include "openpilot.h"
|
||||
|
||||
// Private constants
|
||||
#define TYPE_MASK 0xFC
|
||||
|
@ -28,16 +28,15 @@
|
||||
#ifndef PIOS_H
|
||||
#define PIOS_H
|
||||
|
||||
|
||||
/* PIOS Compile Time Configuration */
|
||||
#include "pios_config.h"
|
||||
#include "pios_board.h"
|
||||
|
||||
/* FreeRTOS Includes */
|
||||
#include <FreeRTOS.h>
|
||||
#include <task.h>
|
||||
#include <queue.h>
|
||||
#include <semphr.h>
|
||||
#include "FreeRTOS.h"
|
||||
#include "task.h"
|
||||
#include "queue.h"
|
||||
#include "semphr.h"
|
||||
|
||||
/* C Lib Includes */
|
||||
#include <stdio.h>
|
||||
|
Loading…
Reference in New Issue
Block a user