forked from Archive/PX4-Autopilot
Cut over MAVLink to new style build system
This commit is contained in:
parent
187f7603b9
commit
c71f4cf869
|
@ -21,6 +21,8 @@ MODULES += systemcmds/eeprom
|
||||||
# General system control
|
# General system control
|
||||||
#
|
#
|
||||||
MODULES += modules/commander
|
MODULES += modules/commander
|
||||||
|
MODULES += modules/mavlink
|
||||||
|
MODULES += modules/mavlink_onboard
|
||||||
|
|
||||||
#
|
#
|
||||||
# Estimation modules (EKF / other filters)
|
# Estimation modules (EKF / other filters)
|
||||||
|
@ -56,8 +58,6 @@ BUILTIN_COMMANDS := \
|
||||||
$(call _B, hott_telemetry, , 2048, hott_telemetry_main ) \
|
$(call _B, hott_telemetry, , 2048, hott_telemetry_main ) \
|
||||||
$(call _B, kalman_demo, SCHED_PRIORITY_MAX-30, 2048, kalman_demo_main ) \
|
$(call _B, kalman_demo, SCHED_PRIORITY_MAX-30, 2048, kalman_demo_main ) \
|
||||||
$(call _B, math_demo, , 8192, math_demo_main ) \
|
$(call _B, math_demo, , 8192, math_demo_main ) \
|
||||||
$(call _B, mavlink, , 2048, mavlink_main ) \
|
|
||||||
$(call _B, mavlink_onboard, , 2048, mavlink_onboard_main ) \
|
|
||||||
$(call _B, mixer, , 4096, mixer_main ) \
|
$(call _B, mixer, , 4096, mixer_main ) \
|
||||||
$(call _B, mpu6000, , 4096, mpu6000_main ) \
|
$(call _B, mpu6000, , 4096, mpu6000_main ) \
|
||||||
$(call _B, ms5611, , 2048, ms5611_main ) \
|
$(call _B, ms5611, , 2048, ms5611_main ) \
|
||||||
|
|
|
@ -21,6 +21,8 @@ MODULES += systemcmds/ramtron
|
||||||
# General system control
|
# General system control
|
||||||
#
|
#
|
||||||
MODULES += modules/commander
|
MODULES += modules/commander
|
||||||
|
MODULES += modules/mavlink
|
||||||
|
MODULES += modules/mavlink_onboard
|
||||||
|
|
||||||
#
|
#
|
||||||
# Estimation modules (EKF / other filters)
|
# Estimation modules (EKF / other filters)
|
||||||
|
@ -55,8 +57,6 @@ BUILTIN_COMMANDS := \
|
||||||
$(call _B, hott_telemetry, , 2048, hott_telemetry_main ) \
|
$(call _B, hott_telemetry, , 2048, hott_telemetry_main ) \
|
||||||
$(call _B, kalman_demo, SCHED_PRIORITY_MAX-30, 2048, kalman_demo_main ) \
|
$(call _B, kalman_demo, SCHED_PRIORITY_MAX-30, 2048, kalman_demo_main ) \
|
||||||
$(call _B, math_demo, , 8192, math_demo_main ) \
|
$(call _B, math_demo, , 8192, math_demo_main ) \
|
||||||
$(call _B, mavlink, , 2048, mavlink_main ) \
|
|
||||||
$(call _B, mavlink_onboard, , 2048, mavlink_onboard_main ) \
|
|
||||||
$(call _B, mixer, , 4096, mixer_main ) \
|
$(call _B, mixer, , 4096, mixer_main ) \
|
||||||
$(call _B, multirotor_att_control, SCHED_PRIORITY_MAX-15, 2048, multirotor_att_control_main) \
|
$(call _B, multirotor_att_control, SCHED_PRIORITY_MAX-15, 2048, multirotor_att_control_main) \
|
||||||
$(call _B, multirotor_pos_control, SCHED_PRIORITY_MAX-25, 2048, multirotor_pos_control_main) \
|
$(call _B, multirotor_pos_control, SCHED_PRIORITY_MAX-25, 2048, multirotor_pos_control_main) \
|
||||||
|
|
|
@ -64,9 +64,9 @@
|
||||||
#include <systemlib/param/param.h>
|
#include <systemlib/param/param.h>
|
||||||
#include <systemlib/systemlib.h>
|
#include <systemlib/systemlib.h>
|
||||||
#include <systemlib/err.h>
|
#include <systemlib/err.h>
|
||||||
|
#include <mavlink/mavlink_log.h>
|
||||||
|
|
||||||
#include "waypoints.h"
|
#include "waypoints.h"
|
||||||
#include "mavlink_log.h"
|
|
||||||
#include "orb_topics.h"
|
#include "orb_topics.h"
|
||||||
#include "missionlib.h"
|
#include "missionlib.h"
|
||||||
#include "mavlink_hil.h"
|
#include "mavlink_hil.h"
|
|
@ -51,7 +51,7 @@
|
||||||
#define MAVLINK_GET_CHANNEL_BUFFER mavlink_get_channel_buffer
|
#define MAVLINK_GET_CHANNEL_BUFFER mavlink_get_channel_buffer
|
||||||
#define MAVLINK_GET_CHANNEL_STATUS mavlink_get_channel_status
|
#define MAVLINK_GET_CHANNEL_STATUS mavlink_get_channel_status
|
||||||
|
|
||||||
#include "v1.0/mavlink_types.h"
|
#include <v1.0/mavlink_types.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
|
|
|
@ -42,7 +42,7 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
#include "mavlink_log.h"
|
#include <mavlink/mavlink_log.h>
|
||||||
|
|
||||||
void mavlink_logbuffer_init(struct mavlink_logbuffer *lb, int size)
|
void mavlink_logbuffer_init(struct mavlink_logbuffer *lb, int size)
|
||||||
{
|
{
|
|
@ -64,9 +64,9 @@
|
||||||
|
|
||||||
#include <systemlib/param/param.h>
|
#include <systemlib/param/param.h>
|
||||||
#include <systemlib/systemlib.h>
|
#include <systemlib/systemlib.h>
|
||||||
|
#include <mavlink/mavlink_log.h>
|
||||||
|
|
||||||
#include "waypoints.h"
|
#include "waypoints.h"
|
||||||
#include "mavlink_log.h"
|
|
||||||
#include "orb_topics.h"
|
#include "orb_topics.h"
|
||||||
#include "missionlib.h"
|
#include "missionlib.h"
|
||||||
#include "mavlink_hil.h"
|
#include "mavlink_hil.h"
|
||||||
|
@ -312,7 +312,7 @@ handle_message(mavlink_message_t *msg)
|
||||||
static const float ground_press = 1013.25f; // mbar
|
static const float ground_press = 1013.25f; // mbar
|
||||||
static const float ground_tempC = 21.0f;
|
static const float ground_tempC = 21.0f;
|
||||||
static const float ground_alt = 0.0f;
|
static const float ground_alt = 0.0f;
|
||||||
static const float T0 = 273.15;
|
static const float T0 = 273.15f;
|
||||||
static const float R = 287.05f;
|
static const float R = 287.05f;
|
||||||
static const float g = 9.806f;
|
static const float g = 9.806f;
|
||||||
|
|
|
@ -62,9 +62,9 @@
|
||||||
|
|
||||||
#include <systemlib/param/param.h>
|
#include <systemlib/param/param.h>
|
||||||
#include <systemlib/systemlib.h>
|
#include <systemlib/systemlib.h>
|
||||||
|
#include <mavlink/mavlink_log.h>
|
||||||
|
|
||||||
#include "waypoints.h"
|
#include "waypoints.h"
|
||||||
#include "mavlink_log.h"
|
|
||||||
#include "orb_topics.h"
|
#include "orb_topics.h"
|
||||||
#include "missionlib.h"
|
#include "missionlib.h"
|
||||||
#include "mavlink_hil.h"
|
#include "mavlink_hil.h"
|
|
@ -1,6 +1,6 @@
|
||||||
############################################################################
|
############################################################################
|
||||||
#
|
#
|
||||||
# Copyright (C) 2012 PX4 Development Team. All rights reserved.
|
# Copyright (C) 2012-2013 PX4 Development Team. All rights reserved.
|
||||||
#
|
#
|
||||||
# Redistribution and use in source and binary forms, with or without
|
# Redistribution and use in source and binary forms, with or without
|
||||||
# modification, are permitted provided that the following conditions
|
# modification, are permitted provided that the following conditions
|
||||||
|
@ -32,13 +32,16 @@
|
||||||
############################################################################
|
############################################################################
|
||||||
|
|
||||||
#
|
#
|
||||||
# Mavlink Application
|
# MAVLink protocol to uORB interface process
|
||||||
#
|
#
|
||||||
|
|
||||||
APPNAME = mavlink_onboard
|
MODULE_COMMAND = mavlink
|
||||||
PRIORITY = SCHED_PRIORITY_DEFAULT
|
SRCS += mavlink.c \
|
||||||
STACKSIZE = 2048
|
missionlib.c \
|
||||||
|
mavlink_parameters.c \
|
||||||
|
mavlink_log.c \
|
||||||
|
mavlink_receiver.c \
|
||||||
|
orb_listener.c \
|
||||||
|
waypoints.c
|
||||||
|
|
||||||
INCLUDES = $(TOPDIR)/../mavlink/include/mavlink
|
INCLUDE_DIRS += $(MAVLINK_SRC)/include/mavlink
|
||||||
|
|
||||||
include $(APPDIR)/mk/app.mk
|
|
|
@ -56,8 +56,9 @@
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <poll.h>
|
#include <poll.h>
|
||||||
|
|
||||||
|
#include <mavlink/mavlink_log.h>
|
||||||
|
|
||||||
#include "waypoints.h"
|
#include "waypoints.h"
|
||||||
#include "mavlink_log.h"
|
|
||||||
#include "orb_topics.h"
|
#include "orb_topics.h"
|
||||||
#include "missionlib.h"
|
#include "missionlib.h"
|
||||||
#include "mavlink_hil.h"
|
#include "mavlink_hil.h"
|
|
@ -51,7 +51,7 @@
|
||||||
#define MAVLINK_GET_CHANNEL_BUFFER mavlink_get_channel_buffer
|
#define MAVLINK_GET_CHANNEL_BUFFER mavlink_get_channel_buffer
|
||||||
#define MAVLINK_GET_CHANNEL_STATUS mavlink_get_channel_status
|
#define MAVLINK_GET_CHANNEL_STATUS mavlink_get_channel_status
|
||||||
|
|
||||||
#include "v1.0/mavlink_types.h"
|
#include <v1.0/mavlink_types.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
############################################################################
|
############################################################################
|
||||||
#
|
#
|
||||||
# Copyright (C) 2012 PX4 Development Team. All rights reserved.
|
# Copyright (C) 2012-2013 PX4 Development Team. All rights reserved.
|
||||||
#
|
#
|
||||||
# Redistribution and use in source and binary forms, with or without
|
# Redistribution and use in source and binary forms, with or without
|
||||||
# modification, are permitted provided that the following conditions
|
# modification, are permitted provided that the following conditions
|
||||||
|
@ -32,13 +32,11 @@
|
||||||
############################################################################
|
############################################################################
|
||||||
|
|
||||||
#
|
#
|
||||||
# Mavlink Application
|
# MAVLink protocol to uORB interface process (XXX hack for onboard use)
|
||||||
#
|
#
|
||||||
|
|
||||||
APPNAME = mavlink
|
MODULE_COMMAND = mavlink_onboard
|
||||||
PRIORITY = SCHED_PRIORITY_DEFAULT
|
SRCS = mavlink.c \
|
||||||
STACKSIZE = 2048
|
mavlink_receiver.c
|
||||||
|
|
||||||
INCLUDES = $(TOPDIR)/../mavlink/include/mavlink
|
INCLUDE_DIRS += $(MAVLINK_SRC)/include/mavlink
|
||||||
|
|
||||||
include $(APPDIR)/mk/app.mk
|
|
Loading…
Reference in New Issue