Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
cleanup telemetry subsystem makefiles
- Loading branch information
Showing
20 changed files
with
162 additions
and
135 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 5 additions & 9 deletions
14
conf/firmwares/subsystems/fixedwing/telemetry_transparent.makefile
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 6 additions & 6 deletions
12
conf/firmwares/subsystems/rotorcraft/telemetry_superbitrf.makefile
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| # | ||
| # The superbitRF module as telemetry downlink/uplink | ||
| # | ||
| # | ||
| ap.CFLAGS += -DDOWNLINK -DPERIODIC_TELEMETRY -DDOWNLINK_DEVICE=superbitrf | ||
| ap.CFLAGS += -DDOWNLINK_TRANSPORT=pprz_tp -DDATALINK=SUPERBITRF | ||
| #ap.CFLAGS += -DUSE_SUPERBITRF -DUSE_SPI2 -DUSE_SPI_SLAVE2 | ||
|
|
||
| ap.srcs += peripherals/cyrf6936.c | ||
| ap.srcs += subsystems/datalink/downlink.c subsystems/datalink/superbitrf.c subsystems/datalink/pprz_transport.c subsystems/datalink/telemetry.c | ||
| # include generic part | ||
| ifeq ($(TARGET), ap) | ||
| include $(CFG_SHARED)/telemetry_superbitrf.makefile | ||
| endif | ||
|
|
||
| # add rotorcraft specific files | ||
| ap.srcs += $(SRC_FIRMWARE)/datalink.c $(SRC_FIRMWARE)/rotorcraft_telemetry.c |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 3 additions & 18 deletions
21
conf/firmwares/subsystems/rotorcraft/telemetry_transparent_udp.makefile
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,8 @@ | ||
|
|
||
| #serial UDP | ||
|
|
||
| include $(CFG_SHARED)/udp.makefile | ||
| ifeq ($(TARGET), ap) | ||
| include $(CFG_SHARED)/telemetry_transparent_udp.makefile | ||
| endif | ||
|
|
||
| MODEM_DEV ?= UDP0 | ||
| MODEM_PORT_OUT ?= 4242 | ||
| MODEM_PORT_IN ?= 4243 | ||
| MODEM_BROADCAST ?= TRUE | ||
|
|
||
| UDP_MODEM_PORT_LOWER=$(shell echo $(MODEM_DEV) | tr A-Z a-z) | ||
|
|
||
|
|
||
| MODEM_CFLAGS = -DUSE_$(MODEM_DEV) -D$(MODEM_DEV)_PORT_OUT=$(MODEM_PORT_OUT) -D$(MODEM_DEV)_PORT_IN=$(MODEM_PORT_IN) | ||
| MODEM_CFLAGS += -D$(MODEM_DEV)_BROADCAST=$(MODEM_BROADCAST) -D$(MODEM_DEV)_HOST=\"$(MODEM_HOST)\" | ||
|
|
||
| TELEM_CFLAGS = -DDOWNLINK -DPERIODIC_TELEMETRY -DDOWNLINK_DEVICE=$(UDP_MODEM_PORT_LOWER) -DPPRZ_UART=$(UDP_MODEM_PORT_LOWER) | ||
| TELEM_CFLAGS += -DDOWNLINK_TRANSPORT=pprz_tp -DDATALINK=PPRZ | ||
|
|
||
|
|
||
| ap.CFLAGS += $(MODEM_CFLAGS) $(TELEM_CFLAGS) | ||
| ap.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c subsystems/datalink/telemetry.c | ||
| ap.srcs += $(SRC_FIRMWARE)/datalink.c $(SRC_FIRMWARE)/rotorcraft_telemetry.c |
23 changes: 4 additions & 19 deletions
23
conf/firmwares/subsystems/rotorcraft/telemetry_transparent_usb.makefile
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,8 @@ | ||
|
|
||
| #serial USB (e.g. /dev/ttyACM0) | ||
|
|
||
| ifeq ($(ARCH), lpc21) | ||
| ap.CFLAGS += -DDOWNLINK -DPERIODIC_TELEMETRY -DDOWNLINK_DEVICE=usb_serial -DPPRZ_UART=usb_serial | ||
| ap.CFLAGS += -DDOWNLINK_TRANSPORT=pprz_tp -DDATALINK=PPRZ -DUSE_USB_SERIAL | ||
| ap.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c subsystems/datalink/telemetry.c | ||
| ap.srcs += $(SRC_FIRMWARE)/datalink.c $(SRC_FIRMWARE)/rotorcraft_telemetry.c | ||
| ap.srcs += $(SRC_ARCH)/usb_ser_hw.c $(SRC_ARCH)/lpcusb/usbhw_lpc.c $(SRC_ARCH)/lpcusb/usbcontrol.c | ||
| ap.srcs += $(SRC_ARCH)/lpcusb/usbstdreq.c $(SRC_ARCH)/lpcusb/usbinit.c | ||
| else | ||
| ifeq ($(ARCH), stm32) | ||
| ap.CFLAGS += -DDOWNLINK -DPERIODIC_TELEMETRY -DDOWNLINK_DEVICE=usb_serial -DPPRZ_UART=usb_serial | ||
| ap.CFLAGS += -DDOWNLINK_TRANSPORT=pprz_tp -DDATALINK=PPRZ -DUSE_USB_SERIAL | ||
| ap.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c subsystems/datalink/telemetry.c | ||
| ap.srcs += $(SRC_FIRMWARE)/datalink.c $(SRC_FIRMWARE)/rotorcraft_telemetry.c | ||
| ap.srcs += $(SRC_ARCH)/usb_ser_hw.c | ||
| else | ||
| ifneq ($(ARCH), sim) | ||
| $(error telemetry_transparent_usb currently only implemented for the lpc21 and stm32) | ||
| endif | ||
| endif | ||
| ifeq ($(TARGET), ap) | ||
| include $(CFG_SHARED)/telemetry_transparent_usb.makefile | ||
| endif | ||
|
|
||
| ap.srcs += $(SRC_FIRMWARE)/datalink.c $(SRC_FIRMWARE)/rotorcraft_telemetry.c |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| $(TARGET).CFLAGS += -DDOWNLINK -DPERIODIC_TELEMETRY -DDOWNLINK_TRANSPORT=ivy_tp -DDOWNLINK_DEVICE=ivy_tp | ||
| $(TARGET).srcs += subsystems/datalink/ivy_transport.c | ||
| $(TARGET).srcs += subsystems/datalink/downlink.c subsystems/datalink/telemetry.c |
10 changes: 10 additions & 0 deletions
10
conf/firmwares/subsystems/shared/telemetry_superbitrf.makefile
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| # | ||
| # The superbitRF module as telemetry downlink/uplink | ||
| # | ||
| # | ||
|
|
||
| $(TARGET).CFLAGS += -DDOWNLINK -DPERIODIC_TELEMETRY -DDOWNLINK_DEVICE=superbitrf | ||
| $(TARGET).CFLAGS += -DDOWNLINK_TRANSPORT=pprz_tp -DDATALINK=SUPERBITRF | ||
|
|
||
| $(TARGET).srcs += peripherals/cyrf6936.c | ||
| $(TARGET).srcs += subsystems/datalink/downlink.c subsystems/datalink/superbitrf.c subsystems/datalink/pprz_transport.c subsystems/datalink/telemetry.c |
16 changes: 16 additions & 0 deletions
16
conf/firmwares/subsystems/shared/telemetry_transparent.makefile
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| # | ||
| # Expected from board file or overriden as xml param : | ||
| # | ||
| # MODEM_PORT | ||
| # MODEM_BAUD | ||
| # | ||
|
|
||
| PPRZ_MODEM_PORT_LOWER=$(shell echo $(MODEM_PORT) | tr A-Z a-z) | ||
|
|
||
| $(TARGET).CFLAGS += -DUSE_$(MODEM_PORT) | ||
| $(TARGET).CFLAGS += -D$(MODEM_PORT)_BAUD=$(MODEM_BAUD) | ||
|
|
||
| $(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).srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c subsystems/datalink/telemetry.c | ||
|
|
23 changes: 23 additions & 0 deletions
23
conf/firmwares/subsystems/shared/telemetry_transparent_udp.makefile
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
|
|
||
| #serial UDP | ||
|
|
||
| include $(CFG_SHARED)/udp.makefile | ||
|
|
||
| MODEM_DEV ?= UDP0 | ||
| MODEM_PORT_OUT ?= 4242 | ||
| MODEM_PORT_IN ?= 4243 | ||
| MODEM_BROADCAST ?= TRUE | ||
|
|
||
| UDP_MODEM_PORT_LOWER=$(shell echo $(MODEM_DEV) | tr A-Z a-z) | ||
|
|
||
|
|
||
| MODEM_CFLAGS = -DUSE_$(MODEM_DEV) -D$(MODEM_DEV)_PORT_OUT=$(MODEM_PORT_OUT) -D$(MODEM_DEV)_PORT_IN=$(MODEM_PORT_IN) | ||
| MODEM_CFLAGS += -D$(MODEM_DEV)_BROADCAST=$(MODEM_BROADCAST) -D$(MODEM_DEV)_HOST=\"$(MODEM_HOST)\" | ||
|
|
||
| TELEM_CFLAGS = -DDOWNLINK -DPERIODIC_TELEMETRY -DDOWNLINK_DEVICE=$(UDP_MODEM_PORT_LOWER) -DPPRZ_UART=$(UDP_MODEM_PORT_LOWER) | ||
| TELEM_CFLAGS += -DDOWNLINK_TRANSPORT=pprz_tp -DDATALINK=PPRZ | ||
|
|
||
|
|
||
| $(TARGET).CFLAGS += $(MODEM_CFLAGS) $(TELEM_CFLAGS) | ||
| $(TARGET).srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c subsystems/datalink/telemetry.c | ||
|
|
20 changes: 20 additions & 0 deletions
20
conf/firmwares/subsystems/shared/telemetry_transparent_usb.makefile
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
|
|
||
| #serial USB (e.g. /dev/ttyACM0) | ||
|
|
||
| $(TARGET).CFLAGS += -DDOWNLINK -DDOWNLINK_DEVICE=usb_serial -DPPRZ_UART=usb_serial | ||
| $(TARGET).CFLAGS += -DDOWNLINK_TRANSPORT=pprz_tp -DDATALINK=PPRZ -DUSE_USB_SERIAL | ||
| $(TARGET).CFLAGS += -DPERIODIC_TELEMETRY | ||
| $(TARGET).srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c subsystems/datalink/telemetry.c | ||
|
|
||
| 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)/lpcusb/usbstdreq.c $(SRC_ARCH)/lpcusb/usbinit.c | ||
| else | ||
| ifeq ($(ARCH), stm32) | ||
| $(TARGET).srcs += $(SRC_ARCH)/usb_ser_hw.c | ||
| else | ||
| ifneq ($(ARCH), sim) | ||
| $(error telemetry_transparent_usb currently only implemented for the lpc21 and stm32) | ||
| endif | ||
| endif | ||
| endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| # Hey Emacs, this is a -*- makefile -*- | ||
|
|
||
| # W5100 ethernet chip. | ||
|
|
||
| W5100_IP ?= "192,168,25,47" | ||
| W5100_SUBNET ?= "255,255,255,0" | ||
| W5100_MULTICAST_IP ?= "224,1,1,11" | ||
| W5100_MULTICAST_PORT ?= "1234" | ||
|
|
||
| $(TARGET).CFLAGS += -DDOWNLINK -DPERIODIC_TELEMETRY -DDOWNLINK_DEVICE=chip0 | ||
| $(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).srcs += subsystems/datalink/downlink.c subsystems/datalink/w5100.c subsystems/datalink/pprz_transport.c subsystems/datalink/telemetry.c | ||
|
|
||
| ifeq ($(ARCH), lpc21) | ||
| # only an issue of setting the DRDY pin in w5100.c, which is stm32 specific | ||
| $(error Not implemented for the LCP21x yet.) | ||
| $(TARGET).CFLAGS += -DUSE_SPI1 | ||
| # default SPI device for W5100 is already SPI1 | ||
| $(TARGET).CFLAGS += -DUSE_SPI_SLAVE0 | ||
| $(TARGET).CFLAGS += -DW5100_SLAVE_IDX=0 | ||
| else ifeq ($(ARCH), stm32) | ||
| # on extra SPI1 connector | ||
| $(TARGET).CFLAGS += -DUSE_SPI1 | ||
| # default SPI device for W5100 is already SPI1 | ||
| # Slave select configuration | ||
| # SLAVE1 is SS on external SPI1 connector (PA04) | ||
| $(TARGET).CFLAGS += -DUSE_SPI_SLAVE1 | ||
| # default slave select for W5100 is already SLAVE1 | ||
| #$(TARGET).CFLAGS += -DW5100_SLAVE_IDX=1 | ||
| endif |
16 changes: 16 additions & 0 deletions
16
conf/firmwares/subsystems/shared/telemetry_xbee_api.makefile
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| # XBee modems in API mode | ||
| # | ||
| # Expected from board file or overriden as xml param : | ||
| # | ||
| # MODEM_PORT | ||
| # MODEM_BAUD | ||
| # | ||
|
|
||
| XBEE_MODEM_PORT_LOWER=$(shell echo $(MODEM_PORT) | tr A-Z a-z) | ||
|
|
||
| $(TARGET).CFLAGS += -DUSE_$(MODEM_PORT) | ||
| $(TARGET).CFLAGS += -D$(MODEM_PORT)_BAUD=$(MODEM_BAUD) -DXBEE_BAUD=$(MODEM_BAUD) | ||
|
|
||
| $(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).srcs += subsystems/datalink/downlink.c subsystems/datalink/xbee.c subsystems/datalink/telemetry.c |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters