From addc54d8ead552d8328626fcc7d0d4a90b35df84 Mon Sep 17 00:00:00 2001 From: Xavier Gibert Date: Mon, 23 Apr 2012 18:09:52 +0200 Subject: [PATCH] Mavlink protocol in an independent module, solved macro bug --- .../ENAC/fixed-wing/weasel_mavlink.xml | 3 +- conf/autopilot/fixedwing.xml | 2 +- .../fixedwing/telemetry_dummy.makefile | 11 ++++ .../fixedwing/telemetry_mavlink.makefile | 10 ---- conf/modules/mavlink.xml | 14 +++++ conf/settings/basic_mavlink.xml | 31 ----------- conf/telemetry/mavlink.xml | 3 +- sw/airborne/firmwares/fixedwing/ap_downlink.h | 3 +- sw/airborne/firmwares/fixedwing/datalink.c | 1 - sw/airborne/modules/mavlink/mavlink.c | 28 ++++++++++ sw/airborne/modules/mavlink/mavlink.h | 51 +++++++++++++++++++ .../mavlink}/mavlink_downlink.c | 15 ++---- .../mavlink}/mavlink_downlink.h | 33 ++++-------- .../mavlink}/mavlink_transport.c | 4 +- .../mavlink}/mavlink_transport.h | 4 +- sw/airborne/subsystems/datalink/datalink.h | 8 --- sw/airborne/subsystems/datalink/downlink.h | 2 - .../subsystems/datalink/pprz_transport.h | 10 ++++ 18 files changed, 140 insertions(+), 93 deletions(-) create mode 100644 conf/autopilot/subsystems/fixedwing/telemetry_dummy.makefile delete mode 100644 conf/autopilot/subsystems/fixedwing/telemetry_mavlink.makefile create mode 100644 conf/modules/mavlink.xml delete mode 100644 conf/settings/basic_mavlink.xml create mode 100644 sw/airborne/modules/mavlink/mavlink.c create mode 100644 sw/airborne/modules/mavlink/mavlink.h rename sw/airborne/{firmwares/fixedwing => modules/mavlink}/mavlink_downlink.c (77%) rename sw/airborne/{firmwares/fixedwing => modules/mavlink}/mavlink_downlink.h (89%) rename sw/airborne/{subsystems/datalink => modules/mavlink}/mavlink_transport.c (90%) rename sw/airborne/{subsystems/datalink => modules/mavlink}/mavlink_transport.h (98%) diff --git a/conf/airframes/ENAC/fixed-wing/weasel_mavlink.xml b/conf/airframes/ENAC/fixed-wing/weasel_mavlink.xml index adf55a4196a..e817562c5af 100644 --- a/conf/airframes/ENAC/fixed-wing/weasel_mavlink.xml +++ b/conf/airframes/ENAC/fixed-wing/weasel_mavlink.xml @@ -12,6 +12,7 @@ + @@ -31,7 +32,7 @@ - + diff --git a/conf/autopilot/fixedwing.xml b/conf/autopilot/fixedwing.xml index c3bf50eda7c..1194176c80d 100644 --- a/conf/autopilot/fixedwing.xml +++ b/conf/autopilot/fixedwing.xml @@ -16,7 +16,7 @@ - + diff --git a/conf/autopilot/subsystems/fixedwing/telemetry_dummy.makefile b/conf/autopilot/subsystems/fixedwing/telemetry_dummy.makefile new file mode 100644 index 00000000000..6f415899139 --- /dev/null +++ b/conf/autopilot/subsystems/fixedwing/telemetry_dummy.makefile @@ -0,0 +1,11 @@ +# Hey Emacs, this is a -*- makefile -*- + + +ap.CFLAGS += -DUSE_PPRZ_TRANSPORT=0 +ap.CFLAGS += -DUSE_$(MODEM_PORT) +ap.CFLAGS += -D$(MODEM_PORT)_BAUD=$(MODEM_BAUD) + +ap.CFLAGS += -DDOWNLINK -DDOWNLINK_DEVICE=$(MODEM_PORT) -DDOWNLINK_FBW_DEVICE=$(MODEM_PORT) -DDOWNLINK_AP_DEVICE=$(MODEM_PORT) -DPPRZ_UART=$(MODEM_PORT) +ap.CFLAGS += -DDOWNLINK_TRANSPORT=PprzTransport +ap.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c +ap.srcs += $(SRC_FIRMWARE)/datalink.c diff --git a/conf/autopilot/subsystems/fixedwing/telemetry_mavlink.makefile b/conf/autopilot/subsystems/fixedwing/telemetry_mavlink.makefile deleted file mode 100644 index 54a96b67acb..00000000000 --- a/conf/autopilot/subsystems/fixedwing/telemetry_mavlink.makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Hey Emacs, this is a -*- makefile -*- - - -ap.CFLAGS += -DUSE_$(MODEM_PORT) -ap.CFLAGS += -D$(MODEM_PORT)_BAUD=$(MODEM_BAUD) - -ap.CFLAGS += -DDOWNLINK -DDOWNLINK_FBW_DEVICE=$(MODEM_PORT) -DDOWNLINK_AP_DEVICE=$(MODEM_PORT) -DDOWNLINK_MAV_DEVICE=$(MODEM_PORT) -DMAV_UART=$(MODEM_PORT) -DPPRZ_UART=$(MODEM_PORT) -ap.CFLAGS += -DDOWNLINK_TRANSPORT=MavlinkTransport -DDATALINK=MAV -ap.srcs += subsystems/datalink/downlink.c subsystems/datalink/mavlink_transport.c -ap.srcs += $(SRC_FIRMWARE)/datalink.c diff --git a/conf/modules/mavlink.xml b/conf/modules/mavlink.xml new file mode 100644 index 00000000000..a1fc0c2d18d --- /dev/null +++ b/conf/modules/mavlink.xml @@ -0,0 +1,14 @@ + + + +
+ +
+ + + + + + +
+ diff --git a/conf/settings/basic_mavlink.xml b/conf/settings/basic_mavlink.xml deleted file mode 100644 index 518c5646a95..00000000000 --- a/conf/settings/basic_mavlink.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/conf/telemetry/mavlink.xml b/conf/telemetry/mavlink.xml index 2c74f60bc03..2703c0876c6 100644 --- a/conf/telemetry/mavlink.xml +++ b/conf/telemetry/mavlink.xml @@ -1,7 +1,8 @@ - + +