Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-05 15:30:08 +08:00
Code Issues Actions 29 Packages Projects Releases Wiki Activity

[telemetry] fix compilaton of some jsbsim/nps/test targets

Browse Source
This commit is contained in:
Felix Ruess
2013-07-25 17:53:44 +02:00
parent e429db1dcf
commit 52e86ec5dc
5 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/firmwares/lisa_test_progs.makefile
+3 -1
View File
@@ -80,9 +80,11 @@ COMMON_TEST_SRCS += $(SRC_ARCH)/led_hw.c
COMMON_TELEMETRY_CFLAGS = -DUSE_$(MODEM_PORT) -D$(MODEM_PORT)_BAUD=$(MODEM_BAUD) COMMON_TELEMETRY_CFLAGS = -DUSE_$(MODEM_PORT) -D$(MODEM_PORT)_BAUD=$(MODEM_BAUD)
COMMON_TELEMETRY_CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=$(MODEM_PORT) COMMON_TELEMETRY_CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=$(MODEM_PORT)
COMMON_TELEMETRY_CFLAGS += -DDefaultPeriodic='&telemetry_Main'
COMMON_TELEMETRY_SRCS = mcu_periph/uart.c COMMON_TELEMETRY_SRCS = mcu_periph/uart.c
COMMON_TELEMETRY_SRCS += $(SRC_ARCH)/mcu_periph/uart_arch.c COMMON_TELEMETRY_SRCS += $(SRC_ARCH)/mcu_periph/uart_arch.c
COMMON_TELEMETRY_SRCS += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c COMMON_TELEMETRY_SRCS += subsystems/datalink/pprz_transport.c subsystems/datalink/telemetry.c
COMMON_TELEMETRY_SRCS += subsystems/datalink/downlink.c $(SRC_FIRMWARE)/rotorcraft_telemetry.c
#COMMON_TEST_SRCS += math/pprz_trig_int.c #COMMON_TEST_SRCS += math/pprz_trig_int.c
conf/firmwares/setup.makefile
+2
View File
@@ -86,7 +86,9 @@ setup_actuators.srcs += mcu_periph/uart.c $(SRC_ARCH)/mcu_periph/uart_arch.c
setup_actuators.CFLAGS += -DDOWNLINK -DDOWNLINK_DEVICE=$(MODEM_PORT) -DPPRZ_UART=$(MODEM_PORT) setup_actuators.CFLAGS += -DDOWNLINK -DDOWNLINK_DEVICE=$(MODEM_PORT) -DPPRZ_UART=$(MODEM_PORT)
setup_actuators.CFLAGS += -DDOWNLINK_TRANSPORT=PprzTransport -DDATALINK=PPRZ setup_actuators.CFLAGS += -DDOWNLINK_TRANSPORT=PprzTransport -DDATALINK=PPRZ
setup_actuators.CFLAGS += -DDefaultPeriodic='&telemetry_Ap'
setup_actuators.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c setup_actuators.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c
setup_actuators.srcs += subsystems/datalink/telemetry.c
ifneq ($(SYS_TIME_LED),none) ifneq ($(SYS_TIME_LED),none)
setup_actuators.CFLAGS += -DSYS_TIME_LED=$(SYS_TIME_LED) setup_actuators.CFLAGS += -DSYS_TIME_LED=$(SYS_TIME_LED)
endif endif
conf/firmwares/subsystems/fixedwing/autopilot.makefile
+9 -4
View File
@@ -93,6 +93,11 @@ $(TARGET).srcs += math/pprz_geodetic_int.c math/pprz_geodetic_float.c math/pprz_
$(TARGET).srcs += mcu_periph/i2c.c $(TARGET).srcs += mcu_periph/i2c.c
$(TARGET).srcs += $(SRC_ARCH)/mcu_periph/i2c_arch.c $(TARGET).srcs += $(SRC_ARCH)/mcu_periph/i2c_arch.c
#
# Telemetry
#
$(TARGET).srcs += subsystems/datalink/telemetry.c
###################################################################### ######################################################################
## ##
## COMMON FOR ALL NON-SIMULATION TARGETS ## COMMON FOR ALL NON-SIMULATION TARGETS
@@ -115,7 +120,6 @@ endif
# Main # Main
# #
ns_srcs += $(SRC_FIRMWARE)/main.c ns_srcs += $(SRC_FIRMWARE)/main.c
ns_srcs += subsystems/datalink/telemetry.c
# #
# LEDs # LEDs
@@ -204,7 +208,7 @@ sim.CFLAGS += -DSITL
sim.srcs += $(SRC_ARCH)/sim_ap.c sim.srcs += $(SRC_ARCH)/sim_ap.c
sim.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DDefaultPeriodic='&telemetry_Ap' sim.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DDefaultPeriodic='&telemetry_Ap'
sim.srcs += subsystems/datalink/telemetry.c subsystems/datalink/downlink.c $(SRC_FIRMWARE)/datalink.c sim.srcs += subsystems/datalink/downlink.c $(SRC_FIRMWARE)/datalink.c
sim.srcs += $(SRC_ARCH)/sim_gps.c $(SRC_ARCH)/ivy_transport.c $(SRC_ARCH)/sim_adc_generic.c sim.srcs += $(SRC_ARCH)/sim_gps.c $(SRC_ARCH)/ivy_transport.c $(SRC_ARCH)/sim_adc_generic.c
sim.srcs += subsystems/settings.c sim.srcs += subsystems/settings.c
@@ -245,8 +249,9 @@ 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.CFLAGS += -I/usr/include $(shell pkg-config glib-2.0 --cflags)
jsbsim.LDFLAGS += $(shell pkg-config glib-2.0 --libs) -lglibivy -lm jsbsim.LDFLAGS += $(shell pkg-config glib-2.0 --libs) -lglibivy -lm
jsbsim.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport jsbsim.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DDefaultPeriodic='&telemetry_Ap'
jsbsim.srcs += subsystems/datalink/downlink.c $(SRC_FIRMWARE)/datalink.c $(SRC_ARCH)/jsbsim_hw.c $(SRC_ARCH)/jsbsim_ir.c $(SRC_ARCH)/jsbsim_gps.c $(SRC_ARCH)/jsbsim_ahrs.c $(SRC_ARCH)/ivy_transport.c $(SRC_ARCH)/jsbsim_transport.c jsbsim.srcs += subsystems/datalink/downlink.c $(SRC_FIRMWARE)/datalink.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)/ivy_transport.c $(SRC_ARCH)/jsbsim_transport.c
jsbsim.srcs += subsystems/settings.c jsbsim.srcs += subsystems/settings.c
jsbsim.srcs += $(SRC_ARCH)/subsystems/settings_arch.c jsbsim.srcs += $(SRC_ARCH)/subsystems/settings_arch.c
conf/firmwares/subsystems/rotorcraft/fdm_jsbsim.makefile
+7 -7
View File
@@ -38,7 +38,7 @@ else
endif endif
nps.srcs += $(NPSDIR)/nps_main.c \ nps.srcs += $(NPSDIR)/nps_main.c \
$(NPSDIR)/nps_fdm_jsbsim.c \ $(NPSDIR)/nps_fdm_jsbsim.c \
$(NPSDIR)/nps_random.c \ $(NPSDIR)/nps_random.c \
$(NPSDIR)/nps_sensors.c \ $(NPSDIR)/nps_sensors.c \
@@ -51,7 +51,7 @@ nps.srcs += $(NPSDIR)/nps_main.c \
$(NPSDIR)/nps_radio_control.c \ $(NPSDIR)/nps_radio_control.c \
$(NPSDIR)/nps_radio_control_joystick.c \ $(NPSDIR)/nps_radio_control_joystick.c \
$(NPSDIR)/nps_radio_control_spektrum.c \ $(NPSDIR)/nps_radio_control_spektrum.c \
$(NPSDIR)/nps_autopilot_rotorcraft.c \ $(NPSDIR)/nps_autopilot_rotorcraft.c \
$(NPSDIR)/nps_ivy.c \ $(NPSDIR)/nps_ivy.c \
$(NPSDIR)/nps_flightgear.c \ $(NPSDIR)/nps_flightgear.c \
@@ -77,15 +77,15 @@ nps.srcs += mcu_periph/sys_time.c $(SRC_ARCH)/mcu_periph/sys_time_arch.c
nps.srcs += subsystems/settings.c nps.srcs += subsystems/settings.c
nps.srcs += $(SRC_ARCH)/subsystems/settings_arch.c nps.srcs += $(SRC_ARCH)/subsystems/settings_arch.c
nps.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport nps.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DDefaultPeriodic='&telemetry_Main'
nps.srcs += $(SRC_FIRMWARE)/rotorcraft_telemetry.c \ nps.srcs += $(SRC_ARCH)/ivy_transport.c
subsystems/datalink/downlink.c \ nps.srcs += subsystems/datalink/downlink.c subsystems/datalink/telemetry.c
$(SRC_ARCH)/ivy_transport.c nps.srcs += $(SRC_FIRMWARE)/rotorcraft_telemetry.c
nps.srcs += $(SRC_FIRMWARE)/datalink.c
nps.srcs += subsystems/actuators.c nps.srcs += subsystems/actuators.c
nps.srcs += subsystems/commands.c nps.srcs += subsystems/commands.c
nps.srcs += $(SRC_FIRMWARE)/datalink.c
# #
# Math functions # Math functions
sw/airborne/firmwares/rotorcraft/main.c
+1
View File
@@ -31,6 +31,7 @@
#include <inttypes.h> #include <inttypes.h>
#include "mcu.h" #include "mcu.h"
#include "mcu_periph/sys_time.h" #include "mcu_periph/sys_time.h"
#include "mcu_periph/i2c.h"
#include "led.h" #include "led.h"
#include "subsystems/datalink/telemetry.h" #include "subsystems/datalink/telemetry.h"