Fixed sync bit in spektrum serial decoder for Joby spektrum receiver. Updated lisa_asctec.xml airframe config file to point at new radio control makefile, which points at new spektrum serial decoder header file.

This commit is contained in:
Greg Horn
2010-06-17 22:25:49 +00:00
parent dd599a1dc4
commit 84fd899412
3 changed files with 72 additions and 1 deletions
+1 -1
View File
@@ -189,7 +189,7 @@ ap.CFLAGS += -DMODEM_BAUD=B57600
include $(PAPARAZZI_SRC)/conf/autopilot/booz2_common.makefile
include $(CFG_BOOZ)/booz2_autopilot.makefile
include $(CFG_BOOZ)/subsystems/booz2_radio_control_spektrum.makefile
include $(CFG_BOOZ)/subsystems/booz2_radio_control_spektrum_joby.makefile
include $(CFG_BOOZ)/subsystems/booz2_actuators_asctec_v2.makefile
include $(CFG_BOOZ)/subsystems/booz2_imu_b2v1_1.makefile
#include $(CFG_BOOZ)/subsystems/booz2_gps.makefile
@@ -0,0 +1,19 @@
#
# Autopilot
#
ap.CFLAGS += -DUSE_RADIO_CONTROL
ap.CFLAGS += -DRADIO_CONTROL_TYPE_H=\"radio_control/booz_radio_control_spektrum.h\"
ap.CFLAGS += -DRADIO_CONTROL_SPEKTRUM_MODEL_H=\"radio_control/booz_radio_control_spektrum_dx7se_joby.h\"
ap.srcs += $(SRC_BOOZ)/booz_radio_control.c \
$(SRC_BOOZ)/radio_control/booz_radio_control_spektrum.c
ifeq ($(ARCHI), arm7)
ap.CFLAGS += -DRADIO_CONTROL_LED=1
ap.CFLAGS += -DUSE_UART0 -DUART0_BAUD=B115200
ap.CFLAGS += -DRADIO_CONTROL_LINK=Uart0
else ifeq ($(ARCHI), stm32)
ap.CFLAGS += -DRADIO_CONTROL_LED=4
ap.CFLAGS += -DUSE_UART3 -DUART3_BAUD=B115200
ap.CFLAGS += -DRADIO_CONTROL_LINK=Uart3
endif
@@ -0,0 +1,52 @@
/*
* $Id$
*
* Copyright (C) 2008-2009 Antoine Drouin <poinix@gmail.com>
*
* 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.
*/
#ifndef BOOZ_RADIO_CONTROL_SPEKTRUM_DX7SE_H
#define BOOZ_RADIO_CONTROL_SPEKTRUM_DX7SE_H
#define RADIO_CONTROL_NB_CHANNEL 7
#define RADIO_CONTROL_ROLL 0
#define RADIO_CONTROL_THROTTLE 1
#define RADIO_CONTROL_PITCH 2
#define RADIO_CONTROL_YAW 3
#define RADIO_CONTROL_MODE 5
#define RC_SPK_SYNC_2 0x01
#define RC_SPK_THROWS { MAX_PPRZ/MAX_SPK, \
MAX_PPRZ/MAX_SPK, \
-MAX_PPRZ/MAX_SPK, \
MAX_PPRZ/MAX_SPK, \
MAX_PPRZ/MAX_SPK, \
-MAX_PPRZ/MAX_SPK, \
MAX_PPRZ/MAX_SPK }
/*
aileron 1
elevator 2
rudder 3
gear 4
throttle 5
*/
#endif /* BOOZ_RADIO_CONTROL_SPEKTRUM_DX7SE_H */