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

moved booz2_commands files to firmware/rotorcraft

Browse Source
This commit is contained in:
Felix Ruess
2010-12-28 00:16:44 +01:00
parent 5fce185812
commit d59b8494c0
18 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/airframes/Poine/beth.xml
+1 -1
View File
@@ -142,7 +142,7 @@ main_stm32.srcs += subsystems/imu.c \
arch/$(ARCH)/subsystems/imu/imu_crista_arch.c
main_stm32.CFLAGS += -DUSE_DMA1_C4_IRQ
main_stm32.srcs += $(SRC_BOOZ)/booz2_commands.c
main_stm32.srcs += $(SRC_FIRMWARE)/commands.c
main_stm32.srcs += firmwares/rotorcraft/actuators/actuators_asctec.c
#\
# $(SRC_BOOZ_ARCH)/actuators/actuators_asctec_arch.c
conf/autopilot/lisa_l_test_progs.makefile
+3 -3
View File
@@ -594,7 +594,7 @@ test_actuators_mkk.srcs += $(SRC_ARCH)/mcu_periph/uart_arch.c
test_actuators_mkk.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart2
test_actuators_mkk.srcs += downlink.c pprz_transport.c
test_actuators_mkk.srcs += $(SRC_BOOZ)/booz2_commands.c
test_actuators_mkk.srcs += $(SRC_FIRMWARE)/commands.c
test_actuators_mkk.srcs += $(SRC_FIRMWARE)/actuators/actuators_mkk.c
test_actuators_mkk.CFLAGS += -DACTUATORS_MKK_DEVICE=i2c1
test_actuators_mkk.srcs += $(SRC_FIRMWARE)/actuators/supervision.c
@@ -626,7 +626,7 @@ test_actuators_asctecv1.srcs += $(SRC_ARCH)/mcu_periph/uart_arch.c
test_actuators_asctecv1.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart2
test_actuators_asctecv1.srcs += downlink.c pprz_transport.c
test_actuators_asctecv1.srcs += $(SRC_BOOZ)/booz2_commands.c
test_actuators_asctecv1.srcs += $(SRC_FIRMWARE)/commands.c
test_actuators_asctecv1.CFLAGS += -DACTUATORS_ASCTEC_DEVICE=i2c1
test_actuators_asctecv1.srcs += $(SRC_FIRMWARE)/actuators/actuators_asctec.c
test_actuators_asctecv1.CFLAGS += -DUSE_I2C1
@@ -686,7 +686,7 @@ test_manual.srcs += $(SRC_ARCH)/mcu_periph/uart_arch.c
test_manual.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=$(MODEM_PORT)
test_manual.srcs += downlink.c pprz_transport.c
test_manual.srcs += $(SRC_BOOZ)/booz2_commands.c
test_manual.srcs += $(SRC_FIRMWARE)/commands.c
test_manual.CFLAGS += -I$(SRC_FIRMWARE)/actuators/arch/$(ARCH)
#test_manual.srcs += $(SRC_FIRMWARE)/actuators/actuators_pwm.c
conf/autopilot/lisa_passthrough.makefile
+1 -1
View File
@@ -61,7 +61,7 @@ stm_passthrough.srcs += $(SRC_LISA)/lisa_overo_link.c \
stm_passthrough.srcs += math/pprz_trig_int.c
stm_passthrough.srcs += lisa/plug_sys.c
stm_passthrough.srcs += $(SRC_BOOZ)/booz2_commands.c
stm_passthrough.srcs += $(SRC_FIRMWARE)/commands.c
# Radio control
#
conf/autopilot/obsolete/booz_test_progs.makefile
+1 -1
View File
@@ -197,7 +197,7 @@ test_actuators_mkk.srcs += $(SRC_ARCH)/uart_hw.c
test_actuators_mkk.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=$(MODEM_PORT)
test_actuators_mkk.srcs += downlink.c pprz_transport.c
test_actuators_mkk.srcs += $(SRC_BOOZ)/booz2_commands.c
test_actuators_mkk.srcs += $(SRC_FIRMWARE)/commands.c
test_actuators_mkk.srcs += $(SRC_FIRMWARE)/actuators/actuators_mkk.c
test_actuators_mkk.CFLAGS += -DACTUATORS_MKK_DEVICE=i2c0
test_actuators_mkk.srcs += $(SRC_FIRMWARE)/actuators/supervision.c
conf/autopilot/obsolete/lisa_test_progs.makefile
+3 -3
View File
@@ -607,7 +607,7 @@ test_actuators_mkk.srcs += $(SRC_ARCH)/uart_hw.c
test_actuators_mkk.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart2
test_actuators_mkk.srcs += downlink.c pprz_transport.c
test_actuators_mkk.srcs += $(SRC_BOOZ)/booz2_commands.c
test_actuators_mkk.srcs += $(SRC_FIRMWARE)/commands.c
test_actuators_mkk.srcs += $(SRC_FIRMWARE)/actuators/actuators_mkk.c
test_actuators_mkk.CFLAGS += -DACTUATORS_MKK_DEVICE=i2c1 -DUSE_TIM2_IRQ
#test_actuators_mkk.CFLAGS += -DACTUATORS_ASCTEC_V2_PROTOCOL -DACTUATORS_ASCTEC_DEVICE=i2c1
@@ -640,7 +640,7 @@ test_actuators_asctec.srcs += $(SRC_ARCH)/uart_hw.c
test_actuators_asctec.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart2
test_actuators_asctec.srcs += downlink.c pprz_transport.c
test_actuators_asctec.srcs += $(SRC_BOOZ)/booz2_commands.c
test_actuators_asctec.srcs += $(SRC_FIRMWARE)/commands.c
test_actuators_asctec.srcs += $(SRC_FIRMWARE)/actuators/actuators_asctec.c
test_actuators_asctec.CFLAGS += -DACTUATORS_ASCTEC_DEVICE=i2c1
# -DBOOZ_START_DELAY=3
@@ -1100,7 +1100,7 @@ ptw.srcs += peripherals/max1168.c $(SRC_ARCH)/peripherals/max1168_arch.c
ptw.srcs += peripherals/ms2001.c $(SRC_ARCH)/peripherals/ms2001_arch.c
ptw.srcs += math/pprz_trig_int.c
ptw.srcs += $(SRC_BOOZ)/booz2_commands.c
ptw.srcs += $(SRC_FIRMWARE)/commands.c
# Radio control
ptw.CFLAGS += -DRADIO_CONTROL
conf/autopilot/rotorcraft.makefile
+1 -1
View File
@@ -108,7 +108,7 @@ ap.CFLAGS += -D$(MODEM_PORT)_VIC_SLOT=6
endif
ap.srcs += $(SRC_BOOZ)/booz2_commands.c
ap.srcs += $(SRC_FIRMWARE)/commands.c
#
# Radio control choice
conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
+1 -1
View File
@@ -79,7 +79,7 @@ sim.srcs += $(SRC_FIRMWARE)/telemetry.c \
downlink.c \
$(SRC_ARCH)/ivy_transport.c
sim.srcs += $(SRC_BOOZ)/booz2_commands.c
sim.srcs += $(SRC_FIRMWARE)/commands.c
sim.srcs += $(SRC_FIRMWARE)/datalink.c
sw/airborne/firmwares/beth/main_stm32.c
+1 -1
View File
@@ -28,7 +28,7 @@
#include "mcu_periph/can.h"
#include "sys_time.h"
#include "downlink.h"
#include "booz/booz2_commands.h"
#include "firmwares/rotorcraft/commands.h"
#include "firmwares/rotorcraft/actuators.h"
//#include "booz/booz_radio_control.h"
#include "subsystems/imu.h"
sw/airborne/firmwares/rotorcraft/actuators/actuators_asctec.c
+1 -1
View File
@@ -5,7 +5,7 @@
#include "firmwares/rotorcraft/actuators/supervision.h"
#endif
#include "booz/booz2_commands.h"
#include "firmwares/rotorcraft/commands.h"
#include "mcu_periph/i2c.h"
#include "sys_time.h"
sw/airborne/firmwares/rotorcraft/actuators/actuators_heli.c
+1 -1
View File
@@ -23,7 +23,7 @@
#include "firmwares/rotorcraft/actuators.h"
#include "actuators_heli.h"
#include "booz/booz2_commands.h"
#include "firmwares/rotorcraft/commands.h"
/* let's start butchery now and use the actuators_pwm arch functions */
#include "firmwares/rotorcraft/actuators/actuators_pwm.h"
sw/airborne/firmwares/rotorcraft/actuators/actuators_mkk.c
+1 -1
View File
@@ -24,7 +24,7 @@
#include "firmwares/rotorcraft/actuators.h"
#include "firmwares/rotorcraft/actuators/actuators_mkk.h"
#include "booz/booz2_commands.h"
#include "firmwares/rotorcraft/commands.h"
#include "mcu_periph/i2c.h"
#include "sys_time.h"
sw/airborne/firmwares/rotorcraft/autopilot.c
+1 -1
View File
@@ -25,7 +25,7 @@
#include "firmwares/rotorcraft/autopilot.h"
#include "subsystems/radio_control.h"
#include "booz2_commands.h"
#include "firmwares/rotorcraft/commands.h"
#include "firmwares/rotorcraft/navigation.h"
#include "firmwares/rotorcraft/guidance.h"
#include "firmwares/rotorcraft/stabilization.h"
sw/airborne/booz/booz2_commands.c → sw/airborne/firmwares/rotorcraft/commands.c
+1 -1
View File
@@ -20,7 +20,7 @@
* Boston, MA 02111-1307, USA.
*/
#include "booz2_commands.h"
#include "firmwares/rotorcraft/commands.h"
int32_t booz2_commands[COMMANDS_NB];
const int32_t booz2_commands_failsafe[COMMANDS_NB] = COMMANDS_FAILSAFE;
sw/airborne/booz/booz2_commands.h → sw/airborne/firmwares/rotorcraft/commands.h
+3 -3
View File
@@ -21,8 +21,8 @@
*
*/
#ifndef BOOZ2_COMMANDS_H
#define BOOZ2_COMMANDS_H
#ifndef COMMANDS_H
#define COMMANDS_H
#include "paparazzi.h"
#include "generated/airframe.h"
@@ -37,4 +37,4 @@ extern const int32_t booz2_commands_failsafe[COMMANDS_NB];
booz2_commands[COMMAND_THRUST] = (_motors_on) ? _in_cmd[COMMAND_THRUST] : 0; \
}
#endif /* BOOZ2_COMMANDS_H */
#endif /* COMMANDS_H */
sw/airborne/firmwares/rotorcraft/main.c
+1 -1
View File
@@ -33,7 +33,7 @@
#include "firmwares/rotorcraft/telemetry.h"
#include "datalink.h"
#include "booz2_commands.h"
#include "firmwares/rotorcraft/commands.h"
#include "firmwares/rotorcraft/actuators.h"
#include "subsystems/radio_control.h"
sw/airborne/lisa/lisa_stm_passthrough_main.c
+1 -1
View File
@@ -26,7 +26,7 @@
#include "mcu_periph/uart.h"
#include "sys_time.h"
#include "downlink.h"
#include "booz/booz2_commands.h"
#include "firmwares/rotorcraft/commands.h"
#include "actuators.h"
#include "actuators/actuators_pwm.h"
#include "subsystems/imu.h"
sw/airborne/lisa/test/lisa_test_actuators_mkk.c
+1 -1
View File
@@ -24,7 +24,7 @@
#include "init_hw.h"
#include "sys_time.h"
#include "booz2_commands.h"
#include "firmwares/rotorcraft/commands.h"
#include "actuators.h"
#include "downlink.h"
sw/airborne/test/test_actuators.c
+1 -1
View File
@@ -27,7 +27,7 @@
#include "led.h"
#include "mcu_periph/i2c.h"
#include "booz/booz2_commands.h"
#include "firmwares/rotorcraft/commands.h"
#include "firmwares/rotorcraft/actuators.h"
static inline void main_init( void );