[paparazzi-commits] [5572] more test programs

[antoine drouin]

Revision: 5572
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5572
Author:   poine
Date:     2010-08-22 18:14:54 +0000 (Sun, 22 Aug 2010)
Log Message:
-----------
more test programs

Modified Paths:
--------------
    paparazzi3/trunk/conf/autopilot/booz_test_progs.makefile
    paparazzi3/trunk/conf/autopilot/lisa_l_test_progs.makefile
    paparazzi3/trunk/conf/autopilot/rotorcraft.makefile
    paparazzi3/trunk/sw/airborne/arm7/sys_time_hw.h
    paparazzi3/trunk/sw/airborne/boards/booz/test_baro.c
    paparazzi3/trunk/sw/airborne/booz/imu/booz_imu_b2.h
    paparazzi3/trunk/sw/airborne/test/test_telemetry.c

Modified: paparazzi3/trunk/conf/autopilot/booz_test_progs.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/booz_test_progs.makefile    2010-08-22 
18:12:49 UTC (rev 5571)
+++ paparazzi3/trunk/conf/autopilot/booz_test_progs.makefile    2010-08-22 
18:14:54 UTC (rev 5572)
@@ -1,3 +1,26 @@
+# Hey Emacs, this is a -*- makefile -*-
+#
+# $Id$
+# 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. 
+#
+#
 
 
################################################################################
 #
@@ -36,9 +59,9 @@
 # test_telemetry : Sends ALIVE telemetry messages
 #
 # used configuration
-#   TIME_LED   :
-#   MODEM_PORT :
-#   MODEM_BAUD :
+#   SYS_TIME_LED   :
+#   MODEM_PORT     :
+#   MODEM_BAUD     :
 #
 test_telemetry.ARCHDIR   = $(ARCHI)
 test_telemetry.ARCH      = arm7tdmi
@@ -50,8 +73,8 @@
                         $(SRC_ARCH)/armVIC.c
 test_telemetry.CFLAGS += -DUSE_LED
 test_telemetry.CFLAGS += -DUSE_SYS_TIME
-test_telemetry.CFLAGS += -DPERIODIC_TASK_PERIOD='SYS_TICS_OF_SEC((1./10.))'
-test_telemetry.CFLAGS += -DSYS_TIME_LED=$(TIME_LED)
+test_telemetry.CFLAGS += -DPERIODIC_TASK_PERIOD='SYS_TICS_OF_SEC((1./512.))'
+test_telemetry.CFLAGS += -DSYS_TIME_LED=$(SYS_TIME_LED)
 test_telemetry.srcs   += sys_time.c $(SRC_ARCH)/sys_time_hw.c
 test_telemetry.CFLAGS += -DUSE_$(MODEM_PORT)
 test_telemetry.CFLAGS += -D$(MODEM_PORT)_BAUD=$(MODEM_BAUD)
@@ -75,7 +98,7 @@
 test_baro.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_baro.CFLAGS += -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -I$(SRC_ARCH) 
-I$(SRC_BOARD)
 test_baro.CFLAGS += -DPERIPHERALS_AUTO_INIT
-test_baro.srcs    = $(SRC_BOARD)/test_baro.c             \
+test_baro.srcs    = $(SRC_BOARD)/test_baro.c \
                     $(SRC_ARCH)/armVIC.c
 test_baro.CFLAGS += -DUSE_LED
 test_baro.CFLAGS += -DUSE_SYS_TIME
@@ -94,4 +117,17 @@
                   $(SRC_BOOZ_ARCH)/booz2_analog_hw.c
 # tell me why this shit needs to know battery !!!!
 test_baro.CFLAGS += -DBOOZ2_ANALOG_BATTERY_PERIOD='SYS_TICS_OF_SEC((1./10.))'
-test_baro.srcs += $(SRC_BOOZ)/booz2_battery.c
\ No newline at end of file
+test_baro.srcs += $(SRC_BOOZ)/booz2_battery.c
+
+
+#
+# test_spektrum :
+#
+# TODO
+# 
+# 
+# 
+#
+
+
+

Modified: paparazzi3/trunk/conf/autopilot/lisa_l_test_progs.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/lisa_l_test_progs.makefile  2010-08-22 
18:12:49 UTC (rev 5571)
+++ paparazzi3/trunk/conf/autopilot/lisa_l_test_progs.makefile  2010-08-22 
18:14:54 UTC (rev 5572)
@@ -1,6 +1,6 @@
 # Hey Emacs, this is a -*- makefile -*-
 #
-# $Id: lisa_test_progs.makefile 5420 2010-08-17 14:05:21Z poine $
+# $Id$
 # Copyright (C) 2010 The Paparazzi Team
 #
 # This file is part of Paparazzi.
@@ -49,7 +49,6 @@
 
 BOARD_CFG=\"boards/lisa_l_1.0.h\"
 
-
 #
 # default configuration expected from the board files
 #

Modified: paparazzi3/trunk/conf/autopilot/rotorcraft.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/rotorcraft.makefile 2010-08-22 18:12:49 UTC 
(rev 5571)
+++ paparazzi3/trunk/conf/autopilot/rotorcraft.makefile 2010-08-22 18:14:54 UTC 
(rev 5572)
@@ -82,7 +82,7 @@
 ap.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c
 ap.CFLAGS += -DPERIODIC_TASK_PERIOD='SYS_TICS_OF_SEC((1./512.))'
 ifeq ($(ARCHI), stm32) 
-ap.CFLAGS += -DSYS_TIME_LED=1
+ap.CFLAGS += -DSYS_TIME_LED=(SYS_TIME_LED)
 endif
 
 #

Modified: paparazzi3/trunk/sw/airborne/arm7/sys_time_hw.h
===================================================================
--- paparazzi3/trunk/sw/airborne/arm7/sys_time_hw.h     2010-08-22 18:12:49 UTC 
(rev 5571)
+++ paparazzi3/trunk/sw/airborne/arm7/sys_time_hw.h     2010-08-22 18:14:54 UTC 
(rev 5572)
@@ -152,6 +152,9 @@
 #ifdef TIME_LED
       LED_TOGGLE(TIME_LED)
 #endif
+#ifdef SYS_TIME_LED
+      LED_TOGGLE(SYS_TIME_LED)
+#endif
     }
     return TRUE;
   }

Modified: paparazzi3/trunk/sw/airborne/boards/booz/test_baro.c
===================================================================
--- paparazzi3/trunk/sw/airborne/boards/booz/test_baro.c        2010-08-22 
18:12:49 UTC (rev 5571)
+++ paparazzi3/trunk/sw/airborne/boards/booz/test_baro.c        2010-08-22 
18:14:54 UTC (rev 5572)
@@ -30,12 +30,11 @@
 #include BOARD_CONFIG
 
 #include "init_hw.h"
+#include "interrupt_hw.h"
+
 #include "sys_time.h"
-
 #include "downlink.h"
-
 #include "rotorcraft/baro.h"
-//#include "my_debug_servo.h"
 
 static inline void main_init( void );
 static inline void main_periodic_task( void );
@@ -60,7 +59,9 @@
 static inline void main_init( void ) {
   hw_init();
   sys_time_init();
+  booz2_analog_init();
   baro_init();
+  int_enable();
 }
 
 
@@ -68,8 +69,9 @@
 static inline void main_periodic_task( void ) {
   
   RunOnceEvery(2, {baro_periodic();});
+  RunOnceEvery(256, {DOWNLINK_SEND_ALIVE(DefaultChannel, 16, MD5SUM);});
   LED_PERIODIC();
-  RunOnceEvery(256, {DOWNLINK_SEND_ALIVE(DefaultChannel, 16, MD5SUM);});
+
 }
 
 
@@ -79,7 +81,6 @@
 }
 
 
-
 static inline void main_on_baro_diff(void) {
 
 }

Modified: paparazzi3/trunk/sw/airborne/booz/imu/booz_imu_b2.h
===================================================================
--- paparazzi3/trunk/sw/airborne/booz/imu/booz_imu_b2.h 2010-08-22 18:12:49 UTC 
(rev 5571)
+++ paparazzi3/trunk/sw/airborne/booz/imu/booz_imu_b2.h 2010-08-22 18:14:54 UTC 
(rev 5572)
@@ -43,9 +43,9 @@
 #define IMU_GYRO_R_CHAN  2
 #endif
 #if !defined IMU_ACCEL_X_CHAN & !defined IMU_ACCEL_Y_CHAN & !defined 
IMU_ACCEL_Z_CHAN
-#define IMU_ACCEL_X_CHAN 5
-#define IMU_ACCEL_Y_CHAN 3
-#define IMU_ACCEL_Z_CHAN 4
+#define IMU_ACCEL_X_CHAN 3
+#define IMU_ACCEL_Y_CHAN 5
+#define IMU_ACCEL_Z_CHAN 6
 #endif
 #if !defined IMU_MAG_X_CHAN & !defined IMU_MAG_Y_CHAN & !defined IMU_MAG_Z_CHAN
 #define IMU_MAG_X_CHAN   0

Modified: paparazzi3/trunk/sw/airborne/test/test_telemetry.c
===================================================================
--- paparazzi3/trunk/sw/airborne/test/test_telemetry.c  2010-08-22 18:12:49 UTC 
(rev 5571)
+++ paparazzi3/trunk/sw/airborne/test/test_telemetry.c  2010-08-22 18:14:54 UTC 
(rev 5572)
@@ -23,6 +23,7 @@
 
 #include BOARD_CONFIG
 #include "init_hw.h"
+#include "interrupt_hw.h"
 #include "sys_time.h"
 #include "downlink.h"
 static inline void main_init( void );
@@ -42,6 +43,7 @@
 static inline void main_init( void ) {
   hw_init();
   sys_time_init();
+  int_enable();
 }
 
 static inline void main_periodic( void ) {