Skip to content

Commit

Permalink
[conf] no telemetry for fbw target
Browse files Browse the repository at this point in the history
  • Loading branch information
@flixr
flixr committed Nov 6, 2013
1 parent cc9e085 commit 3c9dd7c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 10 deletions.
11 changes: 4 additions & 7 deletions conf/firmwares/subsystems/fixedwing/autopilot.makefile
View file
Expand Up @@ -77,10 +77,6 @@ $(TARGET).srcs += math/pprz_geodetic_int.c math/pprz_geodetic_float.c math/pprz_
$(TARGET).srcs += mcu_periph/i2c.c
$(TARGET).srcs += $(SRC_ARCH)/mcu_periph/i2c_arch.c

#
# Telemetry
#
$(TARGET).srcs += subsystems/datalink/telemetry.c

######################################################################
##
Expand Down Expand Up @@ -153,6 +149,7 @@ ap_CFLAGS += -DDefaultPeriodic='&telemetry_Ap'
ap_srcs += $(SRC_FIRMWARE)/main_ap.c
ap_srcs += $(SRC_FIRMWARE)/autopilot.c
ap_srcs += $(SRC_FIRMWARE)/ap_downlink.c
ap_srcs += subsystems/datalink/telemetry.c
ap_srcs += state.c
ap_srcs += subsystems/settings.c
ap_srcs += $(SRC_ARCH)/subsystems/settings_arch.c
Expand Down Expand Up @@ -189,8 +186,8 @@ sim.srcs += $(fbw_srcs) $(ap_srcs)
sim.CFLAGS += -DSITL
sim.srcs += $(SRC_ARCH)/sim_ap.c

sim.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DDefaultPeriodic='&telemetry_Ap'
sim.srcs += subsystems/datalink/telemetry.c subsystems/datalink/downlink.c $(SRC_FIRMWARE)/datalink.c $(SRC_ARCH)/ivy_transport.c
sim.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport
sim.srcs += subsystems/datalink/downlink.c $(SRC_FIRMWARE)/datalink.c $(SRC_ARCH)/ivy_transport.c

sim.srcs += $(SRC_ARCH)/sim_gps.c $(SRC_ARCH)/sim_adc_generic.c

Expand Down Expand Up @@ -229,7 +226,7 @@ jsbsim.srcs += $(SIMDIR)/sim_ac_jsbsim.c $(SIMDIR)/sim_ac_fw.c $(SIMDIR)/sim_a
jsbsim.CFLAGS += -I/usr/include $(shell pkg-config glib-2.0 --cflags)
jsbsim.LDFLAGS += $(shell pkg-config glib-2.0 --libs) -lglibivy -lm

jsbsim.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DDefaultPeriodic='&telemetry_Ap'
jsbsim.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport
jsbsim.srcs += subsystems/datalink/downlink.c $(SRC_FIRMWARE)/datalink.c $(SRC_ARCH)/ivy_transport.c

jsbsim.srcs += $(SRC_ARCH)/jsbsim_hw.c $(SRC_ARCH)/jsbsim_ir.c $(SRC_ARCH)/jsbsim_gps.c $(SRC_ARCH)/jsbsim_ahrs.c $(SRC_ARCH)/jsbsim_transport.c
Expand Down
3 changes: 0 additions & 3 deletions conf/firmwares/subsystems/fixedwing/telemetry_transparent.makefile
View file
Expand Up @@ -9,6 +9,3 @@ telemetry_srcs = subsystems/datalink/downlink.c subsystems/datalink/pprz_transpo
ap.CFLAGS += $(telemetry_CFLAGS)
ap.srcs += $(telemetry_srcs) $(SRC_FIRMWARE)/datalink.c

fbw.CFLAGS += $(telemetry_CFLAGS)
fbw.srcs += $(telemetry_srcs)

2 comments on commit 3c9dd7c

@OpenUAS
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thx for not forgetting the more "obscure" setup with AP+FBW boards

@gautierhattenberger
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@OpenUAS, can you repair the fbw telemetry yourself ? It is hard to do without the hardware.
Also, one of the example file had some configuration issue. In the DualBoardApFbw, telemetry is set for UART2 for all targets, but this UART is already used by the FBW part as mcu_link. Maybe I missed something.

Please sign in to comment.