Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-01 21:07:40 +08:00
Code Issues Actions 26 Packages Projects Releases Wiki Activity

Revert "[datalink] NOT all firmwares use datalink.c"

Browse Source 
This reverts commit 8390478a73.

Ok, all firmwares should be able to use datalink.c, since the stuff they might not use is protected by ifdefs
This commit is contained in:
Felix Ruess
2016-02-02 21:59:11 +01:00
parent f8145a2ba1
commit ef251eac07
21 changed files with 10 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/firmwares/subsystems/fixedwing/telemetry_bluegiga.makefile
-1
View File
@@ -5,7 +5,6 @@ ifeq ($(TARGET),ap)
include $(CFG_SHARED)/telemetry_bluegiga.makefile include $(CFG_SHARED)/telemetry_bluegiga.makefile
endif endif
ap.srcs += subsystems/datalink/datalink.c
ap.srcs += $(SRC_FIRMWARE)/fixedwing_datalink.c $(SRC_FIRMWARE)/ap_downlink.c ap.srcs += $(SRC_FIRMWARE)/fixedwing_datalink.c $(SRC_FIRMWARE)/ap_downlink.c
# avoid fbw_telemetry_mode error # avoid fbw_telemetry_mode error
conf/firmwares/subsystems/fixedwing/telemetry_superbitrf.makefile
-1
View File
@@ -8,7 +8,6 @@ ifeq ($(TARGET),ap)
include $(CFG_SHARED)/telemetry_superbitrf.makefile include $(CFG_SHARED)/telemetry_superbitrf.makefile
endif endif
ap.srcs += subsystems/datalink/datalink.c
ap.srcs += $(SRC_FIRMWARE)/fixedwing_datalink.c $(SRC_FIRMWARE)/ap_downlink.c ap.srcs += $(SRC_FIRMWARE)/fixedwing_datalink.c $(SRC_FIRMWARE)/ap_downlink.c
# avoid fbw_telemetry_mode error # avoid fbw_telemetry_mode error
conf/firmwares/subsystems/fixedwing/telemetry_transparent.makefile
-1
View File
@@ -5,7 +5,6 @@ ifeq ($(TARGET),ap)
include $(CFG_SHARED)/telemetry_transparent.makefile include $(CFG_SHARED)/telemetry_transparent.makefile
endif endif
ap.srcs += subsystems/datalink/datalink.c
ap.srcs += $(SRC_FIRMWARE)/fixedwing_datalink.c $(SRC_FIRMWARE)/ap_downlink.c ap.srcs += $(SRC_FIRMWARE)/fixedwing_datalink.c $(SRC_FIRMWARE)/ap_downlink.c
# avoid fbw_telemetry_mode error # avoid fbw_telemetry_mode error
conf/firmwares/subsystems/fixedwing/telemetry_transparent_usb.makefile
-1
View File
@@ -6,7 +6,6 @@ ifeq ($(TARGET), ap)
include $(CFG_SHARED)/telemetry_transparent_usb.makefile include $(CFG_SHARED)/telemetry_transparent_usb.makefile
endif endif
ap.srcs += subsystems/datalink/datalink.c
ap.srcs += $(SRC_FIRMWARE)/fixedwing_datalink.c $(SRC_FIRMWARE)/ap_downlink.c $(SRC_FIRMWARE)/fbw_downlink.c ap.srcs += $(SRC_FIRMWARE)/fixedwing_datalink.c $(SRC_FIRMWARE)/ap_downlink.c $(SRC_FIRMWARE)/fbw_downlink.c
# avoid fbw_telemetry_mode error # avoid fbw_telemetry_mode error
ap.srcs += $(SRC_FIRMWARE)/fbw_downlink.c ap.srcs += $(SRC_FIRMWARE)/fbw_downlink.c
conf/firmwares/subsystems/fixedwing/telemetry_w5100.makefile
-1
View File
@@ -6,7 +6,6 @@ ifeq ($(TARGET), ap)
include $(CFG_SHARED)/telemetry_w5100.makefile include $(CFG_SHARED)/telemetry_w5100.makefile
endif endif
ap.srcs += subsystems/datalink/datalink.c
ap.srcs += $(SRC_FIRMWARE)/fixedwing_datalink.c $(SRC_FIRMWARE)/ap_downlink.c ap.srcs += $(SRC_FIRMWARE)/fixedwing_datalink.c $(SRC_FIRMWARE)/ap_downlink.c
# avoid fbw_telemetry_mode error # avoid fbw_telemetry_mode error
conf/firmwares/subsystems/fixedwing/telemetry_xbee_api.makefile
-1
View File
@@ -7,7 +7,6 @@ ifeq ($(TARGET),ap)
include $(CFG_SHARED)/telemetry_xbee_api.makefile include $(CFG_SHARED)/telemetry_xbee_api.makefile
endif endif
ap.srcs += subsystems/datalink/datalink.c
ap.srcs += $(SRC_FIRMWARE)/fixedwing_datalink.c $(SRC_FIRMWARE)/ap_downlink.c ap.srcs += $(SRC_FIRMWARE)/fixedwing_datalink.c $(SRC_FIRMWARE)/ap_downlink.c
# avoid fbw_telemetry_mode error # avoid fbw_telemetry_mode error
conf/firmwares/subsystems/rotorcraft/telemetry_bluegiga.makefile
-1
View File
@@ -6,5 +6,4 @@ ifeq ($(TARGET), ap)
include $(CFG_SHARED)/telemetry_bluegiga.makefile include $(CFG_SHARED)/telemetry_bluegiga.makefile
endif endif
ap.srcs += subsystems/datalink/datalink.c
ap.srcs += $(SRC_FIRMWARE)/rotorcraft_datalink.c $(SRC_FIRMWARE)/rotorcraft_telemetry.c ap.srcs += $(SRC_FIRMWARE)/rotorcraft_datalink.c $(SRC_FIRMWARE)/rotorcraft_telemetry.c
conf/firmwares/subsystems/rotorcraft/telemetry_superbitrf.makefile
-1
View File
@@ -7,6 +7,5 @@ ifeq ($(TARGET), ap)
include $(CFG_SHARED)/telemetry_superbitrf.makefile include $(CFG_SHARED)/telemetry_superbitrf.makefile
endif endif
ap.srcs += subsystems/datalink/datalink.c
# add rotorcraft specific files # add rotorcraft specific files
ap.srcs += $(SRC_FIRMWARE)/rotorcraft_datalink.c $(SRC_FIRMWARE)/rotorcraft_telemetry.c ap.srcs += $(SRC_FIRMWARE)/rotorcraft_datalink.c $(SRC_FIRMWARE)/rotorcraft_telemetry.c
conf/firmwares/subsystems/rotorcraft/telemetry_transparent.makefile
-1
View File
@@ -9,5 +9,4 @@ ifeq ($(TARGET), ap)
include $(CFG_SHARED)/telemetry_transparent.makefile include $(CFG_SHARED)/telemetry_transparent.makefile
endif endif
ap.srcs += subsystems/datalink/datalink.c
ap.srcs += $(SRC_FIRMWARE)/rotorcraft_datalink.c $(SRC_FIRMWARE)/rotorcraft_telemetry.c ap.srcs += $(SRC_FIRMWARE)/rotorcraft_datalink.c $(SRC_FIRMWARE)/rotorcraft_telemetry.c
conf/firmwares/subsystems/rotorcraft/telemetry_transparent_udp.makefile
+1 -2
View File
@@ -5,5 +5,4 @@ ifeq ($(TARGET), ap)
include $(CFG_SHARED)/telemetry_transparent_udp.makefile include $(CFG_SHARED)/telemetry_transparent_udp.makefile
endif endif
ap.srcs += subsystems/datalink/datalink.c ap.srcs += subsystems/datalink/datalink.c $(SRC_FIRMWARE)/rotorcraft_datalink.c $(SRC_FIRMWARE)/rotorcraft_telemetry.c
ap.srcs += $(SRC_FIRMWARE)/rotorcraft_datalink.c $(SRC_FIRMWARE)/rotorcraft_telemetry.c
conf/firmwares/subsystems/rotorcraft/telemetry_transparent_usb.makefile
-1
View File
@@ -5,5 +5,4 @@ ifeq ($(TARGET), ap)
include $(CFG_SHARED)/telemetry_transparent_usb.makefile include $(CFG_SHARED)/telemetry_transparent_usb.makefile
endif endif
ap.srcs += subsystems/datalink/datalink.c
ap.srcs += $(SRC_FIRMWARE)/rotorcraft_datalink.c $(SRC_FIRMWARE)/rotorcraft_telemetry.c ap.srcs += $(SRC_FIRMWARE)/rotorcraft_datalink.c $(SRC_FIRMWARE)/rotorcraft_telemetry.c
conf/firmwares/subsystems/rotorcraft/telemetry_xbee_api.makefile
-1
View File
@@ -10,5 +10,4 @@ ifeq ($(TARGET), ap)
include $(CFG_SHARED)/telemetry_xbee_api.makefile include $(CFG_SHARED)/telemetry_xbee_api.makefile
endif endif
ap.srcs += subsystems/datalink/datalink.c
ap.srcs += $(SRC_FIRMWARE)/rotorcraft_datalink.c $(SRC_FIRMWARE)/rotorcraft_telemetry.c ap.srcs += $(SRC_FIRMWARE)/rotorcraft_datalink.c $(SRC_FIRMWARE)/rotorcraft_telemetry.c
conf/firmwares/subsystems/shared/telemetry_bluegiga.makefile
+1 -1
View File
@@ -31,5 +31,5 @@ ifneq ($(MODEM_LED),none)
ap.CFLAGS += -DMODEM_LED=$(MODEM_LED) ap.CFLAGS += -DMODEM_LED=$(MODEM_LED)
endif endif
ap.srcs += $(SRC_SUBSYSTEMS)/datalink/downlink.c $(SRC_SUBSYSTEMS)/datalink/bluegiga.c ap.srcs += $(SRC_SUBSYSTEMS)/datalink/downlink.c subsystems/datalink/datalink.c $(SRC_SUBSYSTEMS)/datalink/bluegiga.c
ap.srcs += $(PAPARAZZI_HOME)/var/share/pprzlink/src/pprz_transport.c $(SRC_SUBSYSTEMS)/datalink/telemetry.c ap.srcs += $(PAPARAZZI_HOME)/var/share/pprzlink/src/pprz_transport.c $(SRC_SUBSYSTEMS)/datalink/telemetry.c
conf/firmwares/subsystems/shared/telemetry_ivy.makefile
+1 -1
View File
@@ -1,3 +1,3 @@
$(TARGET).CFLAGS += -DDOWNLINK -DPERIODIC_TELEMETRY -DDOWNLINK_TRANSPORT=ivy_tp -DDOWNLINK_DEVICE=ivy_tp $(TARGET).CFLAGS += -DDOWNLINK -DPERIODIC_TELEMETRY -DDOWNLINK_TRANSPORT=ivy_tp -DDOWNLINK_DEVICE=ivy_tp
$(TARGET).srcs += $(PAPARAZZI_HOME)/var/share/pprzlink/src/ivy_transport.c $(TARGET).srcs += $(PAPARAZZI_HOME)/var/share/pprzlink/src/ivy_transport.c
$(TARGET).srcs += subsystems/datalink/downlink.c subsystems/datalink/telemetry.c $(TARGET).srcs += subsystems/datalink/downlink.c subsystems/datalink/datalink.c subsystems/datalink/telemetry.c
conf/firmwares/subsystems/shared/telemetry_superbitrf.makefile
+1 -1
View File
@@ -7,4 +7,4 @@ $(TARGET).CFLAGS += -DDOWNLINK -DPERIODIC_TELEMETRY -DDOWNLINK_DEVICE=superbitrf
$(TARGET).CFLAGS += -DDOWNLINK_TRANSPORT=pprz_tp -DDATALINK=SUPERBITRF $(TARGET).CFLAGS += -DDOWNLINK_TRANSPORT=pprz_tp -DDATALINK=SUPERBITRF
$(TARGET).srcs += peripherals/cyrf6936.c $(TARGET).srcs += peripherals/cyrf6936.c
$(TARGET).srcs += subsystems/datalink/downlink.c subsystems/datalink/superbitrf.c $(PAPARAZZI_HOME)/var/share/pprzlink/src/pprz_transport.c subsystems/datalink/telemetry.c $(TARGET).srcs += subsystems/datalink/downlink.c subsystems/datalink/datalink.c subsystems/datalink/superbitrf.c $(PAPARAZZI_HOME)/var/share/pprzlink/src/pprz_transport.c subsystems/datalink/telemetry.c
conf/firmwares/subsystems/shared/telemetry_transparent.makefile
+1 -1
View File
@@ -13,5 +13,5 @@ $(TARGET).CFLAGS += -D$(PPRZ_MODEM_PORT_UPPER)_BAUD=$(MODEM_BAUD)
$(TARGET).CFLAGS += -DDOWNLINK -DPERIODIC_TELEMETRY -DDOWNLINK_DEVICE=$(PPRZ_MODEM_PORT_LOWER) -DPPRZ_UART=$(PPRZ_MODEM_PORT_LOWER) $(TARGET).CFLAGS += -DDOWNLINK -DPERIODIC_TELEMETRY -DDOWNLINK_DEVICE=$(PPRZ_MODEM_PORT_LOWER) -DPPRZ_UART=$(PPRZ_MODEM_PORT_LOWER)
$(TARGET).CFLAGS += -DDOWNLINK_TRANSPORT=pprz_tp -DDATALINK=PPRZ $(TARGET).CFLAGS += -DDOWNLINK_TRANSPORT=pprz_tp -DDATALINK=PPRZ
$(TARGET).srcs += subsystems/datalink/downlink.c $(PAPARAZZI_HOME)/var/share/pprzlink/src/pprz_transport.c subsystems/datalink/telemetry.c $(TARGET).srcs += subsystems/datalink/downlink.c subsystems/datalink/datalink.c $(PAPARAZZI_HOME)/var/share/pprzlink/src/pprz_transport.c subsystems/datalink/telemetry.c
conf/firmwares/subsystems/shared/telemetry_transparent_udp.makefile
+1 -1
View File
@@ -19,5 +19,5 @@ TELEM_CFLAGS += -DDOWNLINK_TRANSPORT=pprz_tp -DDATALINK=PPRZ
$(TARGET).CFLAGS += $(MODEM_CFLAGS) $(TELEM_CFLAGS) $(TARGET).CFLAGS += $(MODEM_CFLAGS) $(TELEM_CFLAGS)
$(TARGET).srcs += subsystems/datalink/downlink.c $(PAPARAZZI_HOME)/var/share/pprzlink/src/pprz_transport.c subsystems/datalink/telemetry.c $(TARGET).srcs += subsystems/datalink/downlink.c subsystems/datalink/datalink.c $(PAPARAZZI_HOME)/var/share/pprzlink/src/pprz_transport.c subsystems/datalink/telemetry.c
conf/firmwares/subsystems/shared/telemetry_transparent_usb.makefile
+1 -1
View File
@@ -4,7 +4,7 @@
$(TARGET).CFLAGS += -DDOWNLINK -DDOWNLINK_DEVICE=usb_serial -DPPRZ_UART=usb_serial $(TARGET).CFLAGS += -DDOWNLINK -DDOWNLINK_DEVICE=usb_serial -DPPRZ_UART=usb_serial
$(TARGET).CFLAGS += -DDOWNLINK_TRANSPORT=pprz_tp -DDATALINK=PPRZ -DUSE_USB_SERIAL $(TARGET).CFLAGS += -DDOWNLINK_TRANSPORT=pprz_tp -DDATALINK=PPRZ -DUSE_USB_SERIAL
$(TARGET).CFLAGS += -DPERIODIC_TELEMETRY $(TARGET).CFLAGS += -DPERIODIC_TELEMETRY
$(TARGET).srcs += subsystems/datalink/downlink.c $(PAPARAZZI_HOME)/var/share/pprzlink/src/pprz_transport.c subsystems/datalink/telemetry.c $(TARGET).srcs += subsystems/datalink/downlink.c subsystems/datalink/datalink.c $(PAPARAZZI_HOME)/var/share/pprzlink/src/pprz_transport.c subsystems/datalink/telemetry.c
ifeq ($(ARCH), lpc21) ifeq ($(ARCH), lpc21)
$(TARGET).srcs += $(SRC_ARCH)/usb_ser_hw.c $(SRC_ARCH)/lpcusb/usbhw_lpc.c $(SRC_ARCH)/lpcusb/usbcontrol.c $(TARGET).srcs += $(SRC_ARCH)/usb_ser_hw.c $(SRC_ARCH)/lpcusb/usbhw_lpc.c $(SRC_ARCH)/lpcusb/usbcontrol.c
conf/firmwares/subsystems/shared/telemetry_w5100.makefile
+1 -1
View File
@@ -10,7 +10,7 @@ W5100_MULTICAST_PORT ?= "1234"
$(TARGET).CFLAGS += -DDOWNLINK -DPERIODIC_TELEMETRY -DDOWNLINK_DEVICE=chip0 $(TARGET).CFLAGS += -DDOWNLINK -DPERIODIC_TELEMETRY -DDOWNLINK_DEVICE=chip0
$(TARGET).CFLAGS += -DDOWNLINK_TRANSPORT=pprz_tp -DDATALINK=W5100 $(TARGET).CFLAGS += -DDOWNLINK_TRANSPORT=pprz_tp -DDATALINK=W5100
$(TARGET).CFLAGS += -DW5100_IP=$(W5100_IP) -DW5100_SUBNET=$(W5100_SUBNET) -DW5100_MULTICAST_IP=$(W5100_MULTICAST_IP) -DW5100_MULTICAST_PORT=$(W5100_MULTICAST_PORT) $(TARGET).CFLAGS += -DW5100_IP=$(W5100_IP) -DW5100_SUBNET=$(W5100_SUBNET) -DW5100_MULTICAST_IP=$(W5100_MULTICAST_IP) -DW5100_MULTICAST_PORT=$(W5100_MULTICAST_PORT)
$(TARGET).srcs += subsystems/datalink/downlink.c subsystems/datalink/w5100.c $(PAPARAZZI_HOME)/var/share/pprzlink/src/pprz_transport.c subsystems/datalink/telemetry.c $(TARGET).srcs += subsystems/datalink/downlink.c subsystems/datalink/datalink.c subsystems/datalink/w5100.c $(PAPARAZZI_HOME)/var/share/pprzlink/src/pprz_transport.c subsystems/datalink/telemetry.c
ifeq ($(ARCH), lpc21) ifeq ($(ARCH), lpc21)
# only an issue of setting the DRDY pin in w5100.c, which is stm32 specific # only an issue of setting the DRDY pin in w5100.c, which is stm32 specific
conf/firmwares/subsystems/shared/telemetry_xbee_api.makefile
+1 -1
View File
@@ -14,4 +14,4 @@ $(TARGET).CFLAGS += -D$(XBEE_MODEM_PORT_UPPER)_BAUD=$(MODEM_BAUD) -DXBEE_BAUD=$(
$(TARGET).CFLAGS += -DDOWNLINK -DPERIODIC_TELEMETRY -DDOWNLINK_DEVICE=$(XBEE_MODEM_PORT_LOWER) -DXBEE_UART=$(XBEE_MODEM_PORT_LOWER) $(TARGET).CFLAGS += -DDOWNLINK -DPERIODIC_TELEMETRY -DDOWNLINK_DEVICE=$(XBEE_MODEM_PORT_LOWER) -DXBEE_UART=$(XBEE_MODEM_PORT_LOWER)
$(TARGET).CFLAGS += -DDOWNLINK_TRANSPORT=xbee_tp -DDATALINK=XBEE $(TARGET).CFLAGS += -DDOWNLINK_TRANSPORT=xbee_tp -DDATALINK=XBEE
$(TARGET).srcs += subsystems/datalink/downlink.c $(PAPARAZZI_HOME)/var/share/pprzlink/src/xbee_transport.c subsystems/datalink/telemetry.c $(TARGET).srcs += subsystems/datalink/downlink.c subsystems/datalink/datalink.c $(PAPARAZZI_HOME)/var/share/pprzlink/src/xbee_transport.c subsystems/datalink/telemetry.c
sw/airborne/subsystems/datalink/datalink.c
+1 -2
View File
@@ -22,8 +22,7 @@
/** /**
* @file subsystems/datalink/datalink.c * @file subsystems/datalink/datalink.c
* Handling of messages coming from ground and other A/Cs. * Handling of messages coming from ground and other A/Cs.
* This is common to the fixedwing and rotorcraft firmwares, *
* other firmwares should provide their own dl_parse_msg().
*/ */
#define DATALINK_C #define DATALINK_C