update test_servos after moving actuators_pwm

This commit is contained in:
Felix Ruess
2012-09-20 09:39:34 +02:00
parent b823b9d4c2
commit 2e87994d49
3 changed files with 27 additions and 10 deletions
+5 -7
View File
@@ -137,11 +137,11 @@ test_servos.ARCHDIR = $(ARCH)
test_servos.CFLAGS = $(COMMON_TEST_CFLAGS)
test_servos.srcs = $(COMMON_TEST_SRCS)
test_servos.CFLAGS += -I$(SRC_FIRMWARE)/actuators/arch/$(ARCH) -I$(SRC_LISA)
test_servos.CFLAGS += -I$(SRC_LISA)
test_servos.LDFLAGS += -lm
test_servos.srcs += $(SRC_LISA)/test_servos.c
test_servos.srcs += $(SRC_FIRMWARE)/actuators/actuators_pwm.c
test_servos.srcs += $(SRC_FIRMWARE)/actuators/arch/$(ARCH)/actuators_pwm_arch.c
test_servos.srcs += subsystems/actuators/actuators_pwm.c
test_servos.srcs += $(SRC_ARCH)/subsystems/actuators/actuators_pwm_arch.c
ifeq ($(BOARD), lisa_m)
test_servos.CFLAGS += -DUSE_SERVOS_7AND8
endif
@@ -562,10 +562,8 @@ test_actuators_asctecv1.srcs += mcu_periph/i2c.c $(SRC_ARCH)/mcu_periph/i2c_ar
#
#test_manual.srcs += test/test_manual.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
#test_manual.srcs += $(SRC_FIRMWARE)/actuators/arch/$(ARCH)/actuators_pwm_arch.c
#test_manual.srcs += $(SRC_FIRMWARE)/actuators/actuators_heli.c
##test_manual.srcs += subsystems/actuators/actuators_pwm.c
#test_manual.srcs += $(SRC_ARCH)/subsystems/actuators/actuators_pwm_arch.c
#
#test_manual.CFLAGS += -DRADIO_CONTROL
#ifneq ($(RADIO_CONTROL_LED),none)
+1 -3
View File
@@ -1,6 +1,4 @@
/*
* $Id$
*
* Copyright (C) 2010 Antoine Drouin <poinix@gmail.com>
*
* This file is part of paparazzi.
@@ -25,7 +23,7 @@
#include "mcu.h"
#include "mcu_periph/sys_time.h"
#include "firmwares/rotorcraft/actuators/actuators_pwm.h"
#include "subsystems/actuators/actuators_pwm.h"
#include "led.h"
static inline void main_init( void );
@@ -1,3 +1,24 @@
/*
* Copyright (C) 2010 The Paparazzi Team
*
* This file is part of Paparazzi.
*
* Paparazzi is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
*
* Paparazzi is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Paparazzi; see the file COPYING. If not, write to
* the Free Software Foundation, 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#include "actuators_pwm.h"
int32_t actuators_pwm_values[ACTUATORS_PWM_NB];