[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[paparazzi-commits] [6228] remove old ppm and ppm_telemetry
From: |
Gautier Hattenberger |
Subject: |
[paparazzi-commits] [6228] remove old ppm and ppm_telemetry |
Date: |
Mon, 25 Oct 2010 12:46:09 +0000 |
Revision: 6228
http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=6228
Author: gautier
Date: 2010-10-25 12:46:09 +0000 (Mon, 25 Oct 2010)
Log Message:
-----------
remove old ppm and ppm_telemetry
Removed Paths:
-------------
paparazzi3/trunk/sw/airborne/arch/lpc21/ppm_hw.c
paparazzi3/trunk/sw/airborne/arch/lpc21/ppm_hw.h
paparazzi3/trunk/sw/airborne/arch/sim/ppm_hw.c
paparazzi3/trunk/sw/airborne/arch/sim/ppm_hw.h
paparazzi3/trunk/sw/airborne/arch/stm32/ppm_hw.c
paparazzi3/trunk/sw/airborne/arch/stm32/ppm_hw.h
paparazzi3/trunk/sw/airborne/ppm.h
paparazzi3/trunk/sw/airborne/ppm_telemetry.c
paparazzi3/trunk/sw/airborne/ppm_telemetry.h
Deleted: paparazzi3/trunk/sw/airborne/arch/lpc21/ppm_hw.c
===================================================================
--- paparazzi3/trunk/sw/airborne/arch/lpc21/ppm_hw.c 2010-10-25 11:32:12 UTC
(rev 6227)
+++ paparazzi3/trunk/sw/airborne/arch/lpc21/ppm_hw.c 2010-10-25 12:46:09 UTC
(rev 6228)
@@ -1,11 +0,0 @@
-#include "ppm.h"
-#include "std.h"
-#include "sys_time.h"
-
-
-
-
-uint16_t ppm_pulses[PPM_NB_CHANNEL];
-volatile bool_t ppm_valid;
-
-
Deleted: paparazzi3/trunk/sw/airborne/arch/lpc21/ppm_hw.h
===================================================================
--- paparazzi3/trunk/sw/airborne/arch/lpc21/ppm_hw.h 2010-10-25 11:32:12 UTC
(rev 6227)
+++ paparazzi3/trunk/sw/airborne/arch/lpc21/ppm_hw.h 2010-10-25 12:46:09 UTC
(rev 6228)
@@ -1,73 +0,0 @@
-#ifndef PPM_HW_H
-#define PPM_HW_H
-
-
-/**
- * Radio control type : futaba is falling edge clocked whereas JR is rising
edge
- */
-#define PPM_PULSE_TYPE_POSITIVE 0
-#define PPM_PULSE_TYPE_NEGATIVE 1
-
-
-
-#include "LPC21xx.h"
-#include BOARD_CONFIG
-
-
-static inline void ppm_init ( void ) {
- /* select pin for capture */
- PPM_PINSEL |= PPM_PINSEL_VAL << PPM_PINSEL_BIT;
- /* enable capture 0.2 on falling or rising edge + trigger interrupt */
-#if defined PPM_PULSE_TYPE && PPM_PULSE_TYPE == PPM_PULSE_TYPE_POSITIVE
- T0CCR = PPM_CCR_CRR | PPM_CCR_CRI;
-#elif defined PPM_PULSE_TYPE && PPM_PULSE_TYPE == PPM_PULSE_TYPE_NEGATIVE
- T0CCR = PPM_CCR_CRF | PPM_CCR_CRI;
-#else
-#error "ppm_hw.h: Unknown PM_PULSE_TYPE"
-#endif
- ppm_valid = FALSE;
-}
-
-#define PPM_NB_CHANNEL PPM_NB_PULSES
-
-#define PPM_IT PPM_CRI
-#define PPM_ISR() { \
- static uint8_t state = PPM_NB_CHANNEL; \
- static uint8_t data_valid = FALSE; \
- static uint32_t last; \
- \
- uint32_t now = PPM_CR; \
- uint32_t length = now - last; \
- last = now; \
- \
- if (state == PPM_NB_CHANNEL) { \
- if (length > SYS_TICS_OF_USEC(PPM_SYNC_MIN_LEN) && \
- length < SYS_TICS_OF_USEC(PPM_SYNC_MAX_LEN)) { \
- if (data_valid) { \
- ppm_valid = TRUE; \
- data_valid = FALSE; \
- } \
- state = 0; \
- } \
- else { \
- data_valid = FALSE; \
- } \
- } \
- else { \
- if (length > SYS_TICS_OF_USEC(PPM_DATA_MIN_LEN) && \
- length < SYS_TICS_OF_USEC(PPM_DATA_MAX_LEN)) { \
- ppm_pulses[state] = length; \
- state++; \
- if (state == PPM_NB_CHANNEL) { \
- data_valid = TRUE; \
- } \
- } \
- else { \
- state = PPM_NB_CHANNEL; \
- data_valid = FALSE; \
- } \
- } \
-}
-
-
-#endif /* PPM_HW_H */
Deleted: paparazzi3/trunk/sw/airborne/arch/sim/ppm_hw.c
===================================================================
--- paparazzi3/trunk/sw/airborne/arch/sim/ppm_hw.c 2010-10-25 11:32:12 UTC
(rev 6227)
+++ paparazzi3/trunk/sw/airborne/arch/sim/ppm_hw.c 2010-10-25 12:46:09 UTC
(rev 6228)
@@ -1,28 +0,0 @@
-#include <inttypes.h>
-#include <caml/mlvalues.h>
-#include "ppm.h"
-
-#ifdef RADIO_CONTROL
-uint16_t ppm_pulses[ PPM_NB_PULSES ];
-volatile bool_t ppm_valid;
-
-
-value update_rc_channel(value c, value v) {
- ppm_pulses[Int_val(c)] = Double_val(v);
- return Val_unit;
-}
-
-value send_ppm(value unit) {
- ppm_valid = TRUE;
- return unit;
-}
-#else // RADIO_CONTROL
-value update_rc_channel(value c __attribute__ ((unused)), value v
__attribute__ ((unused))) {
- return Val_unit;
-}
-
-value send_ppm(value unit) {
- return unit;
-}
-
-#endif // RADIO_CONTROL
Deleted: paparazzi3/trunk/sw/airborne/arch/sim/ppm_hw.h
===================================================================
--- paparazzi3/trunk/sw/airborne/arch/sim/ppm_hw.h 2010-10-25 11:32:12 UTC
(rev 6227)
+++ paparazzi3/trunk/sw/airborne/arch/sim/ppm_hw.h 2010-10-25 12:46:09 UTC
(rev 6228)
@@ -1,6 +0,0 @@
-#ifndef PPM_HW_H
-#define PPM_HW_H
-
-static inline void ppm_init( void ) {}
-
-#endif /* PPM_HW_H */
Deleted: paparazzi3/trunk/sw/airborne/arch/stm32/ppm_hw.c
===================================================================
--- paparazzi3/trunk/sw/airborne/arch/stm32/ppm_hw.c 2010-10-25 11:32:12 UTC
(rev 6227)
+++ paparazzi3/trunk/sw/airborne/arch/stm32/ppm_hw.c 2010-10-25 12:46:09 UTC
(rev 6228)
@@ -1,31 +0,0 @@
-
-#include "ppm.h"
-#include "std.h"
-#include "sys_time.h"
-
-
-#include "radio_control/booz_radio_control_ppm.h"
-#include BOARD_CONFIG
-
-
-uint16_t ppm_pulses[PPM_NB_CHANNEL];
-volatile bool_t ppm_valid;
-
-////////////////////////////////////////////////
-// RADIO_CONTROL_NB_CHANNEL == PPM_NB_CHANNEL ?
-
-void ppm_init ( void )
-{
- booz_radio_control_ppm_arch_init();
- ppm_valid = FALSE;
-}
-
-void ppm_copy( void )
-{
- ppm_valid = booz_radio_control_ppm_frame_available;
-
- for (int i=0;i<PPM_NB_CHANNEL;i++)
- {
- ppm_pulses[i] = booz_radio_control_ppm_pulses[i];
- }
-}
Deleted: paparazzi3/trunk/sw/airborne/arch/stm32/ppm_hw.h
===================================================================
--- paparazzi3/trunk/sw/airborne/arch/stm32/ppm_hw.h 2010-10-25 11:32:12 UTC
(rev 6227)
+++ paparazzi3/trunk/sw/airborne/arch/stm32/ppm_hw.h 2010-10-25 12:46:09 UTC
(rev 6228)
@@ -1,10 +0,0 @@
-#ifndef PPM_HW_H
-#define PPM_HW_H
-
-
-extern void ppm_init ( void );
-
-#define PPM_NB_CHANNEL PPM_NB_PULSES
-
-
-#endif /* PPM_HW_H */
Deleted: paparazzi3/trunk/sw/airborne/ppm.h
===================================================================
--- paparazzi3/trunk/sw/airborne/ppm.h 2010-10-25 11:32:12 UTC (rev 6227)
+++ paparazzi3/trunk/sw/airborne/ppm.h 2010-10-25 12:46:09 UTC (rev 6228)
@@ -1,43 +0,0 @@
-/* $Id$
- *
- * (c) 2005 Pascal Brisset, Antoine Drouin
- *
- * 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 PPM_H
-#define PPM_H
-
-#if defined RADIO_CONTROL
-
-#include "std.h"
-#include "radio.h"
-#define PPM_NB_PULSES RADIO_CTL_NB
-extern uint16_t ppm_pulses[ PPM_NB_PULSES ];
-extern volatile bool_t ppm_valid;
-
-#ifdef USE_RC_TELEMETRY
-#include "ppm_telemetry.h"
-#else
-#include "ppm_hw.h"
-#endif
-
-#endif /* RADIO_CONTROL */
-
-#endif
Deleted: paparazzi3/trunk/sw/airborne/ppm_telemetry.c
===================================================================
--- paparazzi3/trunk/sw/airborne/ppm_telemetry.c 2010-10-25 11:32:12 UTC
(rev 6227)
+++ paparazzi3/trunk/sw/airborne/ppm_telemetry.c 2010-10-25 12:46:09 UTC
(rev 6228)
@@ -1,26 +0,0 @@
-
-#include "ppm.h"
-#include "std.h"
-
-#define PPM_NB_CHANNEL PPM_NB_PULSES
-
-uint16_t ppm_pulses[PPM_NB_CHANNEL];
-volatile bool_t ppm_valid;
-
-
-void ppm_datalink( uint8_t throttle_mode,
- int8_t roll,
- int8_t pitch)
-{
- int throttle = throttle_mode & 0xFC;
- int mode = throttle_mode & 0x03;
-
- ppm_pulses[RADIO_ROLL] = (roll * 4 + 1500) * 15;
- ppm_pulses[RADIO_PITCH] = (pitch * 4 + 1500) * 15;
- ppm_pulses[RADIO_THROTTLE] = (throttle * 4 + 1000) * 15;
- ppm_pulses[RADIO_MODE] = (1000 + mode * 500) * 15;
-
- ppm_valid = TRUE;
-}
-
-
Deleted: paparazzi3/trunk/sw/airborne/ppm_telemetry.h
===================================================================
--- paparazzi3/trunk/sw/airborne/ppm_telemetry.h 2010-10-25 11:32:12 UTC
(rev 6227)
+++ paparazzi3/trunk/sw/airborne/ppm_telemetry.h 2010-10-25 12:46:09 UTC
(rev 6228)
@@ -1,21 +0,0 @@
-#ifndef PPM_TELEMETRY_H
-#define PPM_TELEMETRY_H
-
-
-#include BOARD_CONFIG
-
-
-static inline void ppm_init ( void ) {
- ppm_valid = FALSE;
-}
-
-#define PPM_ISR() {}
-
-#define PPM_IT 0x00
-
-void ppm_datalink( uint8_t throttle_mode,
- int8_t roll,
- int8_t pitch)
-;
-
-#endif /* PPM_TELEMETRY_H */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [paparazzi-commits] [6228] remove old ppm and ppm_telemetry,
Gautier Hattenberger <=