Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-06 16:58:48 +08:00
Code Issues Actions 27 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'paparazzi/telemetry' into telemetry

Browse Source 
Conflicts:
	conf/firmwares/subsystems/fixedwing/autopilot.makefile
	conf/firmwares/subsystems/rotorcraft/fdm_jsbsim.makefile
This commit is contained in:
Gautier Hattenberger
2013-09-25 13:40:35 +02:00
parent cce8b99e4b 52e86ec5dc
commit 8de915bbf2
6 changed files with 17 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 += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=$(MODEM_PORT)
COMMON_TELEMETRY_CFLAGS += -DDefaultPeriodic='&telemetry_Main'
COMMON_TELEMETRY_SRCS = mcu_periph/uart.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
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_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/telemetry.c
ifneq ($(SYS_TIME_LED),none)
setup_actuators.CFLAGS += -DSYS_TIME_LED=$(SYS_TIME_LED)
endif
conf/firmwares/subsystems/fixedwing/autopilot.makefile
+6 -2
View File
@@ -80,6 +80,11 @@ $(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
######################################################################
##
## COMMON FOR ALL NON-SIMULATION TARGETS
@@ -102,7 +107,6 @@ endif
# Main
#
ns_srcs += $(SRC_FIRMWARE)/main.c
ns_srcs += subsystems/datalink/telemetry.c
#
# LEDs
@@ -234,7 +238,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
jsbsim.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DDefaultPeriodic='&telemetry_Ap'
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
conf/firmwares/subsystems/rotorcraft/fdm_jsbsim.makefile
+5 -5
View File
@@ -78,15 +78,15 @@ nps.srcs += mcu_periph/sys_time.c $(SRC_ARCH)/mcu_periph/sys_time_arch.c
nps.srcs += subsystems/settings.c
nps.srcs += $(SRC_ARCH)/subsystems/settings_arch.c
nps.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport
nps.srcs += $(SRC_FIRMWARE)/rotorcraft_telemetry.c \
subsystems/datalink/downlink.c \
$(SRC_ARCH)/ivy_transport.c
nps.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DDefaultPeriodic='&telemetry_Main'
nps.srcs += $(SRC_ARCH)/ivy_transport.c
nps.srcs += subsystems/datalink/downlink.c subsystems/datalink/telemetry.c
nps.srcs += $(SRC_FIRMWARE)/rotorcraft_telemetry.c
nps.srcs += $(SRC_FIRMWARE)/datalink.c
nps.srcs += subsystems/actuators.c
nps.srcs += subsystems/commands.c
nps.srcs += $(SRC_FIRMWARE)/datalink.c
#
# Math functions
sw/airborne/boards/krooz/imu_krooz.c
-4
View File
@@ -40,10 +40,6 @@
#include "messages.h"
#include "subsystems/datalink/downlink.h"
#ifndef DOWNLINK_DEVICE
#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
#endif
#if !defined KROOZ_LOWPASS_FILTER && !defined KROOZ_SMPLRT_DIV
#define KROOZ_LOWPASS_FILTER MPU60X0_DLPF_256HZ
#define KROOZ_SMPLRT_DIV 1
sw/airborne/firmwares/rotorcraft/main.c
+1
View File
@@ -31,6 +31,7 @@
#include <inttypes.h>
#include "mcu.h"
#include "mcu_periph/sys_time.h"
#include "mcu_periph/i2c.h"
#include "led.h"
#include "subsystems/datalink/telemetry.h"