[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[paparazzi-commits] [6251] replace USE_RADIO_CONTROL with RADIO_CONTROL
|
From: |
Felix Ruess |
|
Subject: |
[paparazzi-commits] [6251] replace USE_RADIO_CONTROL with RADIO_CONTROL |
|
Date: |
Mon, 25 Oct 2010 21:58:47 +0000 |
Revision: 6251
http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=6251
Author: flixr
Date: 2010-10-25 21:58:47 +0000 (Mon, 25 Oct 2010)
Log Message:
-----------
replace USE_RADIO_CONTROL with RADIO_CONTROL
Modified Paths:
--------------
paparazzi3/trunk/conf/autopilot/booz2_test_progs.makefile
paparazzi3/trunk/conf/autopilot/lisa_l_test_progs.makefile
paparazzi3/trunk/conf/autopilot/obsolete/lisa_test_progs.makefile
paparazzi3/trunk/conf/autopilot/subsystems/booz2_radio_control_dummy.makefile
paparazzi3/trunk/conf/autopilot/subsystems/lisa_passthrough/radio_control_joby.makefile
paparazzi3/trunk/conf/autopilot/subsystems/lisa_passthrough/radio_control_spektrum.makefile
paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/radio_control_spektrum.makefile
paparazzi3/trunk/sw/airborne/arch/lpc21/init_hw.h
paparazzi3/trunk/sw/airborne/arch/lpc21/sys_time_hw.c
paparazzi3/trunk/sw/airborne/arch/stm32/init_hw.h
paparazzi3/trunk/sw/airborne/csc/csc_telemetry.h
paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/telemetry.h
Modified: paparazzi3/trunk/conf/autopilot/booz2_test_progs.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/booz2_test_progs.makefile 2010-10-25
21:58:39 UTC (rev 6250)
+++ paparazzi3/trunk/conf/autopilot/booz2_test_progs.makefile 2010-10-25
21:58:47 UTC (rev 6251)
@@ -326,7 +326,7 @@
test_rc_spektrum.srcs += $(SRC_ARCH)/lpcusb/usbhw_lpc.c
$(SRC_ARCH)/lpcusb/usbcontrol.c
test_rc_spektrum.srcs += $(SRC_ARCH)/lpcusb/usbstdreq.c
$(SRC_ARCH)/lpcusb/usbinit.c
-test_rc_spektrum.CFLAGS += -DUSE_RADIO_CONTROL -DRADIO_CONTROL_LED=1
+test_rc_spektrum.CFLAGS += -DRADIO_CONTROL -DRADIO_CONTROL_LED=1
test_rc_spektrum.CFLAGS +=
-DRADIO_CONTROL_TYPE_H=\"booz_radio_control_spektrum.h\"
test_rc_spektrum.CFLAGS +=
-DRADIO_CONTROL_SPEKTRUM_MODEL_H=\"booz_radio_control_spektrum_dx7se.h\"
test_rc_spektrum.CFLAGS += -DUSE_UART0 -DUART0_BAUD=B115200
@@ -358,7 +358,7 @@
test_rc_ppm.srcs += $(SRC_ARCH)/lpcusb/usbhw_lpc.c
$(SRC_ARCH)/lpcusb/usbcontrol.c
test_rc_ppm.srcs += $(SRC_ARCH)/lpcusb/usbstdreq.c $(SRC_ARCH)/lpcusb/usbinit.c
-test_rc_ppm.CFLAGS += -DUSE_RADIO_CONTROL -DRADIO_CONTROL_LED=1
+test_rc_ppm.CFLAGS += -DRADIO_CONTROL -DRADIO_CONTROL_LED=1
test_rc_ppm.CFLAGS += -DRADIO_CONTROL_TYPE_H=\"booz_radio_control_ppm.h\"
test_rc_ppm.CFLAGS += -DRADIO_CONTROL_TYPE_PPM
test_rc_ppm.srcs += $(SRC_SUBSYSTEMS)/radio_control.c \
Modified: paparazzi3/trunk/conf/autopilot/lisa_l_test_progs.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/lisa_l_test_progs.makefile 2010-10-25
21:58:39 UTC (rev 6250)
+++ paparazzi3/trunk/conf/autopilot/lisa_l_test_progs.makefile 2010-10-25
21:58:47 UTC (rev 6251)
@@ -196,7 +196,7 @@
test_rc_spektrum.srcs += $(SRC_ARCH)/uart_hw.c
test_rc_spektrum.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport
-DDOWNLINK_DEVICE=$(MODEM_PORT)
test_rc_spektrum.srcs += downlink.c pprz_transport.c
-test_rc_spektrum.CFLAGS += -DUSE_RADIO_CONTROL
+test_rc_spektrum.CFLAGS += -DRADIO_CONTROL
ifdef RADIO_CONTROL_LED
test_rc_spektrum.CFLAGS += -DRADIO_CONTROL_LED=$(RADIO_CONTROL_LED)
endif
@@ -237,7 +237,7 @@
test_rc_ppm.srcs += $(SRC_ARCH)/uart_hw.c
test_rc_ppm.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport
-DDOWNLINK_DEVICE=$(MODEM_PORT)
test_rc_ppm.srcs += downlink.c pprz_transport.c
-test_rc_ppm.CFLAGS += -DUSE_RADIO_CONTROL
+test_rc_ppm.CFLAGS += -DRADIO_CONTROL
test_rc_ppm.CFLAGS += -DRADIO_CONTROL_LED=$(RADIO_CONTROL_LED)
test_rc_ppm.CFLAGS += -DRADIO_CONTROL_TYPE_H=\"subsystems/radio_control/ppm.h\"
test_rc_ppm.CFLAGS += -DRADIO_CONTROL_TYPE_PPM
@@ -650,7 +650,7 @@
test_manual.CFLAGS += -I$(SRC_BOOZ) -I$(SRC_BOOZ)/arch/$(ARCH)
-test_manual.CFLAGS += -DUSE_RADIO_CONTROL
+test_manual.CFLAGS += -DRADIO_CONTROL
ifdef RADIO_CONTROL_LED
test_manual.CFLAGS += -DRADIO_CONTROL_LED=$(RADIO_CONTROL_LED)
endif
Modified: paparazzi3/trunk/conf/autopilot/obsolete/lisa_test_progs.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/obsolete/lisa_test_progs.makefile
2010-10-25 21:58:39 UTC (rev 6250)
+++ paparazzi3/trunk/conf/autopilot/obsolete/lisa_test_progs.makefile
2010-10-25 21:58:47 UTC (rev 6251)
@@ -356,7 +356,7 @@
test_rc_24.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport
-DDOWNLINK_DEVICE=Uart2
test_rc_24.srcs += downlink.c pprz_transport.c
-test_rc_24.CFLAGS += -DUSE_RADIO_CONTROL -DRADIO_CONTROL_LED=2
+test_rc_24.CFLAGS += -DRADIO_CONTROL -DRADIO_CONTROL_LED=2
test_rc_24.CFLAGS +=
-DRADIO_CONTROL_TYPE_H=\"subsystems/radio_control/spektrum.h\"
test_rc_24.CFLAGS +=
-DRADIO_CONTROL_SPEKTRUM_MODEL_H=\"subsystems/radio_control/spektrum_dx7se.h\"
test_rc_24.CFLAGS += -DUSE_UART3 -DUART3_BAUD=B115200
@@ -1103,7 +1103,7 @@
ptw.srcs += $(SRC_BOOZ)/booz2_commands.c
# Radio control
-ptw.CFLAGS += -DUSE_RADIO_CONTROL
+ptw.CFLAGS += -DRADIO_CONTROL
ptw.CFLAGS += -DRADIO_CONTROL_TYPE_H=\"subsystems/radio_control/spektrum.h\"
ptw.CFLAGS +=
-DRADIO_CONTROL_SPEKTRUM_MODEL_H=\"subsystems/radio_control/spektrum_dx7se.h\"
ptw.srcs += $(SRC_SUBSYSTEMS)/radio_control.c \
Modified:
paparazzi3/trunk/conf/autopilot/subsystems/booz2_radio_control_dummy.makefile
===================================================================
---
paparazzi3/trunk/conf/autopilot/subsystems/booz2_radio_control_dummy.makefile
2010-10-25 21:58:39 UTC (rev 6250)
+++
paparazzi3/trunk/conf/autopilot/subsystems/booz2_radio_control_dummy.makefile
2010-10-25 21:58:47 UTC (rev 6251)
@@ -1,3 +1,3 @@
RDYB_SRCS += $(SRC_SUBSYSTEMS)/radio_control.c
$(SRC_BOOZ)/radio_control/booz_radio_control_dummy.c
-RDYB_CFLAGS += -DUSE_RADIO_CONTROL
+RDYB_CFLAGS += -DRADIO_CONTROL
RDYB_CFLAGS +=
-DRADIO_CONTROL_TYPE_H=\"radio_control/booz_radio_control_dummy.h\"
Modified:
paparazzi3/trunk/conf/autopilot/subsystems/lisa_passthrough/radio_control_joby.makefile
===================================================================
---
paparazzi3/trunk/conf/autopilot/subsystems/lisa_passthrough/radio_control_joby.makefile
2010-10-25 21:58:39 UTC (rev 6250)
+++
paparazzi3/trunk/conf/autopilot/subsystems/lisa_passthrough/radio_control_joby.makefile
2010-10-25 21:58:47 UTC (rev 6251)
@@ -1,7 +1,7 @@
# Radio control
-stm_passthrough.CFLAGS += -DUSE_RADIO_CONTROL
+stm_passthrough.CFLAGS += -DRADIO_CONTROL
stm_passthrough.CFLAGS +=
-DRADIO_CONTROL_TYPE_H=\"radio_control/booz_radio_control_joby.h\"
stm_passthrough.CFLAGS +=
-DRADIO_CONTROL_JOBY_MODEL_H=\"radio_control/booz_radio_control_joby_9ch.h\"
stm_passthrough.srcs += $(SRC_SUBSYSTEMS)/radio_control.c \
Modified:
paparazzi3/trunk/conf/autopilot/subsystems/lisa_passthrough/radio_control_spektrum.makefile
===================================================================
---
paparazzi3/trunk/conf/autopilot/subsystems/lisa_passthrough/radio_control_spektrum.makefile
2010-10-25 21:58:39 UTC (rev 6250)
+++
paparazzi3/trunk/conf/autopilot/subsystems/lisa_passthrough/radio_control_spektrum.makefile
2010-10-25 21:58:47 UTC (rev 6251)
@@ -7,7 +7,7 @@
RADIO_CONTROL_SPEKTRUM_MODEL=\"subsystems/radio_control/spektrum_dx7se.h\"
endif
-stm_passthrough.CFLAGS += -DUSE_RADIO_CONTROL
-DRADIO_CONTROL_BIND_IMPL_FUNC=radio_control_spektrum_try_bind
+stm_passthrough.CFLAGS += -DRADIO_CONTROL
-DRADIO_CONTROL_BIND_IMPL_FUNC=radio_control_spektrum_try_bind
stm_passthrough.CFLAGS +=
-DRADIO_CONTROL_TYPE_H=\"subsystems/radio_control/spektrum.h\"
stm_passthrough.CFLAGS +=
-DRADIO_CONTROL_SPEKTRUM_MODEL_H=$(RADIO_CONTROL_SPEKTRUM_MODEL)
stm_passthrough.CFLAGS += -DRADIO_CONTROL_LED=$(RADIO_CONTROL_LED)
Modified:
paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/radio_control_spektrum.makefile
===================================================================
---
paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/radio_control_spektrum.makefile
2010-10-25 21:58:39 UTC (rev 6250)
+++
paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/radio_control_spektrum.makefile
2010-10-25 21:58:47 UTC (rev 6251)
@@ -5,7 +5,7 @@
RADIO_CONTROL_SPEKTRUM_MODEL=\"subsystems/radio_control/spektrum_dx7se.h\"
endif
-ap.CFLAGS += -DUSE_RADIO_CONTROL
-DRADIO_CONTROL_BIND_IMPL_FUNC=radio_control_spektrum_try_bind
+ap.CFLAGS += -DRADIO_CONTROL
-DRADIO_CONTROL_BIND_IMPL_FUNC=radio_control_spektrum_try_bind
ap.CFLAGS += -DRADIO_CONTROL_TYPE_H=\"subsystems/radio_control/spektrum.h\"
ifeq ($(BOARD), booz)
ap.CFLAGS += -DRADIO_CONTROL_SPEKTRUM_MODEL_H=$(RADIO_CONTROL_SPEKTRUM_MODEL)
Modified: paparazzi3/trunk/sw/airborne/arch/lpc21/init_hw.h
===================================================================
--- paparazzi3/trunk/sw/airborne/arch/lpc21/init_hw.h 2010-10-25 21:58:39 UTC
(rev 6250)
+++ paparazzi3/trunk/sw/airborne/arch/lpc21/init_hw.h 2010-10-25 21:58:47 UTC
(rev 6251)
@@ -23,7 +23,7 @@
*/
/*
- *\brief ARM7 low level hardware initialisation
+ *\brief ARM7 low level hardware initialisation
* PLL, MAM, VIC
*
*/
@@ -71,7 +71,7 @@
/* wait for PLL lock */
while (!(PLLSTAT & PLLSTAT_LOCK))
continue;
-
+
/* enable & connect PLL */
PLLCON = PLLCON_PLLE | PLLCON_PLLC;
/* commit changes */
@@ -81,15 +81,15 @@
/* setup & enable the MAM */
MAMTIM = MAMTIM_CYCLES;
MAMCR = MAMCR_FULL;
-
+
/* setup & enable the MAM */
MAMTIM = MAMTIM_CYCLES;
MAMCR = MAMCR_FULL;
-
+
/* set the peripheral bus speed */
/* value computed from config.h */
VPBDIV = VPBDIV_VALUE;
-
+
/* set the interrupt controller defaults */
//#if defined(RAM_RUN)
/* map interrupt vectors space into SRAM */
Modified: paparazzi3/trunk/sw/airborne/arch/lpc21/sys_time_hw.c
===================================================================
--- paparazzi3/trunk/sw/airborne/arch/lpc21/sys_time_hw.c 2010-10-25
21:58:39 UTC (rev 6250)
+++ paparazzi3/trunk/sw/airborne/arch/lpc21/sys_time_hw.c 2010-10-25
21:58:47 UTC (rev 6251)
@@ -19,7 +19,7 @@
#define PPM_IT 0x00
#endif
-#if defined USE_RADIO_CONTROL && defined RADIO_CONTROL_TYPE_PPM
+#if defined RADIO_CONTROL && defined RADIO_CONTROL_TYPE_PPM
#include <subsystems/radio_control/ppm.h>
#else
#define RADIO_CONTROL_PPM_IT 0x00
@@ -103,7 +103,7 @@
LED_TOGGLE(3);
}
#endif
-#if defined USE_RADIO_CONTROL && defined RADIO_CONTROL_TYPE_PPM
+#if defined RADIO_CONTROL && defined RADIO_CONTROL_TYPE_PPM
if (T0IR&RADIO_CONTROL_PPM_IT) {
RADIO_CONTROL_PPM_ISR();
T0IR = RADIO_CONTROL_PPM_IT;
Modified: paparazzi3/trunk/sw/airborne/arch/stm32/init_hw.h
===================================================================
--- paparazzi3/trunk/sw/airborne/arch/stm32/init_hw.h 2010-10-25 21:58:39 UTC
(rev 6250)
+++ paparazzi3/trunk/sw/airborne/arch/stm32/init_hw.h 2010-10-25 21:58:47 UTC
(rev 6251)
@@ -22,7 +22,7 @@
*/
/*
- *\brief STM low level hardware initialisation
+ *\brief STM low level hardware initialisation
* PLL, MAM, VIC
*
*/
@@ -43,10 +43,10 @@
*/
#define MyByteSwap16(in, out) { \
asm volatile ( \
- "rev16 %0, %1\n\t" \
- : "=r" (out) \
- : "r"(in) \
- ); \
+ "rev16 %0, %1\n\t" \
+ : "=r" (out) \
+ : "r"(in) \
+ ); \
}
@@ -54,9 +54,9 @@
#ifdef USE_LED
#include "led.h"
#endif
-#if defined USE_RADIO_CONTROL
+#if defined RADIO_CONTROL
#if defined RADIO_CONTROL_LINK || defined RADIO_CONTROL_SPEKTRUM_PRIMARY_PORT
-#include "booz/booz_radio_control.h"
+#include <subsystems/radio_control.h>
#endif
#endif
#if defined USE_UART1 || defined USE_UART2 || defined USE_UART3
@@ -77,9 +77,9 @@
static inline void hw_init(void) {
#ifdef HSE_TYPE_EXT_CLK
- /* Setup the microcontroller system.
- * Initialize the Embedded Flash Interface,
- * initialize the PLL and update the SystemFrequency variable.
+ /* Setup the microcontroller system.
+ * Initialize the Embedded Flash Interface,
+ * initialize the PLL and update the SystemFrequency variable.
*/
/* RCC system reset(for debug purpose) */
RCC_DeInit();
@@ -97,14 +97,14 @@
/* Flash 2 wait state */
FLASH_SetLatency(FLASH_Latency_2);
/* HCLK = SYSCLK */
- RCC_HCLKConfig(RCC_SYSCLK_Div1);
+ RCC_HCLKConfig(RCC_SYSCLK_Div1);
/* PCLK2 = HCLK */
- RCC_PCLK2Config(RCC_HCLK_Div1);
+ RCC_PCLK2Config(RCC_HCLK_Div1);
/* PCLK1 = HCLK/2 */
RCC_PCLK1Config(RCC_HCLK_Div2);
/* PLLCLK = 8MHz * 9 = 72 MHz */
RCC_PLLConfig(RCC_PLLSource_HSE_Div1, RCC_PLLMul_9);
- /* Enable PLL */
+ /* Enable PLL */
RCC_PLLCmd(ENABLE);
/* Wait till PLL is ready */
while (RCC_GetFlagStatus(RCC_FLAG_PLLRDY) == RESET) {}
@@ -125,7 +125,7 @@
led_init();
#endif
/* for now this means using spektrum */
-#if defined USE_RADIO_CONTROL & defined RADIO_CONTROL_SPEKTRUM_PRIMARY_PORT &
defined RADIO_CONTROL_BIND_IMPL_FUNC
+#if defined RADIO_CONTROL & defined RADIO_CONTROL_SPEKTRUM_PRIMARY_PORT &
defined RADIO_CONTROL_BIND_IMPL_FUNC
RADIO_CONTROL_BIND_IMPL_FUNC();
#endif
#ifdef USE_UART1
Modified: paparazzi3/trunk/sw/airborne/csc/csc_telemetry.h
===================================================================
--- paparazzi3/trunk/sw/airborne/csc/csc_telemetry.h 2010-10-25 21:58:39 UTC
(rev 6250)
+++ paparazzi3/trunk/sw/airborne/csc/csc_telemetry.h 2010-10-25 21:58:47 UTC
(rev 6251)
@@ -68,7 +68,7 @@
#define PERIODIC_SEND_ACTUATORS(_chan) DOWNLINK_SEND_ACTUATORS(_chan,
SERVOS_NB, actuators)
#endif
-#ifdef USE_RADIO_CONTROL
+#ifdef RADIO_CONTROL
#include <subsystems/radio_control.h>
#define PERIODIC_SEND_RC(_chan) DOWNLINK_SEND_RC(_chan,
RADIO_CONTROL_NB_CHANNEL, radio_control.values)
#define PERIODIC_SEND_FBW_STATUS(_chan) { uint16_t current;
DOWNLINK_SEND_FBW_STATUS(_chan, &radio_control.status, &pprz_mode, &vsupply,
¤t); }
@@ -77,7 +77,7 @@
#define PERIODIC_SEND_RC(_chan) DOWNLINK_SEND_RC(_chan, PPM_NB_PULSES,
rc_values)
#define PERIODIC_SEND_FBW_STATUS(_chan) { uint16_t current;
DOWNLINK_SEND_FBW_STATUS(_chan, &rc_status, &pprz_mode, &vsupply, ¤t); }
#endif
-#endif /* USE_RADIO_CONTROL */
+#endif /* RADIO_CONTROL */
#ifdef USE_GPS
#define PERIODIC_SEND_BOOZ2_GPS(_chan) { \
Modified: paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/telemetry.h
===================================================================
--- paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/telemetry.h
2010-10-25 21:58:39 UTC (rev 6250)
+++ paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/telemetry.h
2010-10-25 21:58:47 UTC (rev 6251)
@@ -94,7 +94,7 @@
}
#endif /* USE_GPS */
-#ifdef USE_RADIO_CONTROL
+#ifdef RADIO_CONTROL
#define PERIODIC_SEND_RC(_chan) DOWNLINK_SEND_RC(_chan,
RADIO_CONTROL_NB_CHANNEL, radio_control.values)
#if defined RADIO_CONTROL_KILL_SWITCH
#define PERIODIC_SEND_BOOZ2_RADIO_CONTROL(_chan) SEND_BOOZ2_RADIO_CONTROL(
_chan, &radio_control.values[RADIO_KILL_SWITCH])
@@ -113,7 +113,7 @@
&radio_control.values[RADIO_MODE],
\
_kill_switch,
\
&radio_control.status);}
-#else /* ! USE_RADIO_CONTROL */
+#else /* ! RADIO_CONTROL */
#define PERIODIC_SEND_RC(_chan) {}
#define PERIODIC_SEND_BOOZ2_RADIO_CONTROL(_chan) {}
#endif
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [paparazzi-commits] [6251] replace USE_RADIO_CONTROL with RADIO_CONTROL,
Felix Ruess <=